门店绑定二维码

mp-admin/src/main/java/com/qs/mp/web/controller/api/user/UserShareController.java

@@ -65,9 +65,11 @@ public class UserShareController extends BaseApiController {
 	@PostMapping("/ticket/code/generate")
 	@ApiModelProperty("生成指定门店下盲票二维码")
 	public AjaxResult generateTicketUnderChannelCode(@RequestBody  JSONObject jsonObject) {
-		String channelId = jsonObject.getString("channelId");// 渠道ID
+		Long channelId = Long.parseLong(jsonObject.getString("channelId"));// 门店ID
+		String siteName = jsonObject.getString("siteName"); // 门店名称
+		Long userId = SecurityUtils.getUserId();
 		String appId = AppSourceEnum.MSDQ.getAppId();
-		String rst = wxUrlLinkService.generateUnlimitCode("packageOperate/store/index", channelId, appId);;
+		String rst = wxUrlLinkService.generateUnlimitCode("packageOperate/store/index", channelId + "&" + userId + "&" + siteName, appId);;
 		return new AjaxResult(Type.SUCCESS, "", rst);
 	}
 }

mp-admin/src/main/java/com/qs/mp/web/controller/api/user/UserTicketOrderController.java

@@ -187,6 +187,7 @@ public class UserTicketOrderController extends BaseApiController {
 
         AppSourceEnum appSourceEnum = AppSourceEnum.getByValue(param.getAppSource());
         orderSettleVO.setAppId(appSourceEnum.getAppId());
+        orderSettleVO.setChannelId(param.getChannelId());
 
         QueryWrapper<TicketBoxGoodsListVO> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("t1.is_deleted",0);

mp-service/src/main/java/com/qs/mp/admin/service/impl/TicketBoxServiceImpl.java

@@ -483,9 +483,6 @@ public class TicketBoxServiceImpl extends ServiceImpl<TicketBoxMapper, TicketBox
             if (CollectionUtils.isEmpty(channelIdList)) {
                 throw new ServiceException("门店列表为空");
             }
-            if (channelIdList.size() > 1) {
-                throw new ServiceException("只能指定一个门店");
-            }
 
             List<TicketBoxChannel> onlineTicketBoxChannelList = new ArrayList<>();
             for (Long channelId : channelIdList) {

mp-service/src/main/java/com/qs/mp/user/domain/vo/TicketOrderSettleVO.java

@@ -77,6 +77,9 @@ public class TicketOrderSettleVO {
     @ApiModelProperty("用户关联的推广员")
     private PromoterVO promoter;
 
+    @ApiModelProperty("盲票关联的门店")
+    private Long channelId;
+
 
     /**
      * 使用优惠券列表

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

@@ -258,6 +258,10 @@ public class UserTicketOrderServiceImpl extends
             userTicketOrder.setChannelId(bindChannelId);
             userTicketOrder.setShareInfo(JSONObject.toJSONString(tempUserShareVO));
         }
+        // 野生线上用户通过门店二维码购买（是否绑定盲票订单都来源于指定门店）
+        if (orderSettleVO.getChannelId() != null && TicketBoxSaleChannelTypeEnum.PART.getValue().equals(ticketBox.getSaleChannelType())) {
+            userTicketOrder.setChannelId(orderSettleVO.getChannelId());
+        }
 
         save(userTicketOrder);
 
@@ -610,6 +614,7 @@ public class UserTicketOrderServiceImpl extends
             }
 
         } else {
+            // 线下票
             ChannelOrder channelOrder = channelOrderService.getById(orderId);
             ChannelOrderItem channelOrderItem = channelOrderItemService.getOne(
                 new LambdaQueryWrapper<ChannelOrderItem>()