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

Mp server test

See merge request quanshu/mp-server!856

mp-admin/src/main/java/com/qs/mp/web/controller/api/open/LinkController.java

@@ -5,6 +5,7 @@ import com.qs.mp.channel.domain.Channel;
 import com.qs.mp.channel.service.IChannelService;
 import com.qs.mp.common.core.domain.AjaxResult;
 import com.qs.mp.common.core.redis.RedisCache;
+import com.qs.mp.common.enums.AppSourceEnum;
 import com.qs.mp.common.utils.LogUtil;
 import com.qs.mp.common.utils.LogUtils;
 import com.qs.mp.common.utils.StringUtils;
@@ -102,12 +103,13 @@ public class LinkController {
             return AjaxResult.error("非法访问");
         }
 
+        String appId = AppSourceEnum.MSDQ.getAppId();
 
         if (StringUtils.isBlank(schemeParam.getBoxId())) {
             // 生成scheme,并缓存到redis中,1天过期
-            scheme = wxUrlLinkService.generateUrlSchema("", "uid=" + channel.getUserId() + "&t=" + UserShareVO.SHARE_TYPE_SITE, userAppId);
+            scheme = wxUrlLinkService.generateUrlSchema("", "uid=" + channel.getUserId() + "&t=" + UserShareVO.SHARE_TYPE_SITE, appId);
         } else {
-            scheme = wxUrlLinkService.generateUrlSchema("pages/ticketBox/detail", "uid=" + channel.getUserId() + "&t=" + UserShareVO.SHARE_TYPE_SITE + "&boxId=" + schemeParam.getBoxId(), userAppId);
+            scheme = wxUrlLinkService.generateUrlSchema("pages/ticketBox/detail", "uid=" + channel.getUserId() + "&t=" + UserShareVO.SHARE_TYPE_SITE + "&boxId=" + schemeParam.getBoxId(), appId);
         }
 
         redisCache.setCacheObject(key, scheme,1, TimeUnit.DAYS);

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

@@ -46,9 +46,7 @@ public class UserShareController extends BaseApiController {
 	public AjaxResult generateInviteCode(@RequestBody  JSONObject jsonObject) {
 		String boxId = jsonObject.getString("boxId"); // 票组ID
 		String type = jsonObject.getString("type"); // 分享类型，1/2
-		Integer appSource = jsonObject.getInteger("appSource");
-		AppSourceEnum appSourceEnum = AppSourceEnum.getByValue(appSource);
-		String appId = appSourceEnum.getAppId();
+		String appId = AppSourceEnum.MSDQ.getAppId();
 		Long userId = SecurityUtils.getUserId();
 		if (UserShareVO.SHARE_TYPE_SITE.equals(type) && StringUtils.isBlank(boxId)) {
 			// 经销商分享，默认到盲票小程序首页

mp-quartz/src/main/java/com/qs/mp/quartz/task/TicketOrderTask.java

@@ -40,7 +40,7 @@ public class TicketOrderTask {
       List<UserTicketOrder> ticketOrderList = userTicketOrderService.list(
           new QueryWrapper<UserTicketOrder>()
               .select("distinct box_id")
-              .lambda().eq(UserTicketOrder::getResource, TicketTypeEnum.ONLINE)
+              .lambda()
               .eq(UserTicketOrder::getStatus, UserTicketOrderStatusEnum.NOT_PAY)
               .lt(UserTicketOrder::getCreatedTime,
                   DateUtils.addMinutes(DateUtils.getNowDate(), -30))

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

@@ -350,12 +350,13 @@ public class UserTicketOrderServiceImpl extends
         int sumTicket = 0;
         for (String orderId : orderIds) {
             UserTicketOrder userTicketOrder = getById(orderId);
-            Assert.isTrue(userTicketOrder.getResource() == TicketTypeEnum.ONLINE,
-                "非在线盲票不用取消。boxId:" + boxId);
             if (!rollbackOrder(userTicketOrder)) {
                 return false;
             }
-            sumTicket += userTicketOrder.getTicketNum();
+            // 线上票库存回滚
+            if (TicketTypeEnum.ONLINE.equals(userTicketOrder.getResource())) {
+                sumTicket += userTicketOrder.getTicketNum();
+            }
         }
         rollbackBoxQty(boxId, sumTicket);
         return true;