bug修复

performance-api/src/main/java/com/clx/performance/enums/PerformanceResultEnum.java

@@ -44,6 +44,8 @@ public enum PerformanceResultEnum implements ResultEnum {
     ORDER_CHILD_CANCELED(1303, "运单状态已取消"),
     ORDER_CHILD_COMPLETE(1304, "运单状态已完成"),
     ORDER_CHILD_OPERATION_FORBID(1305, "没有权限操作"),
+    ORDER_CHILD_LOAD_NET_ERROR(1306, "净重不能大于99吨"),
+    ORDER_CHILD_TRACE_GT_ROUGH(1306, "皮重不能大于毛重"),
 
     ORDER_CHILD_SAVE_FAIL(1321, "接单失败,请稍后再试"),
     ORDER_CHILD_SAVE_FREQUENCY_ERROR(1322, "请误频繁点击"),
@@ -111,8 +113,8 @@ public enum PerformanceResultEnum implements ResultEnum {
     PASSWORD_RESET_IS_FAIL(1909, "重置密码出现异常"),
     PASSWORD_CHECK_FAIL(1910, "交易密码填写错误,请重新输入"),
     SLIDER_CHECK_FAIL(1911, "滑块验证错误"),
-    ORDER_CHILD_SYNC_ERROR(1912, "承运同步网络货运异常"),
 
+    ORDER_CHILD_SYNC_ERROR(2001, "承运同步网络货运异常"),
     BORROWER_NAME_EXIST(1701, "数据重复，请核实后重新提交"),
     BORROWER_DELETE_ENABLE_ERROR(1702, "无法删除启用数据"),
     BORROWER_CONFIG_BORROWER_ID_EXIST(1703, "数据重复，请核实后重新提交"),
@@ -127,6 +129,13 @@ public enum PerformanceResultEnum implements ResultEnum {
     NB_BANK_PAY_TYPE_ERROR(1802, "支付方式不支持"),
     NB_BANK_ORDER_PAY_ERROR(1803, "宁波银行订单支付失败"),
 
+    PLATFORM_ACCOUNT_CONFIG_ONLY(1913, "当前配置已存在"),
+    PLATFORM_ACCOUNT_CONFIG_WITHDRAWAL_IS_NULL(1914, "提现平台账户未配置"),
+    PLATFORM_ACCOUNT_CONFIG_WITHDRAWAL_MANY(1915, "提现平台账户配置不唯一"),
+    PLATFORM_ACCOUNT_CONFIG_RECHARGE_IS_NULL(1916, "充值平台账户未配置"),
+    PLATFORM_ACCOUNT_CONFIG_RECHARGE_MANY(1917, "充值平台账户配置不唯一"),
+    PLATFORM_ACCOUNT_CONFIG_IS_NULL(1918, "平台账户未配置"),
+    PLATFORM_ACCOUNT_CONFIG_MANY(1919, "平台账户配置不唯一"),
     GET_LOAN_RECORD(1901, "货主借款失败"),
     OWNER_ACCOUNT_ERROR(1902, "货主货款不足"),
 
@@ -137,6 +146,7 @@ public enum PerformanceResultEnum implements ResultEnum {
     OWNER_LOAN_RECORD_PAY_WAIT_ERROR(1853,"当前借款单状态不是待付款"),
     OWNER_LOAN_PAYMENT_STATUS_ERROR(1854, "执行借款审批失败,请稍后重试"),
     OWNER_LOAN_PAY_STATUS_ERROR(1855, "付款失败"),
+    DATA_STATUS_ERROR(1856, "当前状态有误")
 
     ;
     private final int code;

performance-web/src/main/java/com/clx/performance/controller/pc/loan/carrier/CarrierOwnerPaymentController.java

@@ -15,6 +15,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
 @Slf4j
@@ -52,5 +53,12 @@ public class CarrierOwnerPaymentController {
         return Result.ok();
     }
 
+    @ApiOperation(value = "借款重新支付(只更改借款状态)",notes = "<br>By:胡宇帆")
+    @GetMapping("/ownerPaymentRetryPay")
+    public Result<Object> ownerPaymentRetryPay(@RequestParam(value = "id") @NotBlank Integer id) {
+        ownerPaymentService.ownerPaymentRetryPay(id);
+        return Result.ok();
+    }
+
 
 }

performance-web/src/main/java/com/clx/performance/service/impl/loan/OwnerPaymentServiceImpl.java

@@ -92,4 +92,13 @@ public class OwnerPaymentServiceImpl implements OwnerPaymentService {
         ownerPaymentDao.updateStatusAndMerchantRunningWaterNo(ownerPayment);
 
     }
+
+    @Override
+    public void ownerPaymentRetryPay(Integer id) {
+        OwnerPayment ownerPayment = ownerPaymentDao.getEntityByKey(id).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+        if (!OwnerPaymentEnum.Status.PAY_FAIL.getCode().equals(ownerPayment.getStatus())) {
+            throw new ServiceSystemException(PerformanceResultEnum.DATA_STATUS_ERROR);
+        }
+        ownerPaymentDao.updatePayStatus(id, OwnerPaymentEnum.Status.PAY_WAIT.getCode());
+    }
 }

performance-web/src/main/java/com/clx/performance/service/loan/OwnerPaymentService.java

@@ -16,4 +16,6 @@ public interface OwnerPaymentService {
     CarrierOwnerPaymentVO getOwnerPaymentDetail(Integer id);
 
     void pay(Integer id);
+
+    void ownerPaymentRetryPay(Integer id);
 }