维修支付流程图

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

@@ -89,12 +89,12 @@ public class RepairCustomerService {
 
             if(robAmount.compareTo(BigDecimal.ZERO) <=0  || StatusUtil.getWarranty(repair.getWarrantyType())){
                 if(partVoList.size() >0){
-                    repairLogService.saveBySysUser(param.getUserId(),repair.getRepairId(),RepairStatusEnum.TO_BE_CANCELED_RECOVERED.status(),repair.getStatus(),"取消维修",param.getRemark());
+                    repairLogService.saveBySysUser(param.getUserId(),repair.getRepairId(),RepairStatusEnum.TO_BE_CANCELED_RECOVERED.status(),repair.getStatus(),"取消维修","取消维修备注："+param.getRemark());
                 }else {
-                    repairLogService.saveBySysUser(param.getUserId(),repair.getRepairId(),RepairStatusEnum.TO_BE_SHIPPED.status(),repair.getStatus(),"取消维修",param.getRemark());
+                    repairLogService.saveBySysUser(param.getUserId(),repair.getRepairId(),RepairStatusEnum.TO_BE_SHIPPED.status(),repair.getStatus(),"取消维修","取消维修备注："+param.getRemark());
                 }
             } else {
-                repairLogService.saveBySysUser(param.getUserId(),repair.getRepairId(),RepairStatusEnum.TO_BE_CANCELED.status(),repair.getStatus(),"取消维修",param.getRemark());
+                repairLogService.saveBySysUser(param.getUserId(),repair.getRepairId(),RepairStatusEnum.TO_BE_CANCELED.status(),repair.getStatus(),"取消维修","取消维修备注："+param.getRemark());
             }
 
         }

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

@@ -159,6 +159,12 @@ public class RepairInfoService {
                     }
 
                     break;
+                case 90:
+                    RepairPay repairPay = repairPayService.getByRepairId(repairId,1);
+                    if(repairPay != null){
+                        repairLogVo.setRemark("支付方式："+StatusUtil.getPayTypeStr(repairPay.getPayType()));
+                    }
+                    break;
                 case 110 :  //维修完毕
                     CustomerAddress customerAddress = customerAddressService.getByRepairId(repairId);
                     repairLogVo.setCustomerAddress(customerAddress);

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

@@ -164,6 +164,6 @@ public class RepairSupplyService {
             partService.recovery(partVo.getPartId(),partVo.getPartCount(),userId,repair.getRepairId(),repair.getStatus());
         }
 
-        repairLogService.saveBySysUser(userId,param.getRepairId(),RepairStatusEnum.TO_BE_SHIPPED.status(),repair.getStatus(),"备件回收",param.getRemark());
+        repairLogService.saveBySysUser(userId,param.getRepairId(),RepairStatusEnum.TO_BE_SHIPPED.status(),repair.getStatus(),"备件回收","回收备注："+param.getRemark());
     }
 }

src/main/java/com/fdkankan/sale/util/StatusUtil.java

@@ -156,4 +156,15 @@ public class StatusUtil {
         }
         return  false;
     }
+
+    //0银行转账，1微信，2支付宝
+    public static String getPayTypeStr(Integer payType) {
+
+        switch (payType){
+            case 0: return "银行转账";
+            case 1: return "微信支付";
+            case 2: return "支付宝支付";
+        }
+        return null;
+    }
 }