修改优惠券使用逻辑

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

@@ -3,7 +3,6 @@ package com.ym.mec.biz.service.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
-import com.ym.mec.auth.api.entity.SysUserRole;
 import com.ym.mec.auth.api.enums.CertificateTypeEnum;
 import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.dto.*;
@@ -749,10 +748,12 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
             analyzeAmount(couponPayTypeInfo, singleTypeList, list);
         });
         List<StudentPaymentOrderDetail> allList = new ArrayList<>();
-        //再处理全类型优惠券数据
-        if (CollectionUtils.isNotEmpty(allTypeList)) {
-            allTypeList.addAll(singleTypeList);
+        allTypeList.addAll(singleTypeList);
+        //有全类型优惠券就再处理全类型优惠券数据
+        if (Objects.nonNull(couponParam.get(CouponDetailTypeEnum.FULLCOUPON.getCode()))) {
             analyzeAmount(couponParam.get(CouponDetailTypeEnum.FULLCOUPON.getCode()), allList, allTypeList);
+        } else {
+            allList.addAll(allTypeList);
         }
     }
 
@@ -806,12 +807,12 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
 
         SysUser sysUser = studentRegistrationDao.getSysUserByPhone(studentRegistration.getParentsPhone());
         StudentRegistration phoneAndMusicGroupId = null;
-        if(sysUser != null){
-            if(!musicGroup.getTenantId().equals(sysUser.getTenantId())){
+        if (sysUser != null) {
+            if (!musicGroup.getTenantId().equals(sysUser.getTenantId())) {
                 throw new BizException("该手机号已注册");
             }
             phoneAndMusicGroupId = studentRegistrationDao.getByUserIdAndMusicGroupId(musicGroupId, sysUser.getId());
-        }else {
+        } else {
             phoneAndMusicGroupId = studentRegistrationDao.getByPhoneAndMusicGroupId(musicGroupId, studentRegistration.getParentsPhone());
         }
 

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

@@ -24,7 +24,6 @@ import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.page.PageUtil;
 import com.ym.mec.common.page.WrapperUtil;
 import com.ym.mec.common.service.IdGeneratorService;
-import com.ym.mec.thirdparty.adapay.Payment;
 import com.ym.mec.thirdparty.yqpay.DateUtils;
 import com.ym.mec.thirdparty.yqpay.Msg;
 import com.ym.mec.util.date.DateUtil;
@@ -238,7 +237,7 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
 
     /**
      * 启用/停用
-     * 第一个启用默认激活账号等信息
+     * 第一次启用默认开通账号
      *
      * @param id    机构id
      * @param state 机构状态1启动 2停用
@@ -447,7 +446,7 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
                     baseApiUrl + "/api-student/studentOrder/paymentResult?orderNo=" + orderNo,
                     tenantEnum.getMsg(),
                     tenantEnum.getMsg(),
-                    1,//临时写死
+                    1,//todo 机构开通付款临时写死
                     tenantEnum.getCode()
             );
         } else {
@@ -604,8 +603,8 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
     public Map<String, Object> recharge(Integer tenantId, BigDecimal amount) throws Exception {
         log.error("机构 " + tenantId.toString() + "充值");
         TenantInfo tenantInfo = Optional.ofNullable(tenantId)
-                                        .map(baseMapper::selectById)
-                                        .orElseThrow(() -> new BizException("充值时,未查询到机构信息!"));
+                .map(baseMapper::selectById)
+                .orElseThrow(() -> new BizException("充值时,未查询到机构信息!"));
         String key = "Tenant_Pay:" + tenantId;
         RBucket<Object> bucket = redissonClient.getBucket(key);
         //原子操作 抢锁成功为true