1

src/main/java/com/fdkankan/sale/controller/RepairSaleController.java

@@ -86,8 +86,9 @@ public class RepairSaleController extends BaseController{
     }
 
     @GetMapping("/getPriceList")
-    public ResultData getPriceList(@RequestParam(required = false) String repairId){
-        return ResultData.ok(repairSaleService.getPriceList(repairId));
+    public ResultData getPriceList(@RequestParam(required = false) String repairId,
+                                    @RequestParam(required = false,defaultValue = "0") Integer isRest){
+        return ResultData.ok(repairSaleService.getPriceList(repairId,isRest));
     }
 
     /**

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

@@ -3,6 +3,7 @@ package com.fdkankan.sale.service;
 import com.fdkankan.sale.entity.RepairRegister;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.sale.vo.response.CheckRegisterVo;
+import com.fdkankan.sale.vo.response.PriceListVo;
 import com.fdkankan.sale.vo.response.RepairRegisterVo;
 
 import java.util.List;
@@ -28,4 +29,6 @@ public interface IRepairRegisterService extends IService<RepairRegister> {
     RepairRegisterVo getVoByRegisterLogId(Integer registerLogId);
 
     void delByRepairId(String repairId);
+
+    PriceListVo getPriceList(String repairId);
 }

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.fdkankan.sale.entity.Part;
+import com.fdkankan.sale.entity.PriceList;
 import com.fdkankan.sale.entity.RepairRegister;
 import com.fdkankan.sale.entity.RepairRegisterPart;
 import com.fdkankan.sale.mapper.IRepairRegisterMapper;
@@ -13,7 +14,9 @@ import com.fdkankan.sale.service.IRepairRegisterPartService;
 import com.fdkankan.sale.service.IRepairRegisterService;
 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.response.CheckRegisterVo;
+import com.fdkankan.sale.vo.response.PriceListVo;
 import com.fdkankan.sale.vo.response.RepairRegisterPartVo;
 import com.fdkankan.sale.vo.response.RepairRegisterVo;
 import org.apache.commons.lang3.StringUtils;
@@ -115,4 +118,32 @@ public class RepairRegisterServiceImpl extends ServiceImpl<IRepairRegisterMapper
         wrapper.eq(RepairRegister::getRepairId,repairId);
         this.remove(wrapper);
     }
+
+    @Override
+    public PriceListVo getPriceList(String repairId) {
+        RepairRegisterVo vo = this.getBaseMapper().getVoByRepairId(repairId);
+        if(vo == null){
+            return null;
+        }
+        List<RepairRegisterPart> partList = repairRegisterPartService.getByRepairId(vo.getRepairId());
+        PriceListVo priceListVo = new PriceListVo();
+        priceListVo.setCount(1);
+        List<PriceList> priceLists = new ArrayList<>();
+        for (RepairRegisterPart repairRegisterPart : partList) {
+            Part part = partService.getById(repairRegisterPart.getPartId());
+            if(part == null){
+                continue;
+            }
+            PriceList priceList = new PriceList();
+            priceList.setRepairId(repairId);
+            priceList.setName(part.getPartName());
+            priceList.setPrice(part.getPartPrice());
+            priceList.setCount(repairRegisterPart.getPartCount());
+            priceList.setPartId(part.getPartId());
+            priceList.setPriceDiscount(part.getPartPriceDiscount());
+            priceLists.add(priceList);
+        }
+        priceListVo.setPriceLists(priceLists);
+        return priceListVo;
+    }
 }

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

@@ -251,10 +251,13 @@ public class RepairSaleService {
         repairLogService.saveBySysUser(userId,param.getRepairId(),status,repair.getStatus(),"维修报价");
     }
 
-    public PriceListVo getPriceList(String repairId) {
+    public PriceListVo getPriceList(String repairId,Integer isRest) {
         if(StringUtils.isBlank(repairId)){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
+        if(isRest == 1){
+            return repairRegisterService.getPriceList(repairId);
+        }
         List<PriceList> priceLists = priceListService.getByRepairId(repairId);
         Set<Integer> collect = priceLists.stream().map(PriceList::getPartId).collect(Collectors.toSet());
         HashMap<Integer,Part> partHashMap = new HashMap<>();