Przeglądaj źródła

活动排课去掉vip课审核逻辑

zouxuan 3 lat temu
rodzic
commit
ff99c49417

+ 3 - 3
mec-biz/src/main/java/com/ym/mec/biz/service/impl/PracticeGroupServiceImpl.java

@@ -4752,9 +4752,9 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         applyBaseInfoDto.setAuditStatus(AuditStatusEnum.PASS);
 
         //如果默认课酬与实际课酬不匹配则需要审批
-        if(costInfo.get("onlineTeacherSalary").compareTo(applyBaseInfoDto.getOnlineTeacherSalary()) < 0){
-            applyBaseInfoDto.setAuditStatus(AuditStatusEnum.ING);
-        }
+//        if(costInfo.get("onlineTeacherSalary").compareTo(applyBaseInfoDto.getOnlineTeacherSalary()) < 0){
+//            applyBaseInfoDto.setAuditStatus(AuditStatusEnum.ING);
+//        }
 
         applyBaseInfoDto.setTotalPrice(costInfo.get("totalPrice"));
         applyBaseInfoDto.setOnlineTeacherSalary(costInfo.get("onlineTeacherSalary"));

+ 3 - 3
mec-biz/src/main/java/com/ym/mec/biz/service/impl/VipGroupServiceImpl.java

@@ -317,9 +317,9 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 
 		vipGroupApplyBaseInfoDto.setStatus(VipGroupStatusEnum.APPLYING);
 		//如果默认课酬与实际课酬不匹配则需要审批
-		if(costInfo.get("offlineTeacherSalary").compareTo(vipGroupApplyBaseInfoDto.getOfflineTeacherSalary()) < 0){
-			vipGroupApplyBaseInfoDto.setAuditStatus(AuditStatusEnum.ING);
-		}
+//		if(costInfo.get("offlineTeacherSalary").compareTo(vipGroupApplyBaseInfoDto.getOfflineTeacherSalary()) < 0){
+//			vipGroupApplyBaseInfoDto.setAuditStatus(AuditStatusEnum.ING);
+//		}
 
 		vipGroupApplyBaseInfoDto.setTotalPrice(costInfo.get("totalPrice"));
 		if(CollectionUtils.isEmpty(vscps)){

+ 12 - 0
mec-web/src/main/java/com/ym/mec/web/controller/education/ActivityController.java

@@ -158,6 +158,18 @@ public class ActivityController extends BaseController {
     }
 
     @ApiOperation(value = "分部双11活动统计")
+    @GetMapping("/organDoubleEleven2021Statis")
+    public HttpResponseResult<LuckStatisDto> organDoubleEleven2021Statis(){
+        return null;
+    }
+
+    @ApiOperation(value = "双11活动统计")
+    @GetMapping("/doubleEleven2021Statis")
+    public HttpResponseResult<LuckStatisDto> doubleEleven2021Statis(){
+        return null;
+    }
+
+    @ApiOperation(value = "分部双11活动统计")
     @GetMapping("/doubleEleven2020Statis")
     public HttpResponseResult<LuckStatisDto> doubleEleven2020Statis() {
         //获取所有参与分部