逗号分隔

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

@@ -2,8 +2,7 @@ package com.gogirl.application.order.serve;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.gogirl.domain.order.serve.OwnProduce;
-import com.gogirl.shared.order.OrderServeOwnProduceCommand;
-import com.gogirl.shared.order.ScheduleServeOwnProduceCommand;
+import com.gogirl.shared.order.OwnProduceCommand;
 
 /**
  * <p>
@@ -20,12 +19,6 @@ public interface IOwnProduceService extends IService<OwnProduce> {
      *
      * @param command
      */
-    void saveOrUpdateScheduleOwnProduce(ScheduleServeOwnProduceCommand command);
+    OwnProduce saveOrUpdateOwnProduce(OwnProduceCommand command);
 
-    /**
-     * 新增或者更新订单自带款式技法
-     *
-     * @param command
-     */
-    void saveOrUpdateOrderOwnProduce(OrderServeOwnProduceCommand command);
 }

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

@@ -121,6 +121,8 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
     private CouponService couponService;
     @Resource
     private ScheduleServeMapper scheduleServeMapper;
+    @Resource
+    OwnProduceMapper ownProduceMapper;
 
     @Override
     public BigDecimal countSumPay(Integer customerId, Integer departmentId) {
@@ -424,6 +426,12 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
 
         //in查询替换mybatis-resultMap-join查询分页的 服务详情
         List<OrderServe> orderServeList = orderServeMapper.selectList(new LambdaQueryWrapper<OrderServe>().in(OrderServe::getOrderId, orderIdList));
+        Map<Integer, OwnProduce> ownProduceMap = ownProduceMapper.selectBatchIds(orderServeList.stream().map(OrderServe::getOwnProduceId).collect(Collectors.toList())).stream().collect(Collectors.toMap(OwnProduce::getId, a -> a, (k1, k2) -> k1));
+        orderServeList.forEach(orderServe -> {
+            if (orderServe.getOwnProduceId() != null) {
+                orderServe.setOwnProduce(ownProduceMap.get(orderServe.getOwnProduceId()));
+            }
+        });
         Map<Integer, List<OrderServe>> orderServeMap = orderServeList.stream().collect(Collectors.groupingBy(OrderServe::getOrderId));
 
         //预约详情
@@ -1144,6 +1152,12 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
         Integer id = orderManage.getId();
         //1、订单详情
         List<OrderServe> orderServeList = orderServeMapper.selectList(new LambdaQueryWrapper<OrderServe>().eq(OrderServe::getOrderId, id));
+        Map<Integer, OwnProduce> ownProduceMap = ownProduceMapper.selectBatchIds(orderServeList.stream().map(OrderServe::getOwnProduceId).collect(Collectors.toList())).stream().collect(Collectors.toMap(OwnProduce::getId, a -> a, (k1, k2) -> k1));
+        orderServeList.forEach(orderServe -> {
+            if (orderServe.getOwnProduceId() != null) {
+                orderServe.setOwnProduce(ownProduceMap.get(orderServe.getOwnProduceId()));
+            }
+        });
         orderManage.setListOrderServer(orderServeList);
 
         //2、订单关联的卡券

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

@@ -4,19 +4,14 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gogirl.application.order.serve.IOwnProduceService;
 import com.gogirl.application.order.serve.IOwnProduceTechniqueSkuService;
-import com.gogirl.domain.order.serve.OrderServe;
 import com.gogirl.domain.order.serve.OwnProduce;
 import com.gogirl.domain.order.serve.OwnProduceTechniqueSku;
-import com.gogirl.domain.order.serve.ScheduleServe;
 import com.gogirl.domain.product.serve.TechniqueSku;
-import com.gogirl.infrastructure.common.exception.RRException;
 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.OrderServeOwnProduceCommand;
-import com.gogirl.shared.order.OwnProduceTechniqueSkuCommand;
-import com.gogirl.shared.order.ScheduleServeOwnProduceCommand;
+import com.gogirl.shared.order.OwnProduceCommand;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -48,46 +43,21 @@ public class OwnProduceServiceImpl extends ServiceImpl<OwnProduceMapper, OwnProd
     OrderServeMapper orderServeMapper;
 
 
-    @Transactional(rollbackFor = Exception.class)
     @Override
-    public void saveOrUpdateScheduleOwnProduce(ScheduleServeOwnProduceCommand command) {
-        OwnProduce ownProduce = this.saveOrUpdateOwnProduce(command.getOwnProduceId(), command.getOwnProduceTechniqueSkuCommandList());
-
-        ScheduleServe scheduleServe = scheduleServeMapper.selectById(command.getScheduleServeId());
-        if (scheduleServe.getServeName().trim().equals(ScheduleServe.OWN_PRODUCE_KEY)) {
-            throw new RRException("非自带款式不需要选择款式技法");
-        }
-        scheduleServe.setOwnProduceId(ownProduce.getId());
-        scheduleServeMapper.updateById(scheduleServe);
-    }
-
     @Transactional(rollbackFor = Exception.class)
-    @Override
-    public void saveOrUpdateOrderOwnProduce(OrderServeOwnProduceCommand command) {
+    public OwnProduce saveOrUpdateOwnProduce(OwnProduceCommand command) {
 
-        OwnProduce ownProduce = this.saveOrUpdateOwnProduce(command.getOwnProduceId(), command.getOwnProduceTechniqueSkuCommandList());
-
-        OrderServe orderServe = orderServeMapper.selectById(command.getOrderServeId());
-        if (orderServe.getServeName().trim().equals(ScheduleServe.OWN_PRODUCE_KEY)) {
-            throw new RRException("非自带款式不需要选择款式技法");
-        }
-        orderServe.setOwnProduceId(ownProduce.getId());
-        orderServeMapper.updateById(orderServe);
-
-    }
-
-    private OwnProduce saveOrUpdateOwnProduce(Integer ownProduceId, List<OwnProduceTechniqueSkuCommand> ownProduceTechniqueSkuCommandList) {
         OwnProduce ownProduce;
 
-        if (ownProduceId == null) {
+        if (command.getOwnProduceId() == null) {
             ownProduce = new OwnProduce();
             this.save(ownProduce);
         } else {
-            ownProduce = this.getById(ownProduceId);
+            ownProduce = this.getById(command.getOwnProduceId());
             ownProduceTechniqueSkuService.remove(new LambdaQueryWrapper<OwnProduceTechniqueSku>().eq(OwnProduceTechniqueSku::getOwnProduceId, ownProduce.getId()));
         }
 
-        List<OwnProduceTechniqueSku> ownProduceTechniqueSkuList = ownProduceTechniqueSkuCommandList.stream()
+        List<OwnProduceTechniqueSku> ownProduceTechniqueSkuList = command.getOwnProduceTechniqueSkuCommandList().stream()
                 .map(ownProduceTechniqueSkuCommand -> {
                     OwnProduceTechniqueSku ownProduceTechniqueSku = new OwnProduceTechniqueSku();
                     ownProduceTechniqueSku.setQuantity(ownProduceTechniqueSkuCommand.getQuantity());
@@ -121,6 +91,7 @@ public class OwnProduceServiceImpl extends ServiceImpl<OwnProduceMapper, OwnProd
                     return techniqueSku.getName() + "x" + ownProduceTechniqueSku.getQuantity();
                 })
                 .collect(Collectors.joining(",")));
+
         return ownProduce;
     }
 }

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

@@ -30,6 +30,7 @@ import com.gogirl.infrastructure.common.util.StringUtils;
 import com.gogirl.infrastructure.config.property.GogirlProperties;
 import com.gogirl.infrastructure.mapper.market.discount.LeisureDiscountConfigMapper;
 import com.gogirl.infrastructure.mapper.order.serve.OrderManageMapper;
+import com.gogirl.infrastructure.mapper.order.serve.OwnProduceMapper;
 import com.gogirl.infrastructure.mapper.order.serve.ScheduleManageMapper;
 import com.gogirl.infrastructure.mapper.order.serve.ScheduleServeMapper;
 import com.gogirl.infrastructure.mapper.product.purchase.PurchaseSkuMapper;
@@ -81,6 +82,7 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
     private final StoreTechnicianMapper storeTechnicianMapper;
     private final OrderManageMapper orderManageMapper;
     private final StoreManageMapper storeManageMapper;
+    private final OwnProduceMapper ownProduceMapper;
 
 
     private final StoreClassesTechnicianService storeClassesTechnicianService;
@@ -1032,6 +1034,13 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
 
         List<ScheduleServe> scheduleServeList = scheduleServeMapper.selectList(new LambdaQueryWrapper<ScheduleServe>().eq(ScheduleServe::getSchId, id));
 
+        Map<Integer, OwnProduce> ownProduceMap = ownProduceMapper.selectBatchIds(scheduleServeList.stream().map(ScheduleServe::getOwnProduceId).collect(Collectors.toList())).stream().collect(Collectors.toMap(OwnProduce::getId, a -> a, (k1, k2) -> k1));
+        scheduleServeList.forEach(scheduleServe -> {
+            if (scheduleServe.getOwnProduceId() != null) {
+                scheduleServe.setOwnProduce(ownProduceMap.get(scheduleServe.getOwnProduceId()));
+            }
+        });
+
         Set<ScheduleServe> set = new TreeSet<>(Comparator.comparing(o -> o.getSchId() + ";" + o.getServeId()));
         if (ListUtil.isNotEmpty(scheduleServeList)) {
             set.addAll(scheduleServeList);
@@ -1084,6 +1093,13 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
         List<ScheduleServe> scheduleServeList = scheduleServeMapper.selectList(new LambdaQueryWrapper<ScheduleServe>().in(ScheduleServe::getSchId, page.getRecords().stream().map(ScheduleManage::getId).collect(Collectors.toList())));
         Map<Integer, List<ScheduleServe>> scheduleServeMap = scheduleServeList.stream().collect(Collectors.groupingBy(ScheduleServe::getSchId));
 
+        Map<Integer, OwnProduce> ownProduceMap = ownProduceMapper.selectBatchIds(scheduleServeList.stream().map(ScheduleServe::getOwnProduceId).collect(Collectors.toList())).stream().collect(Collectors.toMap(OwnProduce::getId, a -> a, (k1, k2) -> k1));
+        scheduleServeList.forEach(scheduleServe -> {
+            if (scheduleServe.getOwnProduceId() != null) {
+                scheduleServe.setOwnProduce(ownProduceMap.get(scheduleServe.getOwnProduceId()));
+            }
+        });
+
         page.getRecords().forEach(scheduleManage -> {
             Set<ScheduleServe> set = new TreeSet<>(Comparator.comparing(o -> o.getSchId() + ";" + o.getServeId()));
             if (ListUtil.isNotEmpty(scheduleServeMap.get(scheduleManage.getId()))) {
@@ -1304,6 +1320,7 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
                     scheduleServe.setServeNumber(1);
                     //如果是预约款式
                     if (scheduleServe.getProduceId() != null) {
+
                         BaseProduce baseProduce = baseProduceMapper.selectById(scheduleServe.getProduceId());
                         //款式名称
                         scheduleServe.setProduceName(baseProduce.getName());
@@ -1349,6 +1366,7 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
                     if (scheduleServe.getServeName().trim().equals(ScheduleServe.OWN_PRODUCE_KEY)) {
                         scheduleServe.setIsOwnProduce(1);
                         scheduleServe.setOwnProduceId(scheduleServeCommand.getOwnProduceId());
+                        scheduleServe.setOwnProduce(ownProduceMapper.selectById(scheduleServeCommand.getOwnProduceId()));
                     } else {
                         scheduleServe.setIsOwnProduce(2);
                         scheduleServe.setOwnProduceId(null);

src/main/java/com/gogirl/assembler/OrderManageDTOAssembler.java

@@ -90,9 +90,13 @@ public class OrderManageDTOAssembler implements Function<OrderManage, OrderManag
                         .map(storeTechnicianDTOAssembler)
                         .collect(Collectors.toList()));
             }
-
+            if (orderServe.getOwnProduce() != null) {
+                orderServeDTO.setOwnProduce(orderServe.getOwnProduce());
+            }
             orderServeDTO.setTechnicianIds(orderServe.getTechnicianId());
             orderServeDTO.setTechnicianNames(orderServe.getTechnicianName());
+
+
             return orderServeDTO;
         }
 

src/main/java/com/gogirl/assembler/OwnProduceAssembler.java

+package com.gogirl.assembler;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020/5/27 1:58 下午
+ */
+public class OwnProduceAssembler {
+}

src/main/java/com/gogirl/assembler/ScheduleManageDTOAssembler.java

@@ -37,8 +37,12 @@ public class ScheduleManageDTOAssembler implements Function<ScheduleManage, Sche
         public ScheduleServeDTO apply(ScheduleServe scheduleServe) {
             ScheduleServeDTO scheduleServeDTO = new ScheduleServeDTO();
             BeanUtils.copyProperties(scheduleServe, scheduleServeDTO);
+            if (scheduleServe.getOwnProduce() != null) {
+                scheduleServeDTO.setOwnProduce(scheduleServe.getOwnProduce());
+            }
             return scheduleServeDTO;
         }
     }
 
+
 }

src/main/java/com/gogirl/domain/order/serve/OrderServe.java

@@ -57,14 +57,16 @@ public class OrderServe implements Serializable {
      */
     @ApiModelProperty("服务改价(有正负)")
     private BigDecimal serveChangePrice = BigDecimal.ZERO;
+
     @ApiModelProperty("价格")
     private BigDecimal price = BigDecimal.ZERO;
+
     @ApiModelProperty("优惠券折扣金额")
     private BigDecimal discountPrice = BigDecimal.ZERO;
+
     @ApiModelProperty("支付金额")
     private BigDecimal payPrice = BigDecimal.ZERO;
-//    @ApiModelProperty("闲时折扣减免的金额")
-//    private BigDecimal leisureDiscountPrice = BigDecimal.ZERO;
+
     /**
      * 预约服务vo
      */

src/main/java/com/gogirl/domain/order/serve/ScheduleServe.java

@@ -244,4 +244,12 @@ public class ScheduleServe implements Serializable {
                 price.equals(promotionPrice) ||
                 (price.equals(produceCurrentPrice) && produceCurrentPrice.compareTo(produceBargainPrice) < 0);
     }
+
+    public Integer getOwnProduceId() {
+        return ownProduceId;
+    }
+
+    public void setOwnProduceId(Integer ownProduceId) {
+        this.ownProduceId = ownProduceId;
+    }
 }

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

@@ -2,9 +2,9 @@ package com.gogirl.interfaces.order.serve;
 
 
 import com.gogirl.application.order.serve.IOwnProduceService;
+import com.gogirl.domain.order.serve.OwnProduce;
 import com.gogirl.infrastructure.common.base.JsonResult;
-import com.gogirl.shared.order.OrderServeOwnProduceCommand;
-import com.gogirl.shared.order.ScheduleServeOwnProduceCommand;
+import com.gogirl.shared.order.OwnProduceCommand;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -30,18 +30,11 @@ public class OwnProduceController {
     @Resource
     IOwnProduceService ownProduceService;
 
-    @ApiOperation("新增或者更新预约自带款式技法")
-    @PostMapping("/saveOrUpdateScheduleOwnProduce")
-    public JsonResult<Void> saveOrUpdateScheduleOwnProduce(@RequestBody ScheduleServeOwnProduceCommand command) {
-        ownProduceService.saveOrUpdateScheduleOwnProduce(command);
-        return JsonResult.success();
+    @ApiOperation("新增或者更新自带款式技法")
+    @PostMapping("/saveOrUpdateOwnProduce")
+    public JsonResult<OwnProduce> saveOrUpdateOwnProduce(@RequestBody OwnProduceCommand command) {
+        OwnProduce ownProduce = ownProduceService.saveOrUpdateOwnProduce(command);
+        return JsonResult.success(ownProduce);
     }
 
-
-    @ApiOperation("新增或者更新订单自带款式技法")
-    @PostMapping("/saveOrUpdateOrderOwnProduce")
-    public JsonResult<Void> saveOrUpdateOrderOwnProduce(@RequestBody OrderServeOwnProduceCommand command) {
-        ownProduceService.saveOrUpdateOrderOwnProduce(command);
-        return JsonResult.success();
-    }
 }

src/main/java/com/gogirl/shared/order/OrderServeDTO.java

 package com.gogirl.shared.order;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.gogirl.domain.order.serve.OwnProduce;
 import com.gogirl.shared.store.StoreTechnicianDTO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -119,4 +120,6 @@ public class OrderServeDTO {
     private BigDecimal discountRate;
 
     private BigDecimal leisurePrice;
+
+    private OwnProduce ownProduce;
 }

src/main/java/com/gogirl/shared/order/ScheduleServeOwnProduceCommand.java → src/main/java/com/gogirl/shared/order/OwnProduceCommand.java

@@ -14,13 +14,10 @@ import java.util.List;
  * @since 2020/5/27 11:59 上午
  */
 @Data
-public class ScheduleServeOwnProduceCommand {
+public class OwnProduceCommand {
 
     private Integer ownProduceId;
 
-    @ApiModelProperty("预约详情id")
-    private Integer scheduleServeId;
-
     @ApiModelProperty("款式")
     private List<OwnProduceTechniqueSkuCommand> ownProduceTechniqueSkuCommandList;
 

src/main/java/com/gogirl/shared/order/ScheduleServeDTO.java

 package com.gogirl.shared.order;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.gogirl.domain.order.serve.OwnProduce;
 import com.gogirl.shared.product.PurchaseSkuDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -134,4 +135,6 @@ public class ScheduleServeDTO implements Serializable {
 
     private String producePractice;
 
+    private OwnProduce ownProduce;
+
 }