维多利亚

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

@@ -28,7 +28,7 @@ public class LogisticsInfo extends BaseEntity {
     private Long businessId;
 
     /**
-     * 业务类型（1采购出货 2京东订单出货）
+     * 业务类型（1采购出货 2京东订单出货 3销售订单出库 4京东退货）
      */
     private Integer businessType;
 

hx-service/victoriatourist/src/main/java/com/fjhx/controller/quality/QualityDetailsController.java

@@ -26,29 +26,14 @@ public class QualityDetailsController {
     @Autowired
     private QualityDetailsService qualityDetailsService;
 
-    // @PostMapping("/page")
-    // public R page(@RequestBody Map<String, Object> condition){
-    //     Page<QualityDetails> result = qualityDetailsService.getPage(condition);
-    //     return R.success(result);
-    // }
-    //
-    // @PostMapping("/add")
-    // public R add(@RequestBody QualityDetailsVo qualityDetailsVo){
-    //     qualityDetailsService.add(qualityDetailsVo);
-    //     return R.success();
-    // }
-    //
+    /**
+     * 质检
+     */
     @PostMapping("/edit")
     public R edit(@RequestBody List<QualityDetails> qualityDetailsList) {
         qualityDetailsService.edit(qualityDetailsList);
         return R.success();
     }
-    //
-    // @PostMapping("/delete")
-    // public R delete(@RequestBody QualityDetailsVo qualityDetailsVo){
-    //     qualityDetailsService.delete(qualityDetailsVo);
-    //     return R.success();
-    // }
 
 }
 

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

@@ -108,15 +108,18 @@ public class OrderDetailsServiceImpl extends ServiceImpl<OrderDetailsMapper, Ord
             updateOrderInfoStatus(list, issueDto);
         }
 
+        // 查询快递100的物流信息
+        String logisticsCompanyCode = issueDto.getLogisticsCompanyCode();
+        String logisticsCode = issueDto.getLogisticsCode();
+        Integer logisticsStatus = KD100Util.getStateAndMonitor(logisticsCompanyCode, logisticsCode);
+
         // 保存物流消息
         LogisticsInfo logisticsInfo = new LogisticsInfo();
         logisticsInfo.setBusinessId(orderId);
         logisticsInfo.setBusinessType(2);
-        logisticsInfo.setCode(issueDto.getLogisticsCode());
-        logisticsInfo.setLogisticsCompanyCode(issueDto.getLogisticsCompanyCode());
+        logisticsInfo.setCode(logisticsCode);
+        logisticsInfo.setLogisticsCompanyCode(logisticsCompanyCode);
         logisticsInfo.setWarehouseId(issueDto.getWarehouseId());
-        // 查询快递100的物流信息
-        Integer logisticsStatus = KD100Util.getStateAndMonitor(logisticsInfo.getLogisticsCompanyCode(), logisticsInfo.getCode());
         logisticsInfo.setLogisticsStatus(logisticsStatus);
         logisticsInfo.setStatus(0);
         logisticsInfoService.save(logisticsInfo);

hx-service/victoriatourist/src/main/java/com/fjhx/service/quality/QualityDetailsService.java

@@ -1,12 +1,9 @@
 package com.fjhx.service.quality;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.base.BaseService;
 import com.fjhx.entity.quality.QualityDetails;
-import com.fjhx.params.quality.QualityDetailsVo;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -18,12 +15,6 @@ import java.util.Map;
  */
 public interface QualityDetailsService extends BaseService<QualityDetails> {
 
-    Page<QualityDetails> getPage(Map<String, Object> condition);
-
-    void add(QualityDetailsVo qualityDetailsVo);
-
     void edit(List<QualityDetails> qualityDetailsList);
 
-    void delete(QualityDetailsVo qualityDetailsVo);
-
 }

hx-service/victoriatourist/src/main/java/com/fjhx/service/quality/impl/QualityDetailsServiceImpl.java

@@ -1,7 +1,6 @@
 package com.fjhx.service.quality.impl;
 
 import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.base.BaseIdEntity;
 import com.fjhx.constants.StatusConstant;
@@ -11,13 +10,11 @@ import com.fjhx.entity.stock.Stock;
 import com.fjhx.enums.stock.OutTypeEnum;
 import com.fjhx.enums.stock.QualityStatusEnum;
 import com.fjhx.mapper.quality.QualityDetailsMapper;
-import com.fjhx.params.quality.QualityDetailsVo;
 import com.fjhx.params.stock.InStockAdd;
 import com.fjhx.params.stock.StockChangeDto;
 import com.fjhx.service.quality.QualityDetailsService;
 import com.fjhx.service.quality.QualityInfoService;
 import com.fjhx.service.stock.StockService;
-import com.fjhx.utils.wrapperUtil.IWrapper;
 import org.springblade.core.log.exception.ServiceException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -47,19 +44,6 @@ public class QualityDetailsServiceImpl extends ServiceImpl<QualityDetailsMapper,
     @Autowired
     private QualityInfoService qualityInfoService;
 
-    @Override
-    public Page<QualityDetails> getPage(Map<String, Object> condition) {
-
-        IWrapper<QualityDetails> wrapper = IWrapper.getWrapper(condition);
-
-        return page(condition, wrapper);
-    }
-
-    @Override
-    public void add(QualityDetailsVo qualityDetailsVo) {
-        save(qualityDetailsVo);
-    }
-
     @Transactional(rollbackFor = Exception.class)
     @Override
     public synchronized void edit(List<QualityDetails> qualityDetailsList) {
@@ -151,9 +135,4 @@ public class QualityDetailsServiceImpl extends ServiceImpl<QualityDetailsMapper,
         updateBatchById(qualityDetailsList);
     }
 
-    @Override
-    public void delete(QualityDetailsVo qualityDetailsVo) {
-        removeById(qualityDetailsVo.getId());
-    }
-
 }