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

线下票提交订单,保存推广员id

See merge request quanshu/mp-server!980

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

@@ -20,4 +20,8 @@ public class UserShareVO {
   public static final String SHARE_TYPE_USER = "1";
   @ApiModelProperty("经销商分享")
   public static final String SHARE_TYPE_SITE = "2";
+
+  @ApiModelProperty("推广员id")
+  private Long promoterId;
+
 }

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

@@ -167,7 +167,7 @@ public class UserTicketOrderServiceImpl extends
         }
 
         // 线下票不需锁库存，待付款成功后再更新票组销量
-        return proxy.createOfflineOrder(userId, orderSettleVO);
+        return proxy.createOfflineOrder(userId, orderSettleVO, userShareVO);
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -280,7 +280,7 @@ public class UserTicketOrderServiceImpl extends
     }
 
     @Transactional(rollbackFor = Exception.class)
-    public String createOfflineOrder(Long userId, TicketOrderSettleVO orderSettleVO) {
+    public String createOfflineOrder(Long userId, TicketOrderSettleVO orderSettleVO, UserShareVO userShareVO) {
         Ticket ticket = ticketService.getById(orderSettleVO.getTicketId());
         Assert.isTrue(ticket.getStatus() == TicketStatusEnum.NOT_PAY,
             "盲票已付款，ticketId:" + ticket.getTicketId());
@@ -313,6 +313,10 @@ public class UserTicketOrderServiceImpl extends
         ticketOrder.setResource(TicketTypeEnum.OFFLINE);
         ticketOrder.setCouponInfo(couponIds);
         ticketOrder.setStatus(UserTicketOrderStatusEnum.NOT_PAY);
+        // 设置推广员id
+        if (userShareVO.getPromoterId() != null) {
+            ticketOrder.setPromoterId(userShareVO.getPromoterId());
+        }
         if (orderSettleVO.getPayAmt() == 0) {
             ticketOrder.setCommStatus(CommStatusEnum.YES); // 无需结佣，直接置为已结佣
         }