1

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

@@ -92,4 +92,6 @@ public class RepairPay implements Serializable {
     @TableField("sys_user_id")
     private Long sysUserId;
 
+    @TableField("remark")
+    private String remark;
 }

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

@@ -174,7 +174,9 @@ public class RepairInfoService {
                 case 90:
                     RepairCheckAccount repairCheckAccount = repairCheckAccountService.getByRepairId(repairId);
                     repairLogVo.setImagesInfo(repairCheckAccount.getCheckAccountImg());
-                    repairLogVo.setRemark("备注："+repairCheckAccount.getRemark());
+                    if(StringUtils.isNotBlank(repairCheckAccount.getRemark())){
+                        repairLogVo.setRemark("备注："+repairCheckAccount.getRemark());
+                    }
                     break;
                 case 110 :  //维修完毕
                     CustomerAddress customerAddress = customerAddressService.getByRepairId(repairId);

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

@@ -312,6 +312,7 @@ public class RepairSaleService {
         repairPay.setPayTime(DateUtil.getDate());
         repairPay.setOrderType(orderType);
         repairPay.setOrderSn(orderSn);
+        repairPay.setRemark(param.getRemark());
         repairPayService.save(repairPay);
 
 

src/main/java/com/fdkankan/sale/vo/request/PayRegisterParam.java

@@ -11,4 +11,5 @@ public class PayRegisterParam {
 
     private String trackingNum;
     private Integer getType;
+    private String remark;
 }