融资产品bug代码优化

sc-service/src/main/java/com/huyi/service/financeProduct/controller/FinanceProductControllers.java

@@ -173,6 +173,7 @@ public class FinanceProductControllers extends BaseController {
         //校验产品名称是否重复
         LambdaQueryWrapper<ZcFinanceProduct> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.eq(ZcFinanceProduct::getZfpName,zfpName);
+        lambdaQueryWrapper.ne(ZcFinanceProduct::getZfpStatus,"02");
         List<ZcFinanceProduct> list = zcFinanceProductService.findZcFinanceProducts(lambdaQueryWrapper);
         if(list.size()>0){
             return AjaxResult.error("融资产品已存在");
@@ -250,6 +251,9 @@ public class FinanceProductControllers extends BaseController {
                 return AjaxResult.error("请输入正确的资方融资费率");
             }
         }
+        if(Integer.valueOf(zfpRate) > 100){
+            return AjaxResult.error("请输入0-100之内的数字");
+        }
         //资方是否支持返佣
         String zfpProfit = CommonUtil.objToString(map.get("zfpProfit"));
         //资方返佣方式
@@ -258,9 +262,12 @@ public class FinanceProductControllers extends BaseController {
         String zfpProfitRate = CommonUtil.objToString(map.get("zfpProfitRate"));
         if(CommonUtil.isNotEmpty(zfpProfitRate)){
             if(!Pattern.matches(REGEX,zfpProfitRate)){
-                return AjaxResult.error("请输入正确的融资返佣费率");
+                return AjaxResult.error("请输入正确的资方返佣费率");
             }
         }
+        if(Integer.valueOf(zfpProfitRate) > 100){
+            return AjaxResult.error("请输入0-100之内的数字");
+        }
         //是否需平台审批
         String zfpPlatform = CommonUtil.objToString(map.get("zfpPlatform"));
         //主键
@@ -354,6 +361,7 @@ public class FinanceProductControllers extends BaseController {
         LambdaQueryWrapper<ZcFinanceProduct> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.eq(ZcFinanceProduct::getZfpName,zfpName);
         lambdaQueryWrapper.ne(ZcFinanceProduct::getZfpId,zfpId);
+        lambdaQueryWrapper.ne(ZcFinanceProduct::getZfpStatus,"02");
         List<ZcFinanceProduct> list = zcFinanceProductService.findZcFinanceProducts(lambdaQueryWrapper);
         if(list.size()>0){
             return AjaxResult.error("融资产品已存在");
@@ -366,7 +374,7 @@ public class FinanceProductControllers extends BaseController {
         //是否可拆转融
         String zfpSplit = CommonUtil.objToString(map.get("zfpSplit"));
         if(CommonUtil.isEmpty(zfpSplit)){
-            return AjaxResult.error("请选择是否可拆转融（二期处理）");
+            return AjaxResult.error("请选择是否可拆转融");
         }
         //产品类型
         String zfpType = CommonUtil.objToString(map.get("zfpType"));
@@ -431,6 +439,9 @@ public class FinanceProductControllers extends BaseController {
                 return AjaxResult.error("请输入正确的资方融资费率");
             }
         }
+        if(Integer.valueOf(zfpRate) > 100){
+            return AjaxResult.error("请输入0-100之内的数字");
+        }
         //资方是否支持返佣
         String zfpProfit = CommonUtil.objToString(map.get("zfpProfit"));
         //资方返佣方式
@@ -442,6 +453,9 @@ public class FinanceProductControllers extends BaseController {
                 return AjaxResult.error("请输入正确的资方返佣费率");
             }
         }
+        if(Integer.valueOf(zfpProfitRate) > 100){
+            return AjaxResult.error("请输入0-100之内的数字");
+        }
         //是否需平台审批
         String zfpPlatform = CommonUtil.objToString(map.get("zfpPlatform"));
 

sc-service/src/main/resources/mapper/repayment/OwnRepaymentMapper.xml

@@ -5,6 +5,10 @@
     <select id="selectRepaymentList" parameterType="map" resultType="map">
         select
             r.zfr_id 'zfrId',
+            r.zfr_number 'zfrNumber',
+            r.zfr_apply_date 'zfrApplyDate',
+            r.zfr_loan_date 'zfrLoanDate',
+            r.zfr_handler 'zfrHandler',
             i.zfi_number 'zfiNumber',
             i.zfi_core_id 'zfiCoreId',
             i.zfi_payment_number 'zfiPaymentNumber',