优化代码

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

@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
 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.biz.dal.dao.*;
 import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.*;
@@ -834,7 +833,13 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         // 拆分各商品，如果有优惠券则计算使用券后的金额，并写入订单详情
         studentPaymentOrder = studentRegistrationService.addOrder(studentRegistration, studentPaymentOrder, goodsDto, registerPayDto, couponPayParam);
         //goodsDto.getOrderAmount 真实的原价  -  优惠的钱 = 本次订单应付的钱
-        BigDecimal actualAmount = goodsDto.getOrderAmount().subtract(studentPaymentOrder.getCouponRemitFee());
+        BigDecimal actualAmount = goodsDto.getOrderAmount()
+                .subtract(studentPaymentOrder.getCouponRemitFee());
+        //+ 课程优惠的钱(如果课程是送的那么加上)
+        if (Objects.nonNull(goodsDto.getCourseRemitFee())) {
+            actualAmount = actualAmount.add(goodsDto.getCourseRemitFee());
+        }
+
         //前端获取的价格
         BigDecimal amount = registerPayDto.getAmount();
         //校验 页面传入的价格 和 （本次原价-优惠价后的价格） 是否一致
@@ -1321,10 +1326,10 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 
         //乐器采购清单是否确认
         List<StudentPaymentOrderDetail> applyOrder = studentPaymentOrderDetailService.findApplyOrderSuccess(musicGroupId, DealStatusEnum.SUCCESS);
-        if(applyOrder != null && applyOrder.size() > 0){
+        if (applyOrder != null && applyOrder.size() > 0) {
             //是否购买了乐器，支持无乐器乐团
             long count = applyOrder.stream().filter(e -> StringUtils.isNotEmpty(e.getGoodsIdList())).count();
-            if(count > 0l){
+            if (count > 0l) {
                 Map<String, Object> param = new HashMap<>();
                 param.put("musicGroupId", musicGroupId);
                 param.put("tenantId", musicGroup.getTenantId());
@@ -1962,11 +1967,11 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         if (reqMusicGroupQuit.getStatus() == PROCESSING) {
             SysUser sysUser = sysUserFeignService.queryUserById(userId);
 
-            Set<Integer> integers = employeePositionService.queryUserIdByRoleId(new SysUserRoleEnum[]{ORGAN_MANAGER},musicGroup.getOrganId());
+            Set<Integer> integers = employeePositionService.queryUserIdByRoleId(new SysUserRoleEnum[]{ORGAN_MANAGER}, musicGroup.getOrganId());
             if (currentOperatorRoleIds == null || currentOperatorRoleIds.size() == 0) {
                 integers.add(musicGroup.getEducationalTeacherId());
             }
-            if(integers.size() > 0){
+            if (integers.size() > 0) {
                 Map<Integer, String> receivers = new HashMap<>(integers.size());
                 for (Integer integer : integers) {
                     receivers.put(integer, integer.toString());
@@ -3760,7 +3765,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 
     @Override
     public PageInfo<MusicMemberDto> queryMusicMemberList(MusicMemberQueryInfo queryInfo) {
-         String configValue = sysTenantConfigService.getTenantConfigValue(SysConfigService.PUSH_MEMBER_RENEW_QUIT, queryInfo.getTenantId());
+        String configValue = sysTenantConfigService.getTenantConfigValue(SysConfigService.PUSH_MEMBER_RENEW_QUIT, queryInfo.getTenantId());
         if (StringUtils.isEmpty(configValue)) {
             configValue = "15";
         }