维多利亚

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/entity/logistics/LogisticsDetails.java

@@ -50,12 +50,6 @@ public class LogisticsDetails extends BaseEntity {
     private BigDecimal shipmentQuantity;
 
     /**
-     * 京东退货产品id
-     */
-    @NotNull(message = "京东退货产品id不能为空")
-    private Long jdBackProductId;
-
-    /**
      * 入库数量
      */
     private BigDecimal receiptQuantity;

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/entity/logistics/LogisticsInfo.java

@@ -29,6 +29,11 @@ public class LogisticsInfo extends BaseEntity {
     private Long businessId;
 
     /**
+     * 业务编码
+     */
+    private String businessCode;
+
+    /**
      * 业务类型
      * 1采购进货(入库) businessId：purchase_id
      * 2京东订单出货(出库) businessId：order_info_id
@@ -44,26 +49,6 @@ public class LogisticsInfo extends BaseEntity {
     private Long warehouseId;
 
     /**
-     * 京东退货编号
-     */
-    private String jdBackCode;
-
-    /**
-     * 京东退货状态 1新建 2运输中 3待质检 4已完成
-     */
-    private Integer jdBackStatus;
-
-    /**
-     * 京东退货 关联京东订单id
-     */
-    private Long jdBackOrderId;
-
-    /**
-     * 京东退货 关联京东订单code
-     */
-    private Long jdBackOrderCode;
-
-    /**
      * 采购进货完成状态：0、未完成 / 未到货；1、已完成 / 已到货
      */
     private Integer status;
@@ -136,4 +121,5 @@ public class LogisticsInfo extends BaseEntity {
      */
     @TableField(exist = false)
     private String purchaseName;
+
 }

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/params/logistics/DataInfoPageDto.java

@@ -8,4 +8,9 @@ import lombok.Setter;
 @Setter
 public class DataInfoPageDto extends BaseSelectDto {
 
+    /**
+     * 业务类型
+     */
+    private Integer businessType;
+
 }

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/params/logistics/DataInfoPageVo.java

@@ -3,8 +3,6 @@ package com.fjhx.params.logistics;
 import lombok.Getter;
 import lombok.Setter;
 
-import java.util.Date;
-
 @Getter
 @Setter
 public class DataInfoPageVo {
@@ -26,7 +24,15 @@ public class DataInfoPageVo {
     private Long businessId;
 
     /**
-     * 业务类型（1采购出货 2京东订单出货）
+     * 业务code
+     *
+     * @table logistics_info
+     * @field business_code
+     */
+    private Long businessCode;
+
+    /**
+     * 业务类型（1采购出货 2京东订单出货 3销售订单出货）
      *
      * @table logistics_info
      * @field business_type
@@ -58,19 +64,11 @@ public class DataInfoPageVo {
     private Integer logisticsStatus;
 
     /**
-     * 创建人id
+     * 物流公司名称
      *
-     * @table logistics_info
-     * @field create_user
-     */
-    private Long createUser;
-
-    /**
-     * 创建时间
-     *
-     * @table logistics_info
-     * @field create_time
+     * @table logistics_company
+     * @field name
      */
-    private Date createTime;
+    private String companyName;
 
 }

hx-service/victoriatourist/src/main/java/com/fjhx/controller/logistics/JdBackController.java

@@ -1,73 +0,0 @@
-package com.fjhx.controller.logistics;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.base.BaseSelectDto;
-import com.fjhx.params.logistics.JdBackAddDto;
-import com.fjhx.params.logistics.JdBackDetailsVo;
-import com.fjhx.params.logistics.JdBackPageDto;
-import com.fjhx.params.logistics.JdBackPageVo;
-import com.fjhx.service.logistics.LogisticsInfoService;
-import org.springblade.core.tool.api.R;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * 京东退货
- */
-@RestController
-@RequestMapping("/jdBack")
-public class JdBackController {
-
-    @Autowired
-    private LogisticsInfoService logisticsInfoService;
-
-    /**
-     * 京东退货分页
-     */
-    @PostMapping("/page")
-    public R page(@RequestBody JdBackPageDto dto) {
-        Page<JdBackPageVo> result = logisticsInfoService.jdBackPage(dto);
-        return R.success(result);
-    }
-
-    /**
-     * 京东退货明细
-     */
-    @PostMapping("/details")
-    public R details(@RequestBody BaseSelectDto dto) {
-        JdBackDetailsVo result = logisticsInfoService.jdBackDetails(dto.getId());
-        return R.success(result);
-    }
-
-    /**
-     * 京东退货添加
-     */
-    @PostMapping("/add")
-    public R add(@Validated @RequestBody JdBackAddDto dto) {
-        logisticsInfoService.jdBackAdd(dto);
-        return R.success();
-    }
-
-    /**
-     * 京东退货添加
-     */
-    @PostMapping("/edit")
-    public R edit(@Validated @RequestBody JdBackAddDto dto) {
-        logisticsInfoService.jdBackEdit(dto);
-        return R.success();
-    }
-
-    /**
-     * 京东退货添加
-     */
-    @PostMapping("/delete")
-    public R delete(@Validated @RequestBody BaseSelectDto dto) {
-        logisticsInfoService.jdBackDelete(dto.getId());
-        return R.success();
-    }
-
-}

hx-service/victoriatourist/src/main/java/com/fjhx/controller/logistics/LogisticsInfoController.java

@@ -1,6 +1,7 @@
 package com.fjhx.controller.logistics;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.base.BaseSelectDto;
 import com.fjhx.constants.StatusConstant;
 import com.fjhx.constants.logistics.LogisticsConstant;
 import com.fjhx.entity.logistics.LogisticsInfo;
@@ -43,9 +44,6 @@ public class LogisticsInfoController {
 
     /**
      * 发货通知
-     *
-     * @param entity
-     * @return
      */
     @PostMapping("/add")
     public R add(@RequestBody LogisticsInfoVo entity) {
@@ -108,8 +106,14 @@ public class LogisticsInfoController {
         return R.success(result);
     }
 
-
-
+    /**
+     * 跟新物流状态
+     */
+    @PostMapping(value = "/dataInfoEdit")
+    public R dataInfoEdit(@RequestBody BaseSelectDto dto) {
+        logisticsInfoService.dataInfoEdit(dto.getId());
+        return R.success();
+    }
 
 }
 

hx-service/victoriatourist/src/main/java/com/fjhx/controller/thirdpartypush/ThirdPartyPushController.java

@@ -2,9 +2,7 @@ package com.fjhx.controller.thirdpartypush;
 
 import com.alibaba.fastjson.JSONObject;
 import com.fjhx.constants.logistics.LogisticsConstant;
-import com.fjhx.entity.logistics.LogisticsDetails;
 import com.fjhx.entity.logistics.LogisticsInfo;
-import com.fjhx.service.logistics.LogisticsDetailsService;
 import com.fjhx.service.logistics.LogisticsInfoService;
 import com.fjhx.uitl.kd100.KD100Util;
 import lombok.extern.slf4j.Slf4j;
@@ -33,9 +31,6 @@ public class ThirdPartyPushController {
     @Autowired
     private LogisticsInfoService logisticsInfoService;
 
-    @Autowired
-    private LogisticsDetailsService logisticsDetailsService;
-
     /**
      * kd100回调
      *
@@ -79,15 +74,6 @@ public class ThirdPartyPushController {
                         // 修改采购进货完成状态
                         logisticsInfo.setStatus(LogisticsConstant.Status.STATUS_1);
                         break;
-                    case 4:
-                        // 质检状态改为待质检
-                        logisticsInfo.setJdBackStatus(3);
-
-                        // 添加质检记录
-                        List<LogisticsDetails> logisticsDetailsList = logisticsDetailsService.
-                                list(q -> q.eq(LogisticsDetails::getLogisticsInfoId, logisticsInfo.getId()));
-                        logisticsInfoService.addJdBackQuality(logisticsDetailsList, logisticsInfo.getWarehouseId(), logisticsInfo.getId());
-                        break;
                 }
             }
 

hx-service/victoriatourist/src/main/java/com/fjhx/mapper/logistics/LogisticsInfoMapper.xml

@@ -28,13 +28,14 @@
     <select id="dataInfoPage" resultType="com.fjhx.params.logistics.DataInfoPageVo">
         select sc.id                     id,
                sc.business_id            businessId,
+               sc.business_Code          businessCode,
                sc.business_type          businessType,
                sc.code                   code,
                sc.logistics_company_code logisticsCompanyCode,
                sc.logistics_status       logisticsStatus,
-               sc.create_user            createUser,
-               sc.create_time            createTime
+               lc.name                   companyName
         from logistics_info sc
+                 left join logistics_company lc on sc.logistics_company_code = lc.code
             ${ew.customSqlSegment}
     </select>
 

hx-service/victoriatourist/src/main/java/com/fjhx/service/logistics/LogisticsInfoService.java

@@ -2,9 +2,11 @@ package com.fjhx.service.logistics;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.base.BaseService;
-import com.fjhx.entity.logistics.LogisticsDetails;
 import com.fjhx.entity.logistics.LogisticsInfo;
-import com.fjhx.params.logistics.*;
+import com.fjhx.params.logistics.DataInfoPageDto;
+import com.fjhx.params.logistics.DataInfoPageVo;
+import com.fjhx.params.logistics.DeliverDetailsVo;
+import com.fjhx.params.logistics.LogisticsInfoVo;
 import com.fjhx.params.stock.InStockAdd;
 
 import java.util.List;
@@ -85,33 +87,8 @@ public interface LogisticsInfoService extends BaseService<LogisticsInfo> {
     Page<DataInfoPageVo> dataInfoPage(DataInfoPageDto dto);
 
     /**
-     * 京东退货分页
+     * 更新物流状态
      */
-    Page<JdBackPageVo> jdBackPage(JdBackPageDto dto);
-
-    /**
-     * 京东退货明细
-     */
-    JdBackDetailsVo jdBackDetails(Long id);
-
-    /**
-     * 京东退货添加
-     */
-    void jdBackAdd(JdBackAddDto dto);
-
-    /**
-     * 京东退货编辑
-     */
-    void jdBackEdit(JdBackAddDto dto);
-
-    /**
-     * 删除京东退货
-     */
-    void jdBackDelete(Long id);
-
-    /**
-     * 京东退货添加到货质检
-     */
-    void addJdBackQuality(List<LogisticsDetails> logisticsDetailsList, Long warehouseId, Long logisticsInfoId);
+    void dataInfoEdit(Long id);
 
 }

hx-service/victoriatourist/src/main/java/com/fjhx/service/logistics/impl/LogisticsInfoServiceImpl.java

@@ -1,6 +1,5 @@
 package com.fjhx.service.logistics.impl;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -20,11 +19,13 @@ import com.fjhx.enums.purchase.PurchaseStatusEnum;
 import com.fjhx.enums.stock.InTypeEnum;
 import com.fjhx.enums.stock.QualityStatusEnum;
 import com.fjhx.mapper.logistics.LogisticsInfoMapper;
-import com.fjhx.params.logistics.*;
+import com.fjhx.params.logistics.DataInfoPageDto;
+import com.fjhx.params.logistics.DataInfoPageVo;
+import com.fjhx.params.logistics.DeliverDetailsVo;
+import com.fjhx.params.logistics.LogisticsInfoVo;
 import com.fjhx.params.stock.InStockAdd;
 import com.fjhx.params.stock.StockChangeDto;
 import com.fjhx.service.apply.ApplyPurchaseService;
-import com.fjhx.service.classify.ClassifyService;
 import com.fjhx.service.logistics.LogisticsDetailsService;
 import com.fjhx.service.logistics.LogisticsInfoService;
 import com.fjhx.service.product.ProductInfoService;
@@ -84,9 +85,6 @@ public class LogisticsInfoServiceImpl extends ServiceImpl<LogisticsInfoMapper, L
     @Autowired
     private QualityDetailsService qualityDetailsService;
 
-    @Autowired
-    private ClassifyService classifyService;
-
     @Override
     public Page<LogisticsInfo> getPage(Map<String, Object> condition) {
 
@@ -132,23 +130,32 @@ public class LogisticsInfoServiceImpl extends ServiceImpl<LogisticsInfoMapper, L
     @Transactional(rollbackFor = {Exception.class})
     @Override
     public void add(LogisticsInfoVo logisticsInfoVo) {
-        if (Func.isAnyBlank(logisticsInfoVo.getLogisticsCompanyCode(), logisticsInfoVo.getCode())) {
-            throw new ServiceException("物流信息不能为空");
-        }
-
+        Long businessId = logisticsInfoVo.getBusinessId();
+        String logisticsCompanyCode = logisticsInfoVo.getLogisticsCompanyCode();
+        String code = logisticsInfoVo.getCode();
         List<LogisticsDetails> details = logisticsInfoVo.getDetails();
+
+        Assert.notEmpty(businessId, "业务id不能为空");
+        Assert.notEmpty(logisticsCompanyCode, "物流公司编码不能为空");
+        Assert.notEmpty(code, "物流单号不能为空");
         Assert.notEmpty(details, "发货明细不能为空");
 
+        Purchase purchase = purchaseService.getById(businessId);
+        Assert.notEmpty(purchase, "未知采购id");
+
+        // 物流信息id
+        long logisticsInfoId = IdWorker.getId();
+
         // 获取已发货数量map<申购单id, 已发货数量>
-        Map<Long, BigDecimal> deliverQuantityMap = logisticsDetailsService.getDeliverQuantityMap(logisticsInfoVo.getBusinessId());
+        Map<Long, BigDecimal> deliverQuantityMap = logisticsDetailsService.getDeliverQuantityMap(businessId);
+
         // 获取申购数量
-        Map<Long, BigDecimal> applyPurchaseQuantityMap = applyPurchaseService.list(ApplyPurchase::getPurchaseId, logisticsInfoVo.getBusinessId())
+        Map<Long, BigDecimal> applyPurchaseQuantityMap = applyPurchaseService.list(ApplyPurchase::getPurchaseId, businessId)
                 .stream().collect(Collectors.toMap(BaseIdEntity::getId, ApplyPurchase::getQuantity, BigDecimal::add));
 
         details = details.stream()
-                .filter(item ->
-                        ObjectUtil.isNotEmpty(item.getShipmentQuantity()) && item.getShipmentQuantity().compareTo(BigDecimal.ZERO) > 0
-                ).peek(item -> {
+                .filter(item -> ObjectUtil.defaultIfNull(item.getShipmentQuantity(), BigDecimal.ZERO).compareTo(BigDecimal.ZERO) > 0)
+                .peek(item -> {
                     Long applyPurchaseId = item.getApplyPurchaseId();
                     Assert.notEmpty(applyPurchaseId, "申购id不能为空");
 
@@ -162,26 +169,30 @@ public class LogisticsInfoServiceImpl extends ServiceImpl<LogisticsInfoMapper, L
                         throw new ServiceException("发货总数量不能大于发货数量");
                     }
 
-                })
-                .collect(Collectors.toList());
-        Assert.notEmpty(details, "发货数量不能全为0");
+                    item.setLogisticsInfoId(logisticsInfoId);
+                    item.setLogisticsInfoCode(code);
+                    item.setReceiptQuantity(BigDecimal.ZERO);
+
+                }).collect(Collectors.toList());
+        Assert.notEmpty(details, "发货数量全为0");
+
 
-        Integer state = KD100Util.getStateAndMonitor(logisticsInfoVo.getLogisticsCompanyCode(), logisticsInfoVo.getCode());
+        // 物流状态
+        Integer state = KD100Util.getStateAndMonitor(logisticsCompanyCode, code);
+        logisticsInfoVo.setId(logisticsInfoId);
+        logisticsInfoVo.setBusinessType(1);
+        logisticsInfoVo.setBusinessCode(purchase.getCode());
         logisticsInfoVo.setLogisticsStatus(state);
         logisticsInfoVo.setStatus(LogisticsConstant.Status.STATUS_0);
         logisticsInfoVo.setInStockStatus(LogisticsConstant.InStockStatus.STATUS_10);
         save(logisticsInfoVo);
 
-        details.forEach(o -> {
-            o.setLogisticsInfoId(logisticsInfoVo.getId());
-            o.setLogisticsInfoCode(logisticsInfoVo.getCode());
-            o.setReceiptQuantity(BigDecimal.ZERO);
-        });
+        // 保存明细
+        logisticsDetailsService.saveBatch(details);
 
-        //保存附件
-        FileClientUtil.bindingFile(logisticsInfoVo.getId(), logisticsInfoVo.getFileInfos());
+        // 保存附件
+        FileClientUtil.bindingFile(logisticsInfoId, logisticsInfoVo.getFileInfos());
 
-        logisticsDetailsService.saveBatch(details);
     }
 
     @Override
@@ -405,174 +416,27 @@ public class LogisticsInfoServiceImpl extends ServiceImpl<LogisticsInfoMapper, L
     @Override
     public Page<DataInfoPageVo> dataInfoPage(DataInfoPageDto dto) {
         IWrapper<Object> wrapper = IWrapper.getWrapper(dto);
-        return baseMapper.dataInfoPage(dto.getPage(), wrapper);
-    }
-
-    @Override
-    public Page<JdBackPageVo> jdBackPage(JdBackPageDto dto) {
-        IWrapper<Object> wrapper = IWrapper.getWrapper(dto)
+        wrapper.eq("sc.business_type", dto.getBusinessType())
                 .keyword(
-                        new KeywordData("li", LogisticsInfo::getJdBackOrderId))
-                .eq("li", LogisticsInfo::getJdBackStatus, dto.getJdBackStatus());
-
-        return baseMapper.jdBackPage(dto.getPage(), wrapper);
+                        new KeywordData("sc.business_Code"),
+                        new KeywordData("lc.name"),
+                        new KeywordData("sc.code")
+                );
+        return baseMapper.dataInfoPage(dto.getPage(), wrapper);
     }
 
     @Override
-    public JdBackDetailsVo jdBackDetails(Long id) {
-
+    public void dataInfoEdit(Long id) {
         LogisticsInfo logisticsInfo = getById(id);
+        Assert.notEmpty(logisticsInfo, "没有找到物流信息");
 
-        List<LogisticsDetails> list = logisticsDetailsService.list(q -> q.eq(LogisticsDetails::getLogisticsInfoId, id));
-        List<LogisticsDetailsEx> logisticsDetailsExList = BeanUtil.copyToList(list, LogisticsDetailsEx.class);
-
-        // 赋值产品编码、名称
-        productInfoService.attributeAssign(logisticsDetailsExList, LogisticsDetails::getJdBackProductId, (item, productInfo) -> {
-            item.setProductName(productInfo.getName());
-            item.setProductCode(productInfo.getCode());
-            item.setClassifyId(productInfo.getClassifyId());
-        });
-
-        // 赋值产品分类
-        classifyService.attributeAssign(logisticsDetailsExList, LogisticsDetailsEx::getClassifyId, (item, classify) -> {
-            item.setClassifyName(classify.getName());
-        });
-
-        JdBackDetailsVo jdBackDetailsVo = BeanUtil.toBean(logisticsInfo, JdBackDetailsVo.class);
-        jdBackDetailsVo.setLogisticsDetailsList(logisticsDetailsExList);
-        return jdBackDetailsVo;
-    }
-
-    @Transactional(rollbackFor = {Exception.class})
-    @Override
-    public void jdBackAdd(JdBackAddDto dto) {
-
-        List<LogisticsDetails> logisticsDetailsList = dto.getLogisticsDetailsList();
-        Assert.notEmpty(logisticsDetailsList, "京东退货明细不能为空");
-
-        String code = dto.getCode();
-        String logisticsCompanyCode = dto.getLogisticsCompanyCode();
-
-        Integer state = null;
-        if (ObjectUtil.isAllNotEmpty(code, logisticsCompanyCode)) {
-            state = KD100Util.getStateAndMonitor(logisticsCompanyCode, code);
-        }
-
-        synchronized (this) {
-            String jdBackCode = CodeEnum.JD_BACK.getCode();
-
-            long id = IdWorker.getId();
-
-            int jdBackStatus = 1;
-            if (state != null) {
-                if (LogisticsConstant.KD100Status.STATUS_3.equals(state)) {
-                    addJdBackQuality(logisticsDetailsList, dto.getWarehouseId(), id);
-                    jdBackStatus = 3;
-                } else {
-                    jdBackStatus = 2;
-                }
-            }
-
-            dto.setId(id);
-            dto.setBusinessId(null);
-            dto.setBusinessType(4);
-            dto.setJdBackCode(jdBackCode);
-            dto.setJdBackStatus(jdBackStatus);
-            dto.setLogisticsStatus(state);
-
-            for (LogisticsDetails logisticsDetails : logisticsDetailsList) {
-                logisticsDetails.setLogisticsInfoId(id);
-                logisticsDetails.setLogisticsInfoCode(code);
-                logisticsDetails.setReceiptQuantity(BigDecimal.ZERO);
-            }
-
-            save(dto);
-            logisticsDetailsService.saveBatch(logisticsDetailsList);
-        }
-
-    }
+        Integer state = KD100Util.getStateAndMonitor(logisticsInfo.getLogisticsCompanyCode(), logisticsInfo.getCode());
 
-    @Transactional(rollbackFor = {Exception.class})
-    @Override
-    public void jdBackEdit(JdBackAddDto dto) {
-
-        List<LogisticsDetails> logisticsDetailsList = dto.getLogisticsDetailsList();
-        Assert.notEmpty(logisticsDetailsList, "京东退货明细不能为空");
-
-        LogisticsInfo logisticsInfo = getById(dto.getId());
-        Assert.eqTrue(!ObjectUtil.isAllNotEmpty(logisticsInfo.getCode(), logisticsInfo.getLogisticsCompanyCode()), "退货已发起，无法编辑");
-
-        String code = dto.getCode();
-        String logisticsCompanyCode = dto.getLogisticsCompanyCode();
-        Integer state = null;
-        if (ObjectUtil.isAllNotEmpty(code, logisticsCompanyCode)) {
-            state = KD100Util.getStateAndMonitor(logisticsCompanyCode, code);
-        }
-
-        synchronized (this) {
-
-            int jdBackStatus = 1;
-            if (state != null) {
-                if (LogisticsConstant.KD100Status.STATUS_3.equals(state)) {
-                    addJdBackQuality(logisticsDetailsList, dto.getWarehouseId(), dto.getId());
-                    jdBackStatus = 3;
-                } else {
-                    jdBackStatus = 2;
-                }
-            }
-            dto.setJdBackStatus(jdBackStatus);
-            dto.setLogisticsStatus(state);
-
-            for (LogisticsDetails logisticsDetails : logisticsDetailsList) {
-                logisticsDetails.setLogisticsInfoId(dto.getId());
-                logisticsDetails.setLogisticsInfoCode(code);
-                logisticsDetails.setReceiptQuantity(BigDecimal.ZERO);
-            }
-
-            updateById(dto);
-            List<Long> notDeleteId = logisticsDetailsList.stream().map(BaseIdEntity::getId).filter(ObjectUtil::isNotEmpty).collect(Collectors.toList());
-            if (notDeleteId.size() > 0) {
-                logisticsDetailsService.remove(q -> q.eq(LogisticsDetails::getLogisticsInfoId, dto.getId()).notIn(BaseIdEntity::getId, notDeleteId));
-            }
-            logisticsDetailsService.saveOrUpdateBatch(logisticsDetailsList);
+        if (ObjectUtil.notEqual(state, logisticsInfo.getLogisticsStatus())) {
+            logisticsInfo.setLogisticsStatus(state);
+            updateById(logisticsInfo);
         }
 
     }
 
-    @Override
-    public void jdBackDelete(Long id) {
-        LogisticsInfo logisticsInfo = getById(id);
-        Assert.eqTrue(!ObjectUtil.isAllNotEmpty(logisticsInfo.getCode(), logisticsInfo.getLogisticsCompanyCode()), "退货已发起，无法删除");
-
-        removeById(id);
-        logisticsDetailsService.remove(LogisticsDetails::getLogisticsInfoId, id);
-    }
-
-    @Override
-    public void addJdBackQuality(List<LogisticsDetails> logisticsDetailsList, Long warehouseId, Long logisticsInfoId) {
-        // 添加质检
-        QualityInfo qualityInfo = new QualityInfo();
-        qualityInfo.setType(2);
-        qualityInfo.setCode(CodeEnum.QUALITY.getCode());
-        qualityInfo.setStatus(QualityStatusEnum.STATUS_1.getKey());
-        qualityInfo.setResultType(StatusConstant.YES);
-        qualityInfoService.save(qualityInfo);
-
-        // 添加质检明细
-        List<QualityDetails> qualityDetailsList = logisticsDetailsList.stream().map(item -> {
-            QualityDetails qualityDetails = new QualityDetails();
-            qualityDetails.setQualityInfoId(qualityInfo.getId());
-            qualityDetails.setLogisticsDetailsId(logisticsInfoId);
-            qualityDetails.setProductInfoId(item.getJdBackProductId());
-            qualityDetails.setWarehouseId(warehouseId);
-            qualityDetails.setTotalQuantity(item.getShipmentQuantity());
-            qualityDetails.setQualifiedQuantity(BigDecimal.ZERO);
-            qualityDetails.setDisqualificationQuantity(BigDecimal.ZERO);
-            return qualityDetails;
-        }).collect(Collectors.toList());
-
-        qualityDetailsService.saveBatch(qualityDetailsList);
-
-    }
-
 }

hx-service/victoriatourist/src/main/java/com/fjhx/service/order/impl/OrderDetailsServiceImpl.java

@@ -122,16 +122,19 @@ public class OrderDetailsServiceImpl extends ServiceImpl<OrderDetailsMapper, Ord
         // 查询快递100的物流信息
         String logisticsCompanyCode = issueDto.getLogisticsCompanyCode();
         String logisticsCode = issueDto.getLogisticsCode();
-        Integer logisticsStatus = KD100Util.getStateAndMonitor(logisticsCompanyCode, logisticsCode);
+        Integer state = KD100Util.getStateAndMonitor(logisticsCompanyCode, logisticsCode);
+
+        OrderInfo orderInfo = orderInfoService.getById(orderId);
 
         // 保存物流消息
         LogisticsInfo logisticsInfo = new LogisticsInfo();
         logisticsInfo.setBusinessId(orderId);
+        logisticsInfo.setBusinessCode(orderInfo.getCode());
         logisticsInfo.setBusinessType(OutTypeEnum.JD.equals(issueDto.getOutTypeEnum()) ? 2 : 3);
         logisticsInfo.setCode(logisticsCode);
         logisticsInfo.setLogisticsCompanyCode(logisticsCompanyCode);
         logisticsInfo.setWarehouseId(issueDto.getWarehouseId());
-        logisticsInfo.setLogisticsStatus(logisticsStatus);
+        logisticsInfo.setLogisticsStatus(state);
         logisticsInfo.setStatus(0);
         logisticsInfoService.save(logisticsInfo);
     }