update

src/main/java/com/gogirl/application/market/impl/MarketServiceImpl.java

@@ -3,7 +3,9 @@ package com.gogirl.application.market.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.gogirl.application.market.*;
 import com.gogirl.application.order.serve.OrderServeService;
-import com.gogirl.domain.market.coupon.*;
+import com.gogirl.domain.market.coupon.Coupon;
+import com.gogirl.domain.market.coupon.CouponCustomerRelevance;
+import com.gogirl.domain.market.coupon.CouponOrderRelevance;
 import com.gogirl.domain.market.timescard.TimesCardCustomerRelevance;
 import com.gogirl.domain.market.timescard.TimesCardUsedRecord;
 import com.gogirl.domain.order.serve.OrderManage;
@@ -18,11 +20,11 @@ import com.gogirl.infrastructure.mapper.order.serve.OrderServeMapper;
 import com.gogirl.shared.market.command.SetTimesCardCommand;
 import com.gogirl.shared.market.command.SetUpInnerCouponCommand;
 import com.gogirl.shared.market.command.SetUpOuterCouponCommand;
-import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.util.Comparator;
 import java.util.Date;
@@ -30,28 +32,35 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 @Service
-@AllArgsConstructor
 @Slf4j
 @Transactional
 public class MarketServiceImpl implements MarketService {
 
+    @Resource
+    private CouponMapper couponMapper;
 
-    private final CouponMapper couponMapper;
+    @Resource
+    private CouponCustomerRelevanceService couponCustomerRelevanceService;
 
-    private final CouponCustomerRelevanceService couponCustomerRelevanceService;
+    @Resource
+    private CouponOrderRelevanceService couponOrderRelevanceService;
 
-    private final CouponOrderRelevanceService couponOrderRelevanceService;
+    @Resource
+    private OrderManageMapper orderManageMapper;
+    @Resource
+    private OrderServeMapper orderServeMapper;
 
-    private final OrderManageMapper orderManageMapper;
-    private final OrderServeMapper orderServeMapper;
+    @Resource
+    private TimesCardCustomerRelevanceMapper timesCardCustomerRelevanceMapper;
+    @Resource
+    private CouponCustomerRelevanceMapper couponCustomerRelevanceMapper;
 
-    private final TimesCardCustomerRelevanceMapper timesCardCustomerRelevanceMapper;
-    private final CouponCustomerRelevanceMapper couponCustomerRelevanceMapper;
-
-    //    private final OrderManageService orderManageService;
-    private final OrderServeService orderServeService;
-    private final TimesCardUsedRecordService timesCardUsedRecordService;
-    private final TimesCardCustomerRelevanceService timesCardCustomerRelevanceService;
+    @Resource
+    private OrderServeService orderServeService;
+    @Resource
+    private TimesCardUsedRecordService timesCardUsedRecordService;
+    @Resource
+    private TimesCardCustomerRelevanceService timesCardCustomerRelevanceService;
 
 
     @Override
@@ -178,7 +187,6 @@ public class MarketServiceImpl implements MarketService {
         });
     }
 
-
     @Override
     public void setterOrderMarket(Integer orderId) {
 

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

@@ -138,8 +138,11 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
             //1.新增订单服务
             if (orderServeParam.getId() == null) {
                 OrderServe.OrderServeBuilder builder = OrderServe.builder()
+                        //创建时间
                         .createTime(new Date())
+                        //订单id
                         .orderId(param.getId())
+                        //订单服务改价
                         .serveChangePrice(BigDecimal.ZERO);
 
                 BaseServe baseServe = baseServeMapper.selectById(orderServeParam.getServeId());
@@ -226,7 +229,6 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
 
                 //服务价格
                 orderServe.setPrice(baseServe.getPrice());
-//                orderServe.setPayPrice(baseServe.getPrice());
                 orderServe.setAchievement(baseServe.getPrice());
 
                 if (orderServeParam.getProduceId() != null) {