src/main/java/com/mzl/flower/service/flower/FlowerService.java
@@ -333,8 +333,6 @@ dto.setZoneName(String.join(",", zoneNameLs)); } //TODO 合伙人加价列表 return dto; } src/main/java/com/mzl/flower/service/payment/OrderService.java
@@ -40,6 +40,7 @@ import com.mzl.flower.mapper.system.UserWechatMapper; import com.mzl.flower.mapper.warehouse.WarehouseLocationMapper; import com.mzl.flower.service.BaseService; import com.mzl.flower.service.coupon.CouponRecordService; import com.mzl.flower.service.flower.FlowerService; import com.mzl.flower.service.menber.MemberGrowthRecordService; import com.mzl.flower.service.point.CustomerPointService; @@ -153,6 +154,9 @@ @Autowired private RedisLockService lockService; @Autowired private CouponRecordService couponRecordService; public void changeFlower2Cart(CartSaveDTO dto) { String userId = SecurityUtils.getUserId(); @@ -560,7 +564,9 @@ private CouponRecordDO useCouponRecord(String orderId, BigDecimal amount, String couponRecordId){ if(StringUtils.isNotEmpty(couponRecordId)){ //TODO 优惠券使用和验证,如果不符合使用条件需要抛出异常。需调用优惠券使用方法 //优惠券使用和验证,如果不符合使用条件需要抛出异常。需调用优惠券使用方法 couponRecordService.useCoupon(couponRecordId, orderId, amount); return couponRecordService.getCouponRecordById(couponRecordId); } return null; src/main/java/com/mzl/flower/service/payment/UserPaymentV3Service.java
@@ -15,6 +15,7 @@ import com.mzl.flower.mapper.payment.*; import com.mzl.flower.mapper.system.UserWechatMapper; import com.mzl.flower.service.BaseService; import com.mzl.flower.service.coupon.CouponRecordService; import com.mzl.flower.service.flower.FlowerService; import com.mzl.flower.service.point.PointGoodsService; import com.mzl.flower.utils.UUIDGenerator; @@ -110,6 +111,9 @@ @Autowired private PointGoodsService pointGoodsService; @Autowired private CouponRecordService couponRecordService; /** * 微信预支付 @@ -452,7 +456,8 @@ //恢复积分商品兑换券 revertPointGoodsRecord(order.getId()); //TODO 恢复优惠券 //恢复优惠券 couponRecordService.cancelCouponUsage(order.getId()); } private void revertPointGoodsRecord(String orderId){