备件回收，备件出库修改稿

src/main/java/com/fdkankan/sale/entity/PriceList.java

@@ -84,18 +84,6 @@ public class PriceList implements Serializable {
     private Integer partId;
 
     /**
-     * 出库状态0未出库，1已出库
-     */
-    @TableField("out_status")
-    private Integer outStatus;
-
-    /**
-     * 回收状态，0未回收，1已回收
-     */
-    @TableField("recovery_status")
-    private Integer recoveryStatus;
-
-    /**
      * 回收状态，0没折扣，1有折扣
      */
     @TableField("discount")

src/main/java/com/fdkankan/sale/service/IPriceListService.java

@@ -29,8 +29,4 @@ public interface IPriceListService extends IService<PriceList> {
     List<PriceList> getCheckAmountByRepairId(String repairId);
 
     void delNoCm(String repairId);
-
-    void outStock(String repairId);
-
-    void recoveryPart(String repairId);
 }

src/main/java/com/fdkankan/sale/service/impl/PriceListServiceImpl.java

@@ -85,21 +85,4 @@ public class PriceListServiceImpl extends ServiceImpl<IPriceListMapper, PriceLis
         this.remove(wrapper);
     }
 
-    @Override
-    public void outStock(String repairId) {
-        LambdaUpdateWrapper<PriceList> wrapper = new LambdaUpdateWrapper<>();
-        wrapper.eq(PriceList::getRepairId,repairId);
-        wrapper.eq(PriceList::getStatus,1);
-        wrapper.set(PriceList::getOutStatus,1);
-        this.update(wrapper);
-    }
-
-    @Override
-    public void recoveryPart(String repairId) {
-        LambdaUpdateWrapper<PriceList> wrapper = new LambdaUpdateWrapper<>();
-        wrapper.eq(PriceList::getRepairId,repairId);
-        wrapper.eq(PriceList::getStatus,1);
-        wrapper.set(PriceList::getRecoveryStatus,1);
-        this.update(wrapper);
-    }
 }

src/main/java/com/fdkankan/sale/service/impl/RepairServiceImpl.java

@@ -15,6 +15,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.sale.util.DateUtil;
 import com.fdkankan.sale.util.StatusUtil;
 import com.fdkankan.sale.vo.request.*;
+import com.fdkankan.sale.vo.response.RepairRegisterPartVo;
 import com.fdkankan.sale.vo.response.RepairerVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -44,6 +45,8 @@ public class RepairServiceImpl extends ServiceImpl<IRepairMapper, Repair> implem
     IRepairFaultService repairFaultService;
     @Autowired
     IPriceListService priceListService;
+    @Autowired
+    RepairSupplyService repairSupplyService;
 
     @Override
     public void updateRepairStatus(String repairId, Integer status) {
@@ -82,9 +85,8 @@ public class RepairServiceImpl extends ServiceImpl<IRepairMapper, Repair> implem
         }
         repairPayService.updatePayStatus(orderSn,tradeNo,openid);
         if(orderSn.contains("se_s")){
-            List<PriceList> priceListList = priceListService.getByRepairId(repairPay.getRepairId());
-            List<PriceList> collect = priceListList.stream().filter(entity -> entity.getOutStatus() == 1 && entity.getType() == 0).collect(Collectors.toList());
-            if(collect.size() >0){
+            List<RepairRegisterPartVo> partVoList = repairSupplyService.partInfo(repairPay.getRepairId(), 1);
+            if(partVoList.size() >0){
                 repairLogService.saveBySysUser(null,repairPay.getRepairId(), RepairStatusEnum.TO_BE_RECOVERED.status(),"完成维修支付成功");
             }else {
                 repairLogService.saveBySysUser(null,repairPay.getRepairId(), RepairStatusEnum.TO_BE_SHIPPED.status(),"完成维修支付成功");

src/main/java/com/fdkankan/sale/service/impl/RepairSupplyService.java

@@ -141,7 +141,6 @@ public class RepairSupplyService {
         for (RepairRegisterPartVo partVo : partVoList) {
             partService.outStock(partVo.getPartId(),partVo.getPartCount(),userId,repair.getRepairId());
         }
-        priceListService.outStock(repair.getRepairId());
 
         repairLogService.saveBySysUser(userId,param.getRepairId(),RepairStatusEnum.TO_BE_REPAIRED.status(),"备件出库");
     }
@@ -163,7 +162,6 @@ public class RepairSupplyService {
         for (RepairRegisterPartVo partVo : partVoList) {
             partService.recovery(partVo.getPartId(),partVo.getPartCount(),userId,repair.getRepairId(),repair.getStatus());
         }
-        priceListService.recoveryPart(repair.getRepairId());
 
         repairLogService.saveBySysUser(userId,param.getRepairId(),RepairStatusEnum.TO_BE_SHIPPED.status(),"备件回收");
     }

src/main/java/com/fdkankan/sale/vo/response/RepairRegisterPartVo.java

@@ -4,6 +4,8 @@ import com.fdkankan.sale.entity.RepairRegisterPart;
 import lombok.Data;
 
 @Data
-public class RepairRegisterPartVo extends RepairRegisterPart {
+public class RepairRegisterPartVo{
+    private Integer partId;
     private String partName;
+    private Integer partCount;
 }