修复bug

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

@@ -190,9 +190,12 @@ public class RepairInfoService {
         for (PriceList list : priceList) {
             PriceListExcelVo excelVo = new PriceListExcelVo();
             BeanUtils.copyProperties(list,excelVo);
-            if(list.getPriceDiscount() == null){
+            if(list.getDiscount() == 0){
                 excelVo.setPriceDiscount(list.getPrice());
             }
+            if(list.getDiscount() == 0){
+                excelVo.setPriceDiscount(list.getPriceDiscount());
+            }
             excelVo.setAmount(excelVo.getPriceDiscount().multiply(new BigDecimal(list.getCount())));
             excelVos.add(excelVo);
             totalAmount = totalAmount.add(excelVo.getAmount());

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

@@ -17,6 +17,7 @@ import com.fdkankan.sale.util.DateUtil;
 import com.fdkankan.sale.util.StatusUtil;
 import com.fdkankan.sale.vo.request.*;
 import com.fdkankan.sale.vo.response.PriceListVo;
+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;
@@ -54,6 +55,8 @@ public class RepairSaleService {
     IPartService partService;
     @Autowired
     ILaborCostService laborCostService;
+    @Autowired
+    RepairSupplyService repairSupplyService;
 
     /**
      * 售后工程师
@@ -247,7 +250,13 @@ public class RepairSaleService {
         repairPay.setOrderType(0);
         repairPay.setOrderSn("se_s"+DateUtil.getDate(DateUtil.repairIdFmt));
         repairPayService.save(repairPay);
-        repairLogService.saveBySysUser(userId,param.getRepairId(),RepairStatusEnum.TO_BE_RECOVERED.status(), "付款登记");
+
+        List<RepairRegisterPartVo> partVoList = repairSupplyService.partInfo(repairPay.getRepairId(), 1);
+        if(partVoList.size() >0){
+            repairLogService.saveBySysUser(userId,param.getRepairId(),RepairStatusEnum.TO_BE_RECOVERED.status(), "付款登记");
+        }else {
+            repairLogService.saveBySysUser(userId,param.getRepairId(),RepairStatusEnum.TO_BE_SHIPPED.status(), "付款登记");
+        }
 
     }
 

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

@@ -93,7 +93,12 @@ public class RepairServiceImpl extends ServiceImpl<IRepairMapper, Repair> implem
             }
         }
         if(orderSn.contains("se_c")){
-            repairLogService.saveBySysUser(null,repairPay.getRepairId(), RepairStatusEnum.TO_BE_CANCELED_RECOVERED.status(),"取消维修支付成功");
+            List<RepairRegisterPartVo> partVoList = repairSupplyService.partInfo(repairPay.getRepairId(), 1);
+            if(partVoList.size() >0){
+                repairLogService.saveBySysUser(null,repairPay.getRepairId(), RepairStatusEnum.TO_BE_CANCELED_RECOVERED.status(),"取消维修支付成功");
+            }else {
+                repairLogService.saveBySysUser(null,repairPay.getRepairId(), RepairStatusEnum.TO_BE_SHIPPED.status(),"取消维修支付成功");
+            }
         }
     }