Merge branch 'mec_update_2021-11-02' of http://git.dayaedu.com/yonge/mec into music_score_zouxuan

mec-biz/src/main/java/com/ym/mec/biz/service/ActivityUserMapperService.java

@@ -103,4 +103,5 @@ public interface ActivityUserMapperService extends BaseService<Integer, Activity
     * @date 2021/11/18 11:19
     */
     void cut(Integer activityUserMapperId, String memo, BigDecimal amount);
+
 }

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

@@ -11,6 +11,7 @@ import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.enums.ReturnFeeEnum;
 import com.ym.mec.biz.dal.page.ActivityStudentQueryInfo;
 import com.ym.mec.biz.service.ActivityUserMapperService;
+import com.ym.mec.common.constant.CommonConstants;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.page.PageInfo;
@@ -224,8 +225,9 @@ public class ActivityUserMapperServiceImpl extends BaseServiceImpl<Integer, Acti
 		if(amount == null || amount.compareTo(BigDecimal.ZERO) <= 0){
 			return;
 		}
-		if(amount.compareTo(activityUserMapper.getActualPrice()) > 0){
-			throw new BizException("操作失败：退费金额不得超过购买金额{}",activityUserMapper.getActualPrice());
+		BigDecimal actualPrice = activityUserMapper.getActualPrice().multiply(new BigDecimal(0.995)).setScale(CommonConstants.DECIMAL_FINAL_PLACE, BigDecimal.ROUND_HALF_UP);
+		if(amount.compareTo(actualPrice) > 0){
+			throw new BizException("操作失败：退费金额不得超过购买金额{}",actualPrice);
 		}
 		SysUser user = teacherDao.getUser(activityUserMapper.getUserId());
 		SysUserCashAccountLog sysUserCashAccountLog = new SysUserCashAccountLog();

mec-web/src/main/java/com/ym/mec/web/controller/ActivityUserMapperController.java

@@ -3,9 +3,12 @@ package com.ym.mec.web.controller;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dto.ActivityUserMapperAddDto;
+import com.ym.mec.biz.dal.entity.ActivityUserMapper;
 import com.ym.mec.biz.dal.page.ActivityStudentQueryInfo;
 import com.ym.mec.biz.service.ActivityUserMapperService;
+import com.ym.mec.common.constant.CommonConstants;
 import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.page.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,6 +19,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 @Api(tags = "学员活动排课记录服务")
 @RequestMapping("activityUserMapper")
@@ -52,6 +56,13 @@ public class ActivityUserMapperController extends BaseController {
     @RequestMapping("/queryPage")
     @PreAuthorize("@pcs.hasPermissions('activityUserMapper/queryPage')")
     public Object queryPage(ActivityStudentQueryInfo queryInfo){
-        return succeed(activityUserMapperService.queryPage(queryInfo));
+        PageInfo<ActivityUserMapper> pageInfo = activityUserMapperService.queryPage(queryInfo);
+        List<ActivityUserMapper> rows = pageInfo.getRows();
+        if(rows != null && rows.size() > 0){
+            for (ActivityUserMapper row : rows) {
+                row.setActualPrice(row.getActualPrice().multiply(new BigDecimal(0.995)).setScale(CommonConstants.DECIMAL_FINAL_PLACE, BigDecimal.ROUND_HALF_UP));
+            }
+        }
+        return succeed(pageInfo);
     }
 }