1、支持前端参数过滤空

2、初始化接口

src/main/java/com/gogirl/application/market/coupon/MarketService.java

@@ -56,8 +56,12 @@ public interface MarketService {
 
 
     /**
-     *
      * @param orderId
      */
     void achievementReCalc(Integer orderId);
+
+    /**
+     * @param orderId
+     */
+    void orderAmountReCalc(Integer orderId);
 }

src/main/java/com/gogirl/application/order/serve/IOwnProduceService.java

@@ -2,8 +2,11 @@ package com.gogirl.application.order.serve;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.gogirl.domain.order.serve.OwnProduce;
+import com.gogirl.domain.product.serve.TechniqueSku;
 import com.gogirl.shared.order.OwnProduceCommand;
 
+import java.util.List;
+
 /**
  * <p>
  * 服务类
@@ -21,4 +24,10 @@ public interface IOwnProduceService extends IService<OwnProduce> {
      */
     OwnProduce saveOrUpdateOwnProduce(OwnProduceCommand command);
 
+    /**
+     * 查询已经选择的技法sku
+     * @param ownProduceId
+     * @return
+     */
+    List<TechniqueSku> getByOwnProduceId(Integer ownProduceId);
 }

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

@@ -7,9 +7,7 @@ import com.gogirl.application.order.serve.IOwnProduceTechniqueSkuService;
 import com.gogirl.domain.order.serve.OwnProduce;
 import com.gogirl.domain.order.serve.OwnProduceTechniqueSku;
 import com.gogirl.domain.product.serve.TechniqueSku;
-import com.gogirl.infrastructure.mapper.order.serve.OrderServeMapper;
 import com.gogirl.infrastructure.mapper.order.serve.OwnProduceMapper;
-import com.gogirl.infrastructure.mapper.order.serve.ScheduleServeMapper;
 import com.gogirl.infrastructure.mapper.product.serve.TechniqueSkuMapper;
 import com.gogirl.shared.order.OwnProduceCommand;
 import lombok.extern.slf4j.Slf4j;
@@ -19,6 +17,7 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -38,15 +37,18 @@ public class OwnProduceServiceImpl extends ServiceImpl<OwnProduceMapper, OwnProd
     @Resource
     TechniqueSkuMapper techniqueSkuMapper;
     @Resource
-    ScheduleServeMapper scheduleServeMapper;
-    @Resource
-    OrderServeMapper orderServeMapper;
+    OwnProduceMapper ownProduceMapper;
 
 
     @Override
     @Transactional(rollbackFor = Exception.class)
     public OwnProduce saveOrUpdateOwnProduce(OwnProduceCommand command) {
 
+        command.setOwnProduceTechniqueSkuCommandList(command.getOwnProduceTechniqueSkuCommandList()
+                .stream().filter(Objects::nonNull)
+                .filter(obj -> obj.getTechniqueSkuId() != null)
+                .collect(Collectors.toList()));
+
         OwnProduce ownProduce;
 
         if (command.getOwnProduceId() == null) {
@@ -96,4 +98,9 @@ public class OwnProduceServiceImpl extends ServiceImpl<OwnProduceMapper, OwnProd
 
         return ownProduce;
     }
+
+    @Override
+    public List<TechniqueSku> getByOwnProduceId(Integer ownProduceId) {
+        return ownProduceMapper.getByOwnProduceId(ownProduceId);
+    }
 }

src/main/java/com/gogirl/domain/product/serve/TechniqueSku.java

@@ -72,5 +72,8 @@ public class TechniqueSku implements Serializable {
     @TableField(exist = false)
     private String techniqueCategoryName;
 
+    @ApiModelProperty(value = "")
+    @TableField(exist = false)
+    private Integer quantity;
 
 }

src/main/java/com/gogirl/infrastructure/mapper/order/serve/OwnProduceMapper.java

@@ -2,6 +2,9 @@ package com.gogirl.infrastructure.mapper.order.serve;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.gogirl.domain.order.serve.OwnProduce;
+import com.gogirl.domain.product.serve.TechniqueSku;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +16,10 @@ import com.gogirl.domain.order.serve.OwnProduce;
  */
 public interface OwnProduceMapper extends BaseMapper<OwnProduce> {
 
+    /**
+     *
+     * @param ownProduceId
+     * @return
+     */
+    List<TechniqueSku> getByOwnProduceId(Integer ownProduceId);
 }

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

