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/SysCouponCodeServiceImpl.java

@@ -99,7 +99,7 @@ public class SysCouponCodeServiceImpl extends BaseServiceImpl<Long, SysCouponCod
 			couponCodes.add(couponCode);
 		}
 		sysCouponCodeDao.batchInsert(couponCodes);
-		sysCoupon.setConsumeNum(new AtomicInteger(sysCoupon.getConsumeNum()).incrementAndGet());
+		sysCoupon.setConsumeNum(new AtomicInteger(sysCoupon.getConsumeNum()).addAndGet(exchangeNum));
 		if(sysCoupon.getWarningStatus()==0&&sysCoupon.getStockCount()!=-1&&sysCoupon.getStockCount()-sysCoupon.getConsumeNum()<sysCoupon.getWarningStockNum()){
 			sysCouponService.stockWarning(sysCoupon.getId(), sysCoupon.getName());
 			sysCoupon.setWarningStatus(1);

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

@@ -135,7 +135,13 @@
 				AND scc.payment_order_id_=#{paymentOrderId}
 			</if>
 			<if test="usageStatus!=null">
-				AND scc.usage_status_=#{usageStatus}
+				<if test="usageStatus &lt; 2">
+					AND scc.usage_status_=#{usageStatus}
+					AND scc.use_deadline_date_ &gt;= NOW()
+				</if>
+				<if test="usageStatus == 2">
+					AND scc.use_deadline_date_ &lt; NOW()
+				</if>
 			</if>
 			<if test="organId!=null">
 				AND su.organ_id_=#{organId}
@@ -160,7 +166,7 @@
 			scc.use_start_date_,
 			scc.use_deadline_date_,
 			scc.used_time_,
-			scc.usage_status_
+		    IF(scc.use_deadline_date_ &gt;= NOW(),scc.usage_status_,2) usage_status_
 		FROM sys_coupon_code scc
 			 LEFT JOIN sys_coupon sc ON scc.coupon_id_=sc.id_
 			 LEFT JOIN sys_user su ON scc.user_id_=su.id_