需求

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/order/PayOrderLogic.java

@@ -196,6 +196,14 @@ public class PayOrderLogic {
         workerOrderBuy.setUserId(currentCompanyWechat.getUser().getUserId());
         workerOrderBuy.setOpenId(currentCompanyWechat.getUser().getMiniOpenId());
 
+        if (!StringUtil.isEmpty(workerOrderBuy.getWorkerOrderId())){
+            PgOrderBase pgOrderBase = pgOrderBaseService.getById(workerOrderBuy.getWorkerOrderId());
+
+            if (pgOrderBase != null){
+                workerOrderBuy.setUserName(pgOrderBase.getUserName());
+            }
+        }
+
         if (StringUtil.isEmpty(workerOrderBuy.getCategoryId()))
             workerOrderBuy.setGoodsType("M");
         else

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/policy/WorkerLogic.java

@@ -145,7 +145,7 @@ public class WorkerLogic {
                             .in(WorkerPolicy::getStatus,"DSX","BZZ")
                             .eq(WorkerPolicy::getPolicyType,"AC")
                             .eq(WorkerPolicy::getWebsitUserId,websitUser.getId())
-                            .count() < 1
+                            .count() <= 1
 
                     &&
                     policyOrderService.lambdaQuery()
@@ -153,7 +153,7 @@ public class WorkerLogic {
                             .in(PolicyOrder::getPolicyOrderStatus,"DSX","BZZ")
                             .eq(PolicyOrder::getType,"AC")
                             .eq(PolicyOrder::getWebsitUserId,websitUser.getId())
-                            .count() < 1
+                            .count() <= 1
 
             ){