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

Dev

See merge request quanshu/mp-server!855

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-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;