款式分开录入客照

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

@@ -9,6 +9,7 @@ import com.gogirl.domain.order.serve.OrderServe;
 import com.gogirl.domain.user.customer.Customer;
 import com.gogirl.shared.member.CreateCommentCommand;
 import com.gogirl.shared.order.ListOrderQuery;
+import com.gogirl.shared.order.RecordOrderDataRequest;
 import org.apache.ibatis.annotations.Param;
 
 import java.math.BigDecimal;
@@ -61,14 +62,9 @@ public interface OrderManageService extends IService<OrderManage> {
     /**
      * 美甲师录入订单资料
      *
-     * @param orderId
-     * @param remark
-     * @param userFeedback
-     * @param picturePath
-     * @param afterSaleIsBuyCard
-     * @param afterSaleBuyCardReason
+     * @param recordOrderDataRequest
      */
-    void recordOrderData(Integer orderId, String remark, String userFeedback, String picturePath, String afterSaleIsBuyCard, String afterSaleBuyCardReason);
+    void recordOrderData(RecordOrderDataRequest recordOrderDataRequest);
 
 
     /**

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

@@ -47,6 +47,7 @@ import com.gogirl.infrastructure.util.SessionUtils;
 import com.gogirl.shared.member.CreateCommentCommand;
 import com.gogirl.shared.member.OrderCommentCommand;
 import com.gogirl.shared.order.ListOrderQuery;
+import com.gogirl.shared.order.RecordOrderDataRequest;
 import com.gogirl.shared.user.ConsumerCommand;
 import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
@@ -557,39 +558,33 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
     }
 
     @Override
-    public void recordOrderData(Integer orderId, String remark, String userFeedback, String picturePath, String afterSaleIsBuyCard, String afterSaleBuyCardReason) {
+    public void recordOrderData(RecordOrderDataRequest request) {
 
 
-        OrderManage orderManage = orderManageMapper.selectById(orderId);
+        OrderManage orderManage = orderManageMapper.selectById(request.getOrderId());
 
         //订单信息
-        orderManage.setRemark(remark);
-        orderManage.setAfterSaleIsBuyCard(afterSaleIsBuyCard);
-        orderManage.setAfterSaleBuyCardReason(afterSaleBuyCardReason);
+        orderManage.setRemark(request.getRemark());
+        orderManage.setAfterSaleIsBuyCard(request.getAfterSaleIsBuyCard());
+        orderManage.setAfterSaleBuyCardReason(request.getAfterSaleBuyCardReason());
         orderManageMapper.updateById(orderManage);
 
-        //订单录入信息
-        List<OrderServe> orderServeList = orderServeMapper.selectList(new LambdaQueryWrapper<OrderServe>().eq(OrderServe::getOrderId, orderManage.getId()));
 
-        for (OrderServe orderServe : orderServeList) {
-            OrderRecord orderRecord = orderRecordMapper.selectOne(new LambdaQueryWrapper<OrderRecord>().eq(OrderRecord::getOrderServeId, orderServe.getId()));
+        request.getRecordOrderRecordDataRequests().forEach(recordOrderRecordDataRequest -> {
+            OrderRecord orderRecord = orderRecordMapper.selectById(recordOrderRecordDataRequest.getOrderServeId());
+
             if (orderRecord == null) {
                 orderRecord = new OrderRecord();
             }
-
-            orderRecord.setOrderServeId(orderServe.getId());
+            orderRecord.setOrderServeId(recordOrderRecordDataRequest.getOrderServeId());
             //美甲师备注
-            orderRecord.setTechnicianFeedback(remark);
+            orderRecord.setTechnicianFeedback(request.getRemark());
             //用户反馈
-            orderRecord.setUserFeedback(userFeedback);
+            orderRecord.setUserFeedback(request.getUserFeedback());
             //客照
-            orderRecord.setPicturePath(picturePath);
+            orderRecord.setPicturePath(recordOrderRecordDataRequest.getPicturePath());
             orderRecordService.saveOrUpdate(orderRecord);
-
-            //set 计算完整度
-            orderServe.setOrderRecord(orderRecord);
-        }
-        orderManage.setListOrderServer(orderServeList);
+        });
 
         Customer customer = customerService.getById(orderManage.getOrderUser());
 

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

@@ -24,6 +24,7 @@ import com.gogirl.infrastructure.util.SessionUtils;
 import com.gogirl.infrastructure.util.lock.OrderIdLock;
 import com.gogirl.shared.order.ListOrderQuery;
 import com.gogirl.shared.order.OrderManageDTO;
+import com.gogirl.shared.order.RecordOrderDataRequest;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -157,13 +158,8 @@ public class OrderManageController {
     @ApiOperation(value = "美甲师录入订单资料")
     @PostMapping("/technician/ordermanage/recordOrderData")
     public JsonResult<Void> recordOrderData(@RequestHeader String token,
-                                            @RequestParam("orderId") Integer orderId,
-                                            @RequestParam("remark") String remark,
-                                            @RequestParam("userFeedback") String userFeedback,
-                                            @RequestParam("picturePath") String picturePath,
-                                            @RequestParam String afterSaleIsBuyCard,
-                                            @RequestParam String afterSaleBuyCardReason) {
-        orderManageService.recordOrderData(orderId, remark, userFeedback, picturePath, afterSaleIsBuyCard, afterSaleBuyCardReason);
+                                            @RequestBody RecordOrderDataRequest recordOrderDataRequest) {
+        orderManageService.recordOrderData(recordOrderDataRequest);
         return JsonResult.success();
     }
 

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

+package com.gogirl.shared.order;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020/5/18 9:30 上午
+ */
+@Data
+public class RecordOrderDataRequest {
+
+    private Integer orderId;
+
+    @ApiModelProperty("美甲师反馈")
+    private String remark;
+
+    @ApiModelProperty("用户反馈")
+    private String userFeedback;
+
+    @ApiModelProperty("是否接受开卡 1-接受 2-不接受")
+    private String afterSaleIsBuyCard;
+
+    @ApiModelProperty("不接受开卡的理由")
+    private String afterSaleBuyCardReason;
+
+    private List<RecordOrderRecordDataRequest> recordOrderRecordDataRequests;
+}

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

+package com.gogirl.shared.order;
+
+import lombok.Data;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020/5/18 9:30 上午
+ */
+@Data
+public class RecordOrderRecordDataRequest {
+    private Integer orderServeId;
+    private String picturePath;
+}