Przeglądaj źródła

野生用户绑定固定门店

cup 2 lat temu
rodzic
commit
88db6aa9db

+ 0 - 8
mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/UserDeliverOrderMgrController.java

@@ -61,14 +61,6 @@ public class UserDeliverOrderMgrController extends BaseApiController {
 	@Autowired
 	private IUserDeliverOrderItemService userDeliverOrderItemService;
 
-
-	public static void main(String[] args) {
-		StringBuilder context = new StringBuilder();
-		context.append("Apple iPhone 13 Pro (A2639) 256GB 远峰蓝色 支持移动联通电信5G 双卡双待手机,啊外星人ALIENWARE m15 R6 15.6英寸高端游戏本11代8核i7 16G 512G RTX3060 165Hz CherryApple iPhone 13 Pro (A2639) 256GB 远峰蓝色 支持移动联通电信5G 双卡双待手机支持移动联通电信5G 双卡双待手机啊塞阀扥阿复赛发送");
-		String substring = context.substring(0, Math.min(context.length(), 200));
-		System.out.println("substring = " + substring);
-	}
-
 	@PostMapping("/sendSMS")
 	@ApiOperation("发送短信")
 	@PreAuthorize("@ss.hasPermi('order:deliver:sendSMS')")

+ 3 - 1
mp-admin/src/main/resources/application-8100.yml

@@ -142,4 +142,6 @@ export:
 
 shipping:
   user: 1
-  channel: 2
+  channel: 2
+bind:
+  channelId: 1528

+ 3 - 1
mp-admin/src/main/resources/application-8200.yml

@@ -142,4 +142,6 @@ export:
 
 shipping:
   user: 1
-  channel: 2
+  channel: 2
+bind:
+  channelId: 1528

+ 2 - 1
mp-admin/src/main/resources/application-dev.yml

@@ -137,4 +137,5 @@ export:
 shipping:
     user: 4
     channel: 7
-
+bind:
+    channelId: 2

+ 3 - 1
mp-admin/src/main/resources/application-test.yml

@@ -140,4 +140,6 @@ export:
 
 shipping:
   user: 4
-  channel: 7
+  channel: 7
+bind:
+  channelId: 2

+ 1 - 1
mp-quartz/src/main/java/com/qs/mp/quartz/task/AsyncConsumeTask.java

@@ -76,7 +76,7 @@ public class AsyncConsumeTask {
             // 盲票支付后相关任务处理
             asyncTaskService.ticketPay(asyncTask);
         } else if (AsyncTaskTypeEnum.TICKET_GENERATE.getValue().equals(asyncTask.getType())) {
-            // 盲票支付后相关任务处理
+            // 盲票创建后相关任务处理
             asyncTaskService.ticketGenerate(asyncTask);
         }
 

+ 12 - 0
mp-service/src/main/java/com/qs/mp/user/service/impl/UserTicketOrderServiceImpl.java

@@ -56,6 +56,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.aop.framework.AopContext;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Assert;
@@ -74,6 +75,10 @@ public class UserTicketOrderServiceImpl extends
 
     protected final Logger logger = LoggerFactory.getLogger(this.getClass());
 
+
+    @Value("${bind.channelId}")
+    private Long bindChannelId;
+
     @Autowired
     private ITicketBoxService ticketBoxService;
 
@@ -213,6 +218,13 @@ public class UserTicketOrderServiceImpl extends
                         userTicketOrder.setShareInfo(JSONObject.toJSONString(userShareVO));
                     }
                 }
+            } else {
+                // 野生用户绑定固定的经销商
+                UserShareVO tempUserShareVO = new UserShareVO();
+                tempUserShareVO.setSuid(bindChannelId);
+                tempUserShareVO.setType(UserShareVO.SHARE_TYPE_SITE);
+                userTicketOrder.setChannelId(bindChannelId);
+                userTicketOrder.setShareInfo(JSONObject.toJSONString(tempUserShareVO));
             }
         }
         save(userTicketOrder);