@@ -3,15 +3,15 @@ package com.gogirl.interfaces.order.serve;
 
 import com.gogirl.application.order.serve.IOwnProduceService;
 import com.gogirl.domain.order.serve.OwnProduce;
+import com.gogirl.domain.product.serve.TechniqueSku;
 import com.gogirl.infrastructure.common.base.JsonResult;
 import com.gogirl.shared.order.OwnProduceCommand;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * <p>
@@ -35,4 +35,11 @@ public class OwnProduceController {
         return JsonResult.success(ownProduce);
     }
 
+    @ApiOperation("查询已经选择的技法sku")
+    @GetMapping("/getByOwnProduceId")
+    public JsonResult<List<TechniqueSku>> getByOwnProduceId(@RequestParam Integer ownProduceId) {
+        List<TechniqueSku> list = ownProduceService.getByOwnProduceId(ownProduceId);
+        return JsonResult.success(list);
+    }
+
 }

src/main/resources/mapper/OwnProduceMapper.xml

@@ -2,4 +2,11 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.gogirl.infrastructure.mapper.order.serve.OwnProduceMapper">
 
+    <select id="getByOwnProduceId" resultType="com.gogirl.domain.product.serve.TechniqueSku">
+        SELECT t2.quantity, t3.*
+        from own_produce t1
+                 LEFT JOIN own_produce_technique_sku t2 on t1.id = t2.own_produce_id
+                 LEFT JOIN technique_sku t3 on t2.technique_sku_id = t3.id
+        where t1.id = #{ownProduceId}
+    </select>
 </mapper>

src/test/java/com/gogirl/Test.java

@@ -19,7 +19,6 @@ import com.gogirl.domain.order.serve.OrderManage;
 import com.gogirl.domain.order.serve.OrderServe;
 import com.gogirl.domain.product.purchase.PurchaseStock;
 import com.gogirl.domain.product.purchase.PurchaseStockRecord;
-import com.gogirl.domain.product.serve.BaseProduce;
 import com.gogirl.domain.store.complaint.ComplaintDetailed;
 import com.gogirl.domain.store.complaint.ComplaintDetailedTechnician;
 import com.gogirl.domain.store.complaint.ComplaintMain;
@@ -57,7 +56,6 @@ import com.gogirl.infrastructure.mapper.xcx.TimeNodeMapper;
 import com.gogirl.infrastructure.mapper.xcx.WeekConfigMapper;
 import com.gogirl.infrastructure.schedule.Schedule;
 import com.gogirl.infrastructure.service.mail.MailService;
-import com.gogirl.shared.product.CalcServiceDuration;
 import com.gogirl.shared.product.PurchaseSkuPOI;
 import lombok.extern.slf4j.Slf4j;
 import org.assertj.core.util.Lists;
@@ -655,7 +653,6 @@ public class Test {
     @org.junit.Test
     public void reCalcOrderDataIntegrity() {
 
-
         List<OrderManage> orderManageList = orderManageMapper.selectList(new LambdaQueryWrapper<OrderManage>()
                 .gt(OrderManage::getCreateTime, "2020-01-01"));
 
@@ -702,19 +699,8 @@ public class Test {
     BaseProduceMapper baseProduceMapper;
 
     @org.junit.Test
-    public void syncProduceServiceDuration() {
-
-        List<CalcServiceDuration> calcServiceDurationList = baseProduceMapper.queryProduceServiceDuration();
-
-        calcServiceDurationList.stream().collect(Collectors.groupingBy(CalcServiceDuration::getId))
-                .forEach((key, value) -> {
-                    BaseProduce baseProduce = baseProduceMapper.selectById(key);
-
-                    Integer sumServiceDuration = value.stream().map(calcServiceDuration -> calcServiceDuration.getDuration() * calcServiceDuration.getQuantity()).mapToInt(Integer::intValue).sum();
-
-                    baseProduce.setServiceDuration(sumServiceDuration);
-                    baseProduceMapper.updateById(baseProduce);
-                });
+    public void calcOrderAmount() {
+        marketService.orderAmountReCalc(13659);
     }
 
 }