feat:优惠券

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,8 +135,8 @@
 				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">