Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into saas

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/MusicGroupPaymentCalenderAuditDto.java

@@ -47,6 +47,12 @@ public class MusicGroupPaymentCalenderAuditDto {
     @ApiModelProperty(value = "申请价格",required = false)
     private BigDecimal courseCurrentPrice;
 
+    @ApiModelProperty(value = "申请总价",required = false)
+    private BigDecimal currentTotalAMount;
+
+    @ApiModelProperty(value = "申请原价",required = false)
+    private BigDecimal originalTotalAMount;
+
     @ApiModelProperty(value = "备注",required = false)
     private String memo;
 
@@ -89,6 +95,22 @@ public class MusicGroupPaymentCalenderAuditDto {
     @ApiModelProperty(value = "会员现价",required = false)
     private BigDecimal memberPaymentAmount = BigDecimal.ZERO;
 
+    public BigDecimal getCurrentTotalAMount() {
+        return currentTotalAMount;
+    }
+
+    public void setCurrentTotalAMount(BigDecimal currentTotalAMount) {
+        this.currentTotalAMount = currentTotalAMount;
+    }
+
+    public BigDecimal getOriginalTotalAMount() {
+        return originalTotalAMount;
+    }
+
+    public void setOriginalTotalAMount(BigDecimal originalTotalAMount) {
+        this.originalTotalAMount = originalTotalAMount;
+    }
+
     public BigDecimal getOriginalMemberPaymentAmount() {
         return originalMemberPaymentAmount;
     }

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

@@ -123,8 +123,6 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 	@Autowired
 	private MemberRankSettingDao memberRankSettingDao;
 	@Autowired
-	private StudentService studentService;
-	@Autowired
 	private CloudTeacherOrderDao cloudTeacherOrderDao;
 	@Autowired
 	private MusicGroupPaymentCalenderActivityService musicGroupPaymentCalenderActivityService;
@@ -141,6 +139,9 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 		String musicGroupId = musicGroupPaymentCalenderDto.getMusicGroupId();
 
 		PaymentType paymentType = musicGroupPaymentCalenderDto.getPaymentType();
+		if(paymentType == ADD_COURSE || paymentType == MUSIC_APPLY || paymentType == MUSIC_RENEW){
+			throw new BizException("操作失败：该入口不支持{}",paymentType.getDesc());
+		}
 
 		PayUserType payUserType = musicGroupPaymentCalenderDto.getPayUserType();
 

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

@@ -267,7 +267,7 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
         // 创建账号、用户信息、用户和角色关系
         createUser(tenantInfo, orgId, Lists.newArrayList(roleId));
         //建立角色和菜单关系数据
-         Lists.partition(collectMenuId, 200)
+         Lists.partition(collectMenuId, 50)
                          .forEach(idList -> employeeService.batchInsertRoleMenu(roleId, idList, tenantId));
         //创建资产信息
         TenantAssetsInfo assetsInfo = new TenantAssetsInfo();

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

@@ -54,6 +54,8 @@ public class TenantOrderRecordServiceImpl extends ServiceImpl<TenantOrderRecordD
         return PageUtil.pageInfo(baseMapper.queryPage(pageInfo, dto));
     }
 
+    public static final String PAYMENT_ID_NOT_EXISTS = "payment_id_not_exists";
+
     @Override
     public Map<String, Object> checkTenantOrder(String orderNo) {
         TenantOrderRecord orderRecord = this.getOne(new WrapperUtil<TenantOrderRecord>()
@@ -63,7 +65,15 @@ public class TenantOrderRecordServiceImpl extends ServiceImpl<TenantOrderRecordD
             try {
                 payment = Payment.queryPayment(orderRecord.getTransNo());
                 log.info("checkTenantOrder  payment >>>>> {}", payment);
-                if (Objects.nonNull(payment.get("status"))) {
+                boolean flag = false;
+                if (Objects.nonNull(payment.get("error_code"))) {
+                    if (!PAYMENT_ID_NOT_EXISTS.equals(payment.get("error_code"))) {
+                        //确保订单已经创建
+                        flag = true;
+                    }
+                }
+                //确保订单已经创建 再 判断状态是成功还是失败
+                if (flag && Objects.nonNull(payment.get("status"))) {
                     String status = (String) payment.get("status");
                     if (status.equals("succeeded")) {
                         orderRecord.setOrderState(1);

mec-biz/src/main/resources/config/mybatis/MusicGroupPaymentCalenderMapper.xml

@@ -503,6 +503,8 @@
         <result property="addCourseTotalTime" column="course_total_minuties_"/>
         <result property="courseCurrentPrice" column="course_current_price_"/>
         <result property="courseOriginalPrice" column="course_original_price_"/>
+        <result property="currentTotalAMount" column="current_total_amount_"/>
+        <result property="originalTotalAMount" column="original_total_amount_"/>
         <result property="musicGroupPaymentCalenderId" column="id_"/>
         <result property="payUserType" column="pay_user_type_"/>
         <result property="calenderSettingsName" column="calender_settings_name_"/>
@@ -551,7 +553,7 @@
         CASE WHEN MAX(mgpc.payment_type_) = 'SPAN_GROUP_CLASS_ADJUST' THEN MAX(mgpc.payment_amount_) ELSE SUM(mgpccs.course_original_price_) END course_original_price_,
         SUM(mgpccs.course_current_price_) course_current_price_,
         mgpc.member_payment_amount_,
-        mgpc.original_member_payment_amount_,
+        mgpc.original_member_payment_amount_,mgpc.current_total_amount_,mgpc.original_total_amount_,
         MAX(mg.name_) music_group_name_,MAX(mg.organ_id_) organ_id_,MAX(mgpc.payment_pattern_)payment_pattern_
         FROM music_group_payment_calender mgpc
         LEFT JOIN music_group mg ON mg.id_ = mgpc.music_group_id_

mec-student/src/main/java/com/ym/mec/student/controller/MusicGroupPaymentCalenderController.java

@@ -89,7 +89,7 @@ public class MusicGroupPaymentCalenderController extends BaseController {
             model.put("activity",musicGroupPaymentCalenderActivityService.findByCalenderId(calenderId));
             calender.setMemberPaymentAmount(calenderDetail.getExpectMemberAmount());
             model.put("musicGroup",musicGroupDao.get(musicGroupId));
-            model.put("amount", calender.getPaymentAmount());
+            model.put("amount", calender.getCurrentTotalAmount());
             model.put("balance",studentRegistration.getBalance());
             model.put("calender",calender);
             model.put("memberPrivilegesItemList", memberRankPrivilegesService.queryByMemberRankId(calender.getMemberRankSettingId()));