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

优化

See merge request quanshu/mp-server!693

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

@@ -115,6 +115,12 @@ public class UserTicketOrderController extends BaseApiController {
       Ticket ticket = ticketService.getById(param.getTicketId());
       ticketBox = ticketBoxService.getById(ticket.getBoxId());
       orderAmt = ticketBox.getSalePrice();
+
+      // 预付票设置金额为0
+      TicketPackage ticketPackage =  ticketPackageService.getById(ticket.getPkgId());
+      if (ticketPackage.getIsPre() == 1) {
+        orderAmt = 0;
+      }
     } else {
       // 线上购票
       ticketBox = ticketBoxService.getById(param.getBoxId());
@@ -148,16 +154,6 @@ public class UserTicketOrderController extends BaseApiController {
     orderSettleVO.setPicUrl(ticketBox.getPicUrl());
     orderSettleVO.setTitle(ticketBox.getTitle());
 
-    // 预付票设置金额为0
-    if (StringUtils.isNotBlank(param.getTicketId())) {
-      Ticket ticket = ticketService.getById(param.getTicketId());
-      TicketPackage ticketPackage =  ticketPackageService.getById(ticket.getPkgId());
-      if (ticketPackage.getIsPre() == 1) {
-        orderSettleVO.setPayAmt(0);
-        orderSettleVO.setOrderNum(0);
-      }
-    }
-
     // 缓存订单结算对象
     redisCache.setCacheObject(RedisKey.build(RedisKey.USER_TICKET_ORDER_KEY, userId), orderSettleVO, 10, TimeUnit.MINUTES);
     return AjaxResult.success(orderSettleVO);

mp-common/src/main/java/com/qs/mp/common/utils/AESUtil.java

@@ -40,7 +40,7 @@ public class AESUtil {
             SymmetricCrypto aes = new SymmetricCrypto(SymmetricAlgorithm.AES, key.getBytes());
             return aes.decryptStr(str);
         } catch (Exception e) {
-            throw new ServiceException("AES加密异常，str:" + str, e);
+            throw new ServiceException("AES解密异常，str:" + str, e);
 
         }
     }

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

@@ -459,6 +459,7 @@ public class UserTicketOrderServiceImpl extends
         ChannelCommission channelCommission = new ChannelCommission();
         channelCommission.setChannelId(channel.getChannelId());
         channelCommission.setOrderId(siteCommission.getOrderId());
+        channelCommission.setResource(resource);
         channelCommission.setBoxId(siteCommission.getBoxId());
         channelCommission.setSaleAmt(siteCommission.getSaleAmt());
         channelCommission.setSaleCommRate(siteCommission.getSaleCommRate());