优化

platform-service/src/main/java/com/platform/service/yongyou/impl/YongyouServiceImpl.java

@@ -512,21 +512,7 @@ public class YongyouServiceImpl implements YongyouService {
                 order.setYongYouId(yongYouId);
                 LongYanPurchaseOrder udpOrder = longYanPurchaseOrderMapper.selectOne(order);
 //                udpOrder.setStatus(data.get(0).getIStatus());
-                if ("锁定".equals(data.get(0).getIStatus())){
-                    udpOrder.setStatus(LongYanPurchaseOrderStatusEnum.locked.getValue());
-                }else if ("开立".equals(data.get(0).getIStatus())){
-                    udpOrder.setStatus(LongYanPurchaseOrderStatusEnum.stand.getValue());
-                }else if ("审核".equals(data.get(0).getIStatus())){
-                    udpOrder.setStatus(LongYanPurchaseOrderStatusEnum.check.getValue());
-                }else if ("取消关闭".equals(data.get(0).getIStatus())){
-                    udpOrder.setStatus(LongYanPurchaseOrderStatusEnum.cancel_close.getValue());
-                }
-                else if ("正常关闭".equals(data.get(0).getIStatus())){
-                    udpOrder.setStatus(LongYanPurchaseOrderStatusEnum.normal_close.getValue());
-                }
-                else if ("未知状态".equals(data.get(0).getIStatus())){
-                    udpOrder.setStatus(LongYanPurchaseOrderStatusEnum.unknowing_status.getValue());
-                }
+                addStatus(data, udpOrder);
                 longYanPurchaseOrderMapper.updateByPrimaryKeySelective(udpOrder);
                 List<LongYanPurchaseDetailDTO> list = new ArrayList<>();
                 for (LongYanPurchaseDetailListVO vo:data){
@@ -535,21 +521,7 @@ public class YongyouServiceImpl implements YongyouService {
                     detail.setYongYouId(vo.getCTrackNo());
                     detail.setPurchasedNum(vo.getIPOSum());
                     detail.setInStoreNum(vo.getIRDSum());
-                    if ("已请购".equals(data.get(0).getCAppState())){
-                        detail.setDetailStatus(LongYanPurchaseDetailStatusEnum.applyed.getValue());
-                    }else if ("已询价".equals(data.get(0).getCAppState())){
-                        detail.setDetailStatus(LongYanPurchaseDetailStatusEnum.asked_price.getValue());
-                    }else if ("采购中".equals(data.get(0).getCAppState())){
-                        detail.setDetailStatus(LongYanPurchaseDetailStatusEnum.purchasing.getValue());
-                    }else if ("已采购".equals(data.get(0).getCAppState())){
-                        detail.setDetailStatus(LongYanPurchaseDetailStatusEnum.purchased.getValue());
-                    }else if ("入库中".equals(data.get(0).getCAppState())){
-                        detail.setDetailStatus(LongYanPurchaseDetailStatusEnum.in_storing.getValue());
-                    }else if ("已入库".equals(data.get(0).getCAppState())){
-                        detail.setDetailStatus(LongYanPurchaseDetailStatusEnum.in_stored.getValue());
-                    }else if ("请购关闭".equals(data.get(0).getCAppState())){
-                        detail.setDetailStatus(LongYanPurchaseDetailStatusEnum.close_apply_order.getValue());
-                    }
+                    addDetailStatus(data, detail);
                     list.add(detail);
                 }
                 if (list.size()>0){
@@ -562,6 +534,43 @@ public class YongyouServiceImpl implements YongyouService {
 
         return null;
     }
+
+    private void addDetailStatus(List<LongYanPurchaseDetailListVO> data, LongYanPurchaseDetailDTO detail) {
+        if ("已请购".equals(data.get(0).getCAppState())){
+            detail.setDetailStatus(LongYanPurchaseDetailStatusEnum.applyed.getValue());
+        }else if ("已询价".equals(data.get(0).getCAppState())){
+            detail.setDetailStatus(LongYanPurchaseDetailStatusEnum.asked_price.getValue());
+        }else if ("采购中".equals(data.get(0).getCAppState())){
+            detail.setDetailStatus(LongYanPurchaseDetailStatusEnum.purchasing.getValue());
+        }else if ("已采购".equals(data.get(0).getCAppState())){
+            detail.setDetailStatus(LongYanPurchaseDetailStatusEnum.purchased.getValue());
+        }else if ("入库中".equals(data.get(0).getCAppState())){
+            detail.setDetailStatus(LongYanPurchaseDetailStatusEnum.in_storing.getValue());
+        }else if ("已入库".equals(data.get(0).getCAppState())){
+            detail.setDetailStatus(LongYanPurchaseDetailStatusEnum.in_stored.getValue());
+        }else if ("请购关闭".equals(data.get(0).getCAppState())){
+            detail.setDetailStatus(LongYanPurchaseDetailStatusEnum.close_apply_order.getValue());
+        }
+    }
+
+    private void addStatus(List<LongYanPurchaseDetailListVO> data, LongYanPurchaseOrder udpOrder) {
+        if ("锁定".equals(data.get(0).getIStatus())){
+            udpOrder.setStatus(LongYanPurchaseOrderStatusEnum.locked.getValue());
+        }else if ("开立".equals(data.get(0).getIStatus())){
+            udpOrder.setStatus(LongYanPurchaseOrderStatusEnum.stand.getValue());
+        }else if ("审核".equals(data.get(0).getIStatus())){
+            udpOrder.setStatus(LongYanPurchaseOrderStatusEnum.check.getValue());
+        }else if ("取消关闭".equals(data.get(0).getIStatus())){
+            udpOrder.setStatus(LongYanPurchaseOrderStatusEnum.cancel_close.getValue());
+        }
+        else if ("正常关闭".equals(data.get(0).getIStatus())){
+            udpOrder.setStatus(LongYanPurchaseOrderStatusEnum.normal_close.getValue());
+        }
+        else if ("未知状态".equals(data.get(0).getIStatus())){
+            udpOrder.setStatus(LongYanPurchaseOrderStatusEnum.unknowing_status.getValue());
+        }
+    }
+
     private static AbstractPageResultBean<LongYanPurchaseDetailListVO> getPageInfo(Integer pageNum, Integer pageSize, List<LongYanPurchaseDetailListVO> list){
         AbstractPageResultBean<LongYanPurchaseDetailListVO> pageInfo = new MyPage(list);
         pageInfo.setPageNum(pageNum);

platform-service/src/main/java/handler/yongyou/PurchaseOrderModNoticeHandler.java

@@ -12,12 +12,14 @@ import com.platform.dao.dto.longyanpurchaseorder.LongYanPurchaseOrderDTO;
 import com.platform.dao.dto.upms.ThirdInfoLogDTO;
 import com.platform.dao.entity.longyanpurchaseorder.LongYanPurchaseDetail;
 import com.platform.dao.entity.longyanpurchaseorder.LongYanPurchaseOrder;
+import com.platform.dao.enums.LongYanPurchaseDetailStatusEnum;
 import com.platform.dao.enums.LongYanPurchaseOrderStatusEnum;
 import com.platform.dao.mapper.longyanpurchaseorder.LongYanPurchaseDetailMapper;
 import com.platform.dao.mapper.longyanpurchaseorder.LongYanPurchaseOrderMapper;
 import handler.yongyou.BaseRequestHandler;
 import handler.yongyou.request.*;
 import handler.yongyou.response.BaseResponse;
+import handler.yongyou.response.LongYanPurchaseDetailListVO;
 import handler.yongyou.response.ToYongYouBaseResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
@@ -65,15 +67,13 @@ public class PurchaseOrderModNoticeHandler extends BaseRequestHandler {
                 weekendCriteria.andIn(LongYanPurchaseDetail::getNo, spareNos);
                 List<LongYanPurchaseDetail> details = longYanPurchaseDetailMapper.selectByExample(weekend);
                 List<LongYanPurchaseDetailDTO> dtos = BeanConverterUtil.copyListProperties(details, LongYanPurchaseDetailDTO.class);
-                int count = 0;
                 for (PurchaseDetails details1 : purchaseDetails) {
-                    if (1 == details1.getStatus()) {//已入库
-                        count++;
-                    }
+
                     for (LongYanPurchaseDetailDTO detail1 : dtos) {
                         if (detail1.getNo().equals(details1.getSpareNo())) {
                             detail1.setYongYouId(request.getYongYouId());
-                            detail1.setDetailStatus(details1.getStatus());
+//                            detail1.setDetailStatus(details1.getStatus());
+                            addDetailStatus(details1,detail1);
                             detail1.setPurchasedNum(details1.getPurchasedNum());
                             detail1.setInStoreNum(details1.getInStoreNum());
                             updateDetails.add(detail1);
@@ -81,17 +81,8 @@ public class PurchaseOrderModNoticeHandler extends BaseRequestHandler {
                         }
                     }
                 }
-//        if (count==0){
-//            order.setStatus(LongYanPurchaseOrderStatusEnum.not_in_store.getValue());
-//        }else if (count>0&&count<purchaseDetails.size()){
-//            order.setStatus(LongYanPurchaseOrderStatusEnum.part_in_store.getValue());
-//        }else {
-//            order.setStatus(LongYanPurchaseOrderStatusEnum.all_in_store.getValue());
-//        }
-//        order.setStatus(request.getStatus());
-//        order.setRefuseRemark(request.getRemark());
-//        order.setUpdateTime(LocalDateTime.now());
-                order.setStatus(request.getOrderStatus());
+
+                addStatus(request,order);
                 updateOrders.add(order);
             }
             longYanPurchaseDetailMapper.updateBatchPurchaseDetails(updateDetails);
@@ -107,6 +98,42 @@ public class PurchaseOrderModNoticeHandler extends BaseRequestHandler {
         return r;
     }
 
+    private void addDetailStatus(PurchaseDetails data, LongYanPurchaseDetailDTO detail) {
+        if ("已请购".equals(data.getStatus())){
+            detail.setDetailStatus(LongYanPurchaseDetailStatusEnum.applyed.getValue());
+        }else if ("已询价".equals(data.getStatus())){
+            detail.setDetailStatus(LongYanPurchaseDetailStatusEnum.asked_price.getValue());
+        }else if ("采购中".equals(data.getStatus())){
+            detail.setDetailStatus(LongYanPurchaseDetailStatusEnum.purchasing.getValue());
+        }else if ("已采购".equals(data.getStatus())){
+            detail.setDetailStatus(LongYanPurchaseDetailStatusEnum.purchased.getValue());
+        }else if ("入库中".equals(data.getStatus())){
+            detail.setDetailStatus(LongYanPurchaseDetailStatusEnum.in_storing.getValue());
+        }else if ("已入库".equals(data.getStatus())){
+            detail.setDetailStatus(LongYanPurchaseDetailStatusEnum.in_stored.getValue());
+        }else if ("请购关闭".equals(data.getStatus())){
+            detail.setDetailStatus(LongYanPurchaseDetailStatusEnum.close_apply_order.getValue());
+        }
+    }
+
+    private void addStatus(PurchaseOrderStatusModNoticeRequest request, LongYanPurchaseOrder udpOrder) {
+        if ("锁定".equals(request.getOrderStatus())){
+            udpOrder.setStatus(LongYanPurchaseOrderStatusEnum.locked.getValue());
+        }else if ("开立".equals(request.getOrderStatus())){
+            udpOrder.setStatus(LongYanPurchaseOrderStatusEnum.stand.getValue());
+        }else if ("审核".equals(request.getOrderStatus())){
+            udpOrder.setStatus(LongYanPurchaseOrderStatusEnum.check.getValue());
+        }else if ("取消关闭".equals(request.getOrderStatus())){
+            udpOrder.setStatus(LongYanPurchaseOrderStatusEnum.cancel_close.getValue());
+        }
+        else if ("正常关闭".equals(request.getOrderStatus())){
+            udpOrder.setStatus(LongYanPurchaseOrderStatusEnum.normal_close.getValue());
+        }
+        else if ("未知状态".equals(request.getOrderStatus())){
+            udpOrder.setStatus(LongYanPurchaseOrderStatusEnum.unknowing_status.getValue());
+        }
+    }
+
 
 
     /**

platform-service/src/main/java/handler/yongyou/request/PurchaseDetails.java

@@ -5,7 +5,7 @@ import lombok.Data;
 
 @Data
 public class PurchaseDetails {
-    Integer status;
+    String status;
     String spareNo;
     String remark;
     Integer purchasedNum;

platform-service/src/main/java/handler/yongyou/request/PurchaseOrderStatusModNoticeRequest.java

@@ -6,7 +6,7 @@ import java.util.List;
 
 @Data
 public class PurchaseOrderStatusModNoticeRequest extends FromYongYouBaseRequest {
-    private Integer orderStatus;
+    private String orderStatus;
     private String yongYouId;
     private List<PurchaseDetails> purchaseDetails;