自动选券

src/main/java/com/gogirl/application/market/coupon/impl/CouponCustomerRelevanceServiceImpl.java

@@ -58,6 +58,7 @@ public class CouponCustomerRelevanceServiceImpl extends ServiceImpl<CouponCustom
                         .eq(CouponCustomerRelevance::getCustomerId, currentCustomerId)
                         //内部券
                         .eq(CouponCustomerRelevance::getSourceType, 0)
+                        //卡券状态 正常
                         .eq(CouponCustomerRelevance::getState, 1))
                 //
                 .stream()

src/main/java/com/gogirl/application/order/serve/impl/OrderManageServiceImpl.java

@@ -44,6 +44,7 @@ import com.gogirl.infrastructure.mapper.user.customer.CustomerBalanceMapper;
 import com.gogirl.infrastructure.mapper.user.customer.CustomerMessageMapper;
 import com.gogirl.infrastructure.service.push.PushMsgService;
 import com.gogirl.infrastructure.util.SessionUtils;
+import com.gogirl.shared.market.command.SetUpInnerCouponCommand;
 import com.gogirl.shared.member.order.command.CreateCommentCommand;
 import com.gogirl.shared.member.order.command.OrderCommentCommand;
 import com.gogirl.shared.order.serve.query.qry.ordermanage.ListOrderQuery;
@@ -450,6 +451,20 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
             name = orderServe.getProduceName();
         }
         Customer customer = customerService.selectByCustomerId(orderManage.getOrderUser());
+        //todo 考虑代付
+        List<CouponCustomerRelevance> couponCustomerRelevanceList = couponCustomerRelevanceService.getOrderCoupon(orderManage.getOrderUser(), orderId);
+
+        couponCustomerRelevanceList.stream()
+
+                .filter(couponCustomerRelevance -> couponCustomerRelevance.getDiscountAmount() != null)
+                .filter(couponCustomerRelevance -> couponCustomerRelevance.getDiscountAmount().compareTo(orderManage.getTotalPaymentAmount()) <= 0)
+                .findAny()
+                .ifPresent(couponCustomerRelevance -> {
+                    marketService.setUpInnerCoupon(SetUpInnerCouponCommand.builder()
+                            .orderId(orderId)
+                            .innerCouponCustomerRelevanceIds(Lists.newArrayList(couponCustomerRelevance.getId()))
+                            .build());
+                });
 
         pushMsgService.sendOrderPayNotifyMsg(orderId,
                 customer.getOpenid1(),
@@ -1011,7 +1026,6 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
         return this.aggregateOrderManage(orderManage);
     }
 
-
     @Override
     public Double countOrderDataRate(Customer c, OrderManage om) {
         double dataRate = 0;

src/main/java/com/gogirl/application/order/serve/impl/ScheduleManageServiceImpl.java

@@ -599,6 +599,7 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
 
     @Override
     public void updateScheduledServeStatus(Integer scheduleServeId, Integer status, Integer forceLeisureConfig) {
+        /*1、校验*/
         ScheduleServe scheduleServe = scheduleServeMapper.selectById(scheduleServeId);
         if (scheduleServe.getMainServeId() != null) {
             throw new RRException("不能对辅助服务开单");

src/main/java/com/gogirl/interfaces/order/serve/OrderManageController.java

@@ -22,6 +22,7 @@ import com.gogirl.infrastructure.mapper.order.serve.OrderCommentMapper;
 import com.gogirl.infrastructure.mapper.order.serve.OrderServeDescribeMapper;
 import com.gogirl.infrastructure.mapper.product.purchase.PurchaseSkuMapper;
 import com.gogirl.infrastructure.util.SessionUtils;
+import com.gogirl.infrastructure.util.lock.OrderIdLock;
 import com.gogirl.shared.order.serve.query.dto.ordermanage.OrderManageDTO;
 import com.gogirl.shared.order.serve.query.qry.ordermanage.ListOrderQuery;
 import io.swagger.annotations.Api;
@@ -218,7 +219,13 @@ public class OrderManageController {
     @GetMapping("/technician/ordermanage/checkOrder")
     public JsonResult<Void> checkOrder(@RequestHeader String token,
                                        @RequestParam Integer orderId) {
-        orderManageService.checkOrder(orderId);
+        OrderIdLock orderIdLock = OrderIdLock.getInsatance();
+        try {
+            orderIdLock.lock(orderId);
+            orderManageService.checkOrder(orderId);
+        } finally {
+            orderIdLock.unlock(orderId);
+        }
         return JsonResult.success();
     }