云教练活动

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

@@ -132,7 +132,7 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
 			if(studentPaymentOrder != null){
 				DealStatusEnum status = studentPaymentOrder.getStatus();
 				if(status == DealStatusEnum.SUCCESS){
-					throw new BizException("您已参与云教练 {} 活动，快去练习吧！",remark);
+					throw new BizException("您已参与此云教练活动，快去练习吧！");
 				}
 				if(status == DealStatusEnum.ING){
 					throw new BizException("您有待处理的订单，请稍后重试");
@@ -423,10 +423,10 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
 		}
 		if(activeRemark.equals(202109)){
 			switch (remark){
-				case "2增1":
+				case "2赠1":
 					sysCouponCodeService.exchangeCoupon(cloudTeacherOrder.getStudentId(),1,cloudTeacherOrder.getOrderId(),3);
 					break;
-				case "3增2":
+				case "3赠2":
 					sysCouponCodeService.exchangeCoupon(cloudTeacherOrder.getStudentId(),1,cloudTeacherOrder.getOrderId(),6);
 					break;
 			}

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

@@ -132,10 +132,9 @@ public class StudentOrderController extends BaseController {
     @Autowired
     private CloudTeacherOrderService cloudTeacherOrderService;
     @Autowired
-    private StudentRegistrationDao studentRegistrationDao;
-
+    private SysCouponCodeDao sysCouponCodeDao;
     @Autowired
-    private MemberRankPrivilegesService memberRankPrivilegesService;
+    private StudentRegistrationDao studentRegistrationDao;
 
     @Autowired
     private SellOrderService sellOrderService;
@@ -259,7 +258,13 @@ public class StudentOrderController extends BaseController {
         } else if (orderByOrderNo.getGroupType().equals(GroupType.DEGREE)) {
             orderDetail.put("detail", childrenDayDegreeDetailDao.getByOrderId(orderByOrderNo.getId()));
         } else if (orderByOrderNo.getGroupType().equals(GroupType.MEMBER)) {
-            orderDetail.put("detail", cloudTeacherOrderService.queryOrderInfoByOrderId(orderByOrderNo.getId()));
+            CloudTeacherOrderDto orderDto = cloudTeacherOrderService.queryOrderInfoByOrderId(orderByOrderNo.getId());
+            orderDetail.put("detail",orderDto);
+            if(orderDto != null){
+                Map<String,Object> map = new HashMap<>(1);
+                map.put("paymentOrderId",orderDto.getCloudTeacherOrder().getOrderId());
+                orderDetail.put("couponList",sysCouponCodeDao.querySysCouponUseList(map));
+            }
         }
         return succeed(orderDetail);
     }

mec-web/src/main/java/com/ym/mec/web/config/ResourceServerConfig.java

@@ -37,7 +37,7 @@ public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
                         "/uploadFile", "/eduContracts/queryProduceContract", "/activity/doubleEleven2020Statis", "/replacementInstrument/queryPage",
                         "/replacementInstrumentActivity/queryReplacementsStat", "/eduStudentRegistration/queryPreApplyList",
                         "/eduSubject/findSubSubjects", "/eduFinancialExpenditure/batchAdd", "/eduSendNotice/*",
-                        "/oaContracts/*", "/eduStudent/organStudentOverView").permitAll().anyRequest().authenticated().and().httpBasic();
+                        "/oaContracts/*", "/eduStudent/organStudentOverView", "/activity/countCloudTeacherActive").permitAll().anyRequest().authenticated().and().httpBasic();
     }
 
     @Override