From b803e836eb267218902eb10472aa24ba44404f5c Mon Sep 17 00:00:00 2001
From: huchuansai <huchuansai@foxmail.com>
Date: Wed, 24 Sep 2025 11:03:12 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8E=BB=C3=A6=C3=A5=E5=B7=B2=E7=BB=8F?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88=E7=9A=84=E8=AE=A2=E5=8D=95=E9=9A=90=E8=97=8F?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=8F=B7=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/weichat/controller/WxClerkController.java | 11 +++++++++--
 .../entity/order/PlayClerkOrderDetailsReturnVo.java   |  2 ++
 2 files changed, 11 insertions(+), 2 deletions(-)

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;
+
     /**
      * 优惠金额
      */