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

Dev

See merge request quanshu/mp-server!688

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

@@ -222,6 +222,7 @@ public class UserTicketController extends BaseApiController {
 
     TicketBox ticketBox = ticketBoxService.getById(ticket.getBoxId());
     if (ticketBox.getIsEncrypt() == 1 && match) {
+      LogUtil.error(logger, "非法访问,serialNo:{0},param:{1}", serialNo, param);
       return AjaxResult.error("非法访问!");
     }
 

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

@@ -473,12 +473,14 @@ public class UserTicketOrderServiceImpl extends
       LogUtil.info(logger, "渠道结佣时，订单对应的渠道不存在，无需结佣。orderId:{0}",
           channelCommParam.getOrderId());
     }
-    boolean rst = update(
-        new LambdaUpdateWrapper<UserTicketOrder>().set(UserTicketOrder::getCommStatus,
-                CommStatusEnum.YES)
-            .eq(UserTicketOrder::getOrderId, orderId)
-            .eq(UserTicketOrder::getCommStatus, CommStatusEnum.DOING));
-    Assert.isTrue(rst, "渠道结佣完成，更新订单状态失败。orderId:" + orderId);
+    if (ChannelCommissionResourceEnum.USER.getValue().equals(resource)) {
+      boolean rst = update(
+              new LambdaUpdateWrapper<UserTicketOrder>().set(UserTicketOrder::getCommStatus,
+                              CommStatusEnum.YES)
+                      .eq(UserTicketOrder::getOrderId, orderId)
+                      .eq(UserTicketOrder::getCommStatus, CommStatusEnum.DOING));
+      Assert.isTrue(rst, "渠道结佣完成，更新订单状态失败。orderId:" + orderId);
+    }
     return true;
   }