美甲师上传客照

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

@@ -556,6 +556,22 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
             orderServeDescribeRelevanceMapper.insertList(orderServeDescribeRelevanceList);
         }
 
+
+        /*更新客照片*/
+        OrderRecord orderRecord = orderRecordMapper.selectOne(new LambdaQueryWrapper<OrderRecord>()
+                .eq(OrderRecord::getOrderServeId, param.getId()));
+        if (orderRecord == null) {
+            orderRecord = new OrderRecord();
+        }
+        orderRecord.setOrderServeId(param.getId());
+        //客照
+        orderRecord.setPicturePath(param.getPicturePath());
+        //
+        if (StringUtils.isNotEmpty(orderRecord.getPicturePath())) {
+            orderRecord.setIsGuestPhoto(1);
+        }
+        orderRecordService.saveOrUpdate(orderRecord);
+
     }
 
     @Override
@@ -570,27 +586,23 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
         orderManage.setAfterSaleBuyCardReason(request.getAfterSaleBuyCardReason());
         orderManageMapper.updateById(orderManage);
 
+        //订单录入信息
+        List<OrderServe> orderServeList = orderServeMapper.selectList(new LambdaQueryWrapper<OrderServe>().eq(OrderServe::getOrderId, orderManage.getId()));
 
-        request.getRecordOrderRecordDataRequests().forEach(recordOrderRecordDataRequest -> {
-            OrderRecord orderRecord = orderRecordMapper.selectById(recordOrderRecordDataRequest.getOrderServeId());
-
+        for (OrderServe orderServe : orderServeList) {
+            OrderRecord orderRecord = orderRecordMapper.selectOne(new LambdaQueryWrapper<OrderRecord>().eq(OrderRecord::getOrderServeId, orderServe.getId()));
             if (orderRecord == null) {
                 orderRecord = new OrderRecord();
             }
-            orderRecord.setOrderServeId(recordOrderRecordDataRequest.getOrderServeId());
+
+            orderRecord.setOrderServeId(orderServe.getId());
             //美甲师备注
             orderRecord.setTechnicianFeedback(request.getRemark());
             //用户反馈
             orderRecord.setUserFeedback(request.getUserFeedback());
-            //客照
-            orderRecord.setPicturePath(recordOrderRecordDataRequest.getPicturePath());
-            //
-            if (StringUtils.isNotEmpty(orderRecord.getPicturePath())) {
-                orderRecord.setIsGuestPhoto(1);
-            }
+            //更新
             orderRecordService.saveOrUpdate(orderRecord);
-        });
-
+        }
 
         //订单数据完整度
         try {
@@ -598,7 +610,7 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
             orderManage.setDataIntegrity(dataRate);
             orderManageMapper.updateById(orderManage);
         } catch (Exception e) {
-
+            log.error(e.getMessage(), e);
         }
 
     }

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

@@ -232,7 +232,8 @@ public class OrderServe implements Serializable {
     @ApiModelProperty("闲时价格")
     private BigDecimal leisurePrice;
 
-
+    @TableField(exist = false)
+    private String picturePath;
 
 
     public void addDiscountPrice(BigDecimal discountPrice) {

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

@@ -3,8 +3,6 @@ package com.gogirl.shared.order;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * <p>
  *
@@ -30,5 +28,5 @@ public class RecordOrderDataRequest {
     @ApiModelProperty("不接受开卡的理由")
     private String afterSaleBuyCardReason;
 
-    private List<RecordOrderRecordDataRequest> recordOrderRecordDataRequests;
+//    private List<RecordOrderRecordDataRequest> recordOrderRecordDataRequests;
 }