物流查询多运单号适配

fs-admin/src/main/java/com/fs/store/controller/FsStoreOrderController.java

@@ -1,34 +1,26 @@
 package com.fs.store.controller;
 
-import java.math.BigDecimal;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
-import java.util.Objects;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.fs.common.core.domain.R;
-import com.fs.common.utils.DateUtils;
 import com.fs.common.utils.ParseUtils;
 import com.fs.common.utils.StringUtils;
-import com.fs.company.domain.CompanyMoneyLogs;
 import com.fs.company.param.CompanyStoreOrderMoneyLogsListParam;
 import com.fs.company.service.ICompanyMoneyLogsService;
-import com.fs.company.vo.CompanyMoneyLogsVO;
 import com.fs.company.vo.CompanyStoreOrderMoneyLogsVO;
 import com.fs.erp.domain.ErpDeliverys;
 import com.fs.erp.domain.ErpOrderQuery;
 import com.fs.erp.dto.ErpOrderQueryRequert;
 import com.fs.erp.dto.ErpOrderQueryResponse;
 import com.fs.erp.service.IErpOrderService;
+import com.fs.express.FsStoreDeliversService;
+import com.fs.express.dto.DeliveryDTO;
 import com.fs.store.domain.*;
-import com.fs.store.dto.ExpressInfoDTO;
-import com.fs.store.dto.FsStoreCartDTO;
-import com.fs.store.dto.StoreOrderExpressExportDTO;
-import com.fs.store.dto.StoreOrderProductDTO;
+import com.fs.store.dto.*;
 import com.fs.store.enums.ShipperCodeEnum;
 import com.fs.store.param.*;
 import com.fs.store.service.*;
@@ -48,8 +40,6 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 
-import static com.fs.store.constants.StoreConstants.DELIVERY;
-
 /**
  * 订单Controller
  *
@@ -80,6 +70,8 @@ public class FsStoreOrderController extends BaseController {
     @Autowired
     private ICompanyMoneyLogsService moneyLogsService;
 
+    @Autowired
+    private FsStoreDeliversService fsStoreDeliversService;
     /**
      * 查询订单列表
      */
@@ -383,14 +375,18 @@ public class FsStoreOrderController extends BaseController {
 
     /**
      * 修改物流
-     * @param fsStoreOrder
-     * @return
+     * @param deliveryDTO
+     * @return AjaxResult
      */
     @Log(title = "修改物流", businessType = BusinessType.UPDATE)
     @PreAuthorize("@ss.hasPermi('store:storeOrder:editDeliveryId')")
     @PutMapping("/editDeliveryId")
-    public AjaxResult editDeliveryId(@RequestBody FsStoreOrder fsStoreOrder) {
-        return toAjax(fsStoreOrderService.updateFsStoreOrder(fsStoreOrder));
+    public AjaxResult editDeliveryId(@RequestBody FsStoreDelivers deliveryDTO) {
+
+        fsStoreDeliversService.editDeliveryId(deliveryDTO);
+        fsStoreDeliversService.syncDeliverInfo(deliveryDTO.getOrderId());
+        fsStoreDeliversService.finishOrder(deliveryDTO.getOrderId());
+        return AjaxResult.success();
     }
 
     @Log(title = "同步管易物流单号", businessType = BusinessType.UPDATE)

fs-service-system/src/main/java/com/fs/express/FsStoreDeliversService.java

@@ -1,6 +1,7 @@
 package com.fs.express;
 
 
+import com.fs.express.dto.DeliveryDTO;
 import com.fs.store.domain.FsStoreDelivers;
 
 import java.util.List;
@@ -55,4 +56,7 @@ public interface FsStoreDeliversService {
     void syncDeliverInfo(Long orderId);
 
     FsStoreDelivers findByOrderCodeAndDeliverId(String orderCode, String deliverId);
+
+    void editDeliveryId(FsStoreDelivers deliveryDTO);
+
 }

fs-service-system/src/main/java/com/fs/express/dto/DeliveryDTO.java

@@ -0,0 +1,18 @@
+package com.fs.express.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class DeliveryDTO implements Serializable {
+
+    /**
+     * 订单id
+     */
+    private Long id;
+    private String deliverySn;
+    private String deliveryId;
+
+}
+

fs-service-system/src/main/java/com/fs/express/impl/FsStoreDeliversServiceImpl.java

@@ -5,6 +5,7 @@ import cn.hutool.core.util.StrUtil;
 import com.fs.common.utils.PhoneUtils;
 import com.fs.express.FsStoreDeliversService;
 import com.fs.express.IExpressService;
+import com.fs.express.dto.DeliveryDTO;
 import com.fs.store.domain.FsStoreDelivers;
 import com.fs.store.domain.FsStoreOrder;
 import com.fs.store.dto.ExpressInfoDTO;
@@ -151,4 +152,9 @@ public class FsStoreDeliversServiceImpl implements FsStoreDeliversService {
     public FsStoreDelivers findByOrderCodeAndDeliverId(String orderCode, String deliverId) {
         return fsStoreDeliversMapper.findByOrderCodeAndDeliverId(orderCode,deliverId);
     }
+
+    @Override
+    public void editDeliveryId(FsStoreDelivers deliveryDTO) {
+        fsStoreDeliversMapper.update(deliveryDTO);
+    }
 }