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

service/src/main/java/com/hfkj/service/order/impl/BsOrderServiceImpl.java

@@ -284,6 +284,9 @@ public class BsOrderServiceImpl implements BsOrderService {
             if (discountUserRel.getStatus() != 1) {
                 throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "优惠券状态不处于待使用");
             }
+            discountUserRel.setStatus(2);
+            discountUserRel.setUseEndTime(new Date());
+            couponDiscountUserRelService.update(discountUserRel);
             // 查询优惠券
             CouponDiscount discount = couponDiscountService.queryDetail(discountUserRel.getDiscountId());
             if (discount == null) {
@@ -350,6 +353,7 @@ public class BsOrderServiceImpl implements BsOrderService {
                 throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未知优惠券");
             }
             discountUserRel.setStatus(1);
+            discountUserRel.setUseTime(null);
             couponDiscountUserRelService.update(discountUserRel);
         }