diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxClerkController.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxClerkController.java index f12a393..8042e10 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxClerkController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxClerkController.java @@ -37,6 +37,7 @@ import com.starry.admin.utils.SmsUtils; import com.starry.common.redis.RedisCache; import com.starry.common.result.R; import com.starry.common.utils.ConvertUtil; +import com.starry.common.utils.StringUtils; import com.starry.common.utils.VerificationCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -442,9 +443,15 @@ public class WxClerkController { @ClerkUserLogin @GetMapping("/order/queryById") public R queryById(@RequestParam("id") String id) { - PlayClerkOrderDetailsReturnVo orderInfo = playOrderInfoService + PlayClerkOrderDetailsReturnVo vo = playOrderInfoService .clerkSelectOrderDetails(ThreadLocalRequestDetail.getClerkUserInfo().getId(), id); - return R.ok(orderInfo); + if (StringUtils.isNotEmpty(vo.getAcceptBy()) && !vo.getAcceptBy().equals(ThreadLocalRequestDetail.getClerkUserInfo().getId())) { + vo.setWeiChatCode(""); + } + if(vo.getOrderStatus().equals("4")){ + vo.setWeiChatCode(""); + } + return R.ok(vo); } /** diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayClerkOrderDetailsReturnVo.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayClerkOrderDetailsReturnVo.java index 02056a8..7f4ffb1 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayClerkOrderDetailsReturnVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayClerkOrderDetailsReturnVo.java @@ -114,6 +114,8 @@ public class PlayClerkOrderDetailsReturnVo { */ private BigDecimal estimatedRevenue; + private String acceptBy; + /** * 优惠金额 */