Merge remote-tracking branch 'origin/saas' into saas

mec-biz/src/main/java/com/ym/mec/biz/service/impl/MusicGroupServiceImpl.java

@@ -460,20 +460,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         OrderTypeEnum type = OrderTypeEnum.SPORADIC;
         if (chargeInfo.getChargeType().equals(SporadicChargeTypeEnum.DOUBLE_ELEVEN2020)) {
             throw new Exception("活动已结束，谢谢您的支持！");
-//            type = OrderTypeEnum.DOUBLE_ELEVEN2020;
-//
-//            String startTimeStr = sysConfigDao.findConfigValue(SysConfigService.START_TIME_OF_1111);
-//            String endTimeStr = sysConfigDao.findConfigValue(SysConfigService.END_TIME_OF_1111);
-//            Date startTime = sdf_ymdhms.parse(startTimeStr);
-//            Date endTime = sdf_ymdhms.parse(endTimeStr);
-//            if (date.before(startTime)) {
-//                throw new Exception("活动暂未开始，请您耐心等待！");
-//            }
-//            if (date.after(endTime)) {
-//                throw new Exception("活动已结束，谢谢您的支持！");
-//            }
         }
-
+        Integer tenantId = chargeInfo.getTenantId();
         Integer userId = sporadicPayDto.getUserId();
         String orderNo = idGeneratorService.generatorId("payment") + "";
         String channelType = "";
@@ -484,6 +472,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         if (!(amount.compareTo(sporadicPayDto.getAmount()) == 0)) {
             throw new BizException("订单金额异常");
         }
+        studentPaymentOrder.setTenantId(tenantId);
         studentPaymentOrder.setUserId(userId);
         studentPaymentOrder.setGroupType(GroupType.SPORADIC);
         studentPaymentOrder.setOrderNo(orderNo);
@@ -555,13 +544,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                 chargeInfo.getOrganId(),
                 receiver
         );
-
-        //Map<String, BigDecimal> routingFee = (Map<String, BigDecimal>) payMap.get("routingFee");
         studentPaymentOrder.setOrganId(chargeInfo.getOrganId());
-        //studentPaymentOrder.setRoutingOrganId(chargeInfo.getOrganId());
-        //studentPaymentOrder.setRoutingOrganId((Integer) payMap.get("routingOrganId"));
-        //studentPaymentOrder.setComAmount(routingFee.get("COM"));
-        //studentPaymentOrder.setPerAmount(routingFee.get("PER"));
         studentPaymentOrder.setMerNos((String) payMap.get("routingMerNos"));
         studentPaymentOrder.setPaymentChannel((String) payMap.get("type"));
         studentPaymentOrder.setUpdateTime(date);