Merge remote-tracking branch 'origin/cloud_teacher_active_2021_09' into cloud_teacher_active_2021_09

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"/>