Merge branch 'dev' into 'mp-server-test'

Dev

See merge request quanshu/mp-server!972

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

@@ -15,6 +15,8 @@ import com.qs.mp.admin.domain.param.TicketParam;
 import com.qs.mp.admin.domain.vo.*;
 import com.qs.mp.admin.service.*;
 import com.qs.mp.channel.domain.Channel;
+import com.qs.mp.channel.domain.ChannelOrderDetail;
+import com.qs.mp.channel.service.IChannelOrderDetailService;
 import com.qs.mp.channel.service.IChannelService;
 import com.qs.mp.common.core.domain.AjaxResult;
 import com.qs.mp.common.core.page.TableDataInfo;
@@ -99,6 +101,9 @@ public class UserTicketController extends BaseApiController {
     @Autowired
     private IChannelService channelService;
 
+    @Autowired
+    private IChannelOrderDetailService channelOrderDetailService;
+
     @PostMapping("/isJump")
     @ApiOperation("是否跳转")
     public AjaxResult isJump() {
@@ -419,6 +424,9 @@ public class UserTicketController extends BaseApiController {
             return AjaxResult.error(ErrorCodeEnum.ERROR_CODE_1023);
         }
 
+        ChannelOrderDetail channelOrderDetail = channelOrderDetailService.getOne(
+            new LambdaQueryWrapper<ChannelOrderDetail>().eq(ChannelOrderDetail::getPkgId, ticketPackage.getPkgId()));
+
         TicketVO ticketVO = new TicketVO();
         ticketVO.setPrizeList(ticketAwardsPrizeService.listPrizeVO(ticket.getBoxId()));
         ticketVO.setTicketId(ticket.getTicketId());
@@ -430,6 +438,9 @@ public class UserTicketController extends BaseApiController {
         ticketVO.setPlainLuckyNum(ticket.getPlainLuckyNum());
         ticketVO.setStatus(ticket.getStatus().getValue());
         ticketVO.setPicUrl(ticketBox.getPicUrl());
+        if (channelOrderDetail != null) {
+            ticketVO.setChannelId(channelOrderDetail.getChannelId());
+        }
 
         // 设置奖项名
         if (Objects.nonNull(ticket.getPlainLuckyNum())) {

mp-common/src/main/java/com/qs/mp/common/enums/ChannelRoleEnum.java

@@ -14,7 +14,8 @@ import com.qs.mp.common.json.EnumValueDeserializer;
 public enum ChannelRoleEnum implements IEnum<String> {
 
   CHANNEL("channel", "渠道"),
-  SALESITE("salesite", "经销商");
+  SALESITE("salesite", "经销商"),
+  PROMOTER("promoter", "推广员");
 
   private final String value;
   private final String desc;

mp-framework/src/main/java/com/qs/mp/framework/web/service/SysLoginService.java

@@ -210,6 +210,8 @@ public class SysLoginService
           loginUser.setChannelNo(channel.getChannelNo());
           if (channel.getLevel() == 0) {
               return ChannelRoleEnum.SALESITE;
+          } else if (channel.getLevel() == -1) {
+              return ChannelRoleEnum.PROMOTER;
           } else {
               return ChannelRoleEnum.CHANNEL;
           }

mp-service/src/main/java/com/qs/mp/admin/domain/vo/TicketVO.java

@@ -76,4 +76,7 @@ public class TicketVO {
   @ApiModelProperty("盲票状态（未付款、已激活、已兑奖、付款中）")
   private Integer status;
 
+  @ApiModelProperty("关联的门店id")
+  private Long channelId;
+
 }

mp-service/src/main/java/com/qs/mp/user/domain/param/TicketOrderParam.java

@@ -26,4 +26,7 @@ public class TicketOrderParam {
 
 	@ApiModelProperty("小程序,1盲票,2码上兑券,3支付宝盲票")
 	private Integer appSource;
+
+	@ApiModelProperty("门店id")
+	private Long channelId;
 }