Merge branch 'cloud_teacher_active_2021_09' of http://git.dayaedu.com/yonge/mec

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-biz/src/main/java/com/ym/mec/biz/service/impl/SysCouponServiceImpl.java

@@ -59,9 +59,11 @@ public class SysCouponServiceImpl extends BaseServiceImpl<Integer, SysCoupon>  i
 		}
 		//如果已经有人领取，则只能修改库存总量与预警值
 		if(oldCoupon.getConsumeNum()>0){
+			if(oldCoupon.getStatus()==0){
+				oldCoupon.setStockCount(sysCoupon.getStockCount());
+				oldCoupon.setWarningStockNum(sysCoupon.getWarningStockNum());
+			}
 			oldCoupon.setStatus(sysCoupon.getStatus());
-			oldCoupon.setStockCount(sysCoupon.getStockCount());
-			oldCoupon.setWarningStockNum(sysCoupon.getWarningStockNum());
 			if(oldCoupon.getStockCount()-oldCoupon.getConsumeNum()>oldCoupon.getWarningStockNum()){
 				oldCoupon.setWarningStatus(0);
 			}

mec-biz/src/main/resources/config/mybatis/SysCouponCodeMapper.xml

@@ -24,7 +24,7 @@
 		<result column="organ_id_" property="organId"/>
 		<result column="organ_name_" property="organName"/>
 		<result column="user_id_" property="userId"/>
-		<result column="user_name_" property="userName"/>
+		<result column="username_" property="userName"/>
 		<result column="phone_" property="phone"/>
 		<result column="coupon_id_" property="couponId"/>
 		<result column="coupon_type_" property="couponType" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>

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