Merge branch 'master' into 3.8

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

@@ -1046,6 +1046,7 @@ public class MarketServiceImpl implements MarketService {
 
         //查询订单聚合
         OrderManage orderManage = orderManageMapper.selectById(orderId);
+
         List<OrderServe> orderServeList = orderServeMapper.selectList(new LambdaQueryWrapper<OrderServe>().eq(OrderServe::getOrderId, orderId));
         orderManage.setListOrderServer(orderServeList);
 
@@ -1144,8 +1145,8 @@ public class MarketServiceImpl implements MarketService {
         }
 
         //卡券之前删除订单服务和卡券关联
-        couponOrderRelevanceService.remove(new LambdaQueryWrapper<CouponOrderRelevance>()
-                .eq(CouponOrderRelevance::getOrderId, orderId));
+        couponOrderRelevanceService.remove(new LambdaQueryWrapper<CouponOrderRelevance>().eq(CouponOrderRelevance::getOrderId, orderId));
+
 
         //3、外部券
         if (ListUtil.isNotEmpty(outerCouponCustomerRelevanceServiceList)) {
@@ -1214,6 +1215,7 @@ public class MarketServiceImpl implements MarketService {
 
                     });
         }
+
         //4、内部券
         if (ListUtil.isNotEmpty(innerCouponCustomerRelevanceServiceList)) {
 
@@ -1313,6 +1315,7 @@ public class MarketServiceImpl implements MarketService {
                     .collect(Collectors.toList());
             freeInnerCouponCustomerRelevanceServiceList.forEach(couponCustomerRelevanceConsumer);
 
+
             //6、普通内部券
             List<CouponCustomerRelevance> normalInnerCouponCustomerRelevanceServiceList = innerCouponCustomerRelevanceServiceList
                     .stream()
@@ -1343,7 +1346,11 @@ public class MarketServiceImpl implements MarketService {
             if (freeInnerCouponCustomerRelevanceServiceList.size() > 1) {
                 throw new RRException("免单券券只能用一张");
             }
+
+
         }
+
+
         orderManageMapper.updateById(orderManage);
         orderServeService.updateBatchById(orderServeList);
     }

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

@@ -359,7 +359,7 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
                 orderServe.setCommentStatus(orderServeParam.getCommentStatus());
                 //订单服务备注
                 orderServe.setRemark(orderServeParam.getRemark());
-
+                orderServe.setOwnProduceId(orderServeParam.getOwnProduceId());
                 //更新订单详情时校验自带款式是否设置
                 if (orderServe.getIsOwnProduce().equals(1)) {
                     if (orderServe.getOwnProduceId() == null) {
@@ -368,10 +368,6 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
                     orderServe.setIsOwnProduce(1);
                     orderServe.setOwnProduce(ownProduceMapper.selectById(orderServe.getOwnProduceId()));
                 }
-//                else {
-//                    orderServe.setIsOwnProduce(2);
-//                    orderServe.setOwnProduceId(null);
-//                }
 
                 orderServe.calcPriceAndTimeLength();
                 orderServeMapper.updateById(orderServe);

src/main/java/com/gogirl/interfaces/xcx/ScheduleLogController.java

+package com.gogirl.interfaces.xcx;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020-07-08
+ */
+@RestController
+@RequestMapping("/schedule-log")
+public class ScheduleLogController {
+
+}