|
@@ -277,12 +277,20 @@ public class RepairSaleService {
|
|
repairPay.setPayAmount(payAmount);
|
|
repairPay.setPayAmount(payAmount);
|
|
repairPay.setPayTime(DateUtil.getDate());
|
|
repairPay.setPayTime(DateUtil.getDate());
|
|
repairPay.setOrderType(0);
|
|
repairPay.setOrderType(0);
|
|
- repairPay.setOrderSn("se_s"+DateUtil.getDate(DateUtil.repairIdFmt));
|
|
|
|
|
|
+ if(repair.getCancelStatus() == 1){
|
|
|
|
+ repairPay.setOrderSn("se_c"+DateUtil.getDate(DateUtil.repairIdFmt));
|
|
|
|
+ }else {
|
|
|
|
+ repairPay.setOrderSn("se_s"+DateUtil.getDate(DateUtil.repairIdFmt));
|
|
|
|
+ }
|
|
repairPayService.save(repairPay);
|
|
repairPayService.save(repairPay);
|
|
|
|
|
|
List<RepairRegisterPartVo> partVoList = repairSupplyService.partInfo(repairPay.getRepairId(), 1);
|
|
List<RepairRegisterPartVo> partVoList = repairSupplyService.partInfo(repairPay.getRepairId(), 1);
|
|
if(partVoList.size() >0){
|
|
if(partVoList.size() >0){
|
|
- repairLogService.saveBySysUser(userId,param.getRepairId(),RepairStatusEnum.TO_BE_RECOVERED.status(), "付款登记");
|
|
|
|
|
|
+ if(repair.getCancelStatus() == 1){
|
|
|
|
+ repairLogService.saveBySysUser(userId,param.getRepairId(),RepairStatusEnum.TO_BE_CANCELED_RECOVERED.status(), "付款登记");
|
|
|
|
+ }else {
|
|
|
|
+ repairLogService.saveBySysUser(userId,param.getRepairId(),RepairStatusEnum.TO_BE_RECOVERED.status(), "付款登记");
|
|
|
|
+ }
|
|
}else {
|
|
}else {
|
|
repairLogService.saveBySysUser(userId,param.getRepairId(),RepairStatusEnum.TO_BE_SHIPPED.status(), "付款登记");
|
|
repairLogService.saveBySysUser(userId,param.getRepairId(),RepairStatusEnum.TO_BE_SHIPPED.status(), "付款登记");
|
|
}
|
|
}
|