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

Dev

See merge request quanshu/mp-server!989

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

@@ -145,6 +145,7 @@ public class UserTicketOrderController extends BaseApiController {
             QueryWrapper<Channel> promoterQueryWrapper = new QueryWrapper<>();
             promoterQueryWrapper.eq("t1.is_deleted", 0);
             promoterQueryWrapper.eq("t4.ticket_id", ticket.getTicketId());
+            promoterQueryWrapper.eq("t5.is_deleted", 0);
             PromoterVO promoter = promoterUserService.getPromoterByQueryWrapper(promoterQueryWrapper);
             orderSettleVO.setPromoter(promoter);
 

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

@@ -320,7 +320,7 @@ public class UserTicketOrderServiceImpl extends
         ticketOrder.setCouponInfo(couponIds);
         ticketOrder.setStatus(UserTicketOrderStatusEnum.NOT_PAY);
         // 设置推广员id
-        if (userShareVO.getPromoterId() != null) {
+        if (userShareVO.getPromoterId() != null && userShareVO.getPromoterId() > 0) {
             ticketOrder.setPromoterId(userShareVO.getPromoterId());
         }
         if (orderSettleVO.getPayAmt() == 0) {

mp-service/src/main/resources/mapper/channel/PromoterUserMapper.xml

@@ -19,11 +19,12 @@
     </sql>
 
     <select id="getPromoterByQueryWrapper" resultType="com.qs.mp.channel.domain.vo.PromoterVO">
-        select t2.*
+        select t5.*
         from mp_promoter_user t1
             left join mp_channel t2 on t1.channel_id = t2.channel_id
             left join mp_channel_order_detail t3 on t2.channel_id = t3.channel_id
             left join mp_ticket t4 on t3.pkg_id = t4.pkg_id
+            left join mp_channel t5 on t1.promoter_id = t5.channel_id
         ${ew.customSqlSegment}
     </select>
 </mapper>