|
@@ -101,8 +101,6 @@ public class FinanceRecordController extends BaseController {
|
|
|
|
|
|
|
|
//正整数正则
|
|
//正整数正则
|
|
|
private static final String REGEX = "^[0-9]*[1-9][0-9]*$";
|
|
private static final String REGEX = "^[0-9]*[1-9][0-9]*$";
|
|
|
- //金额
|
|
|
|
|
- private static final String AMOUNT = "10000";
|
|
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
* 查询融资管理列表
|
|
* 查询融资管理列表
|
|
@@ -144,18 +142,6 @@ public class FinanceRecordController extends BaseController {
|
|
|
map.put("zfrRate", zfrValue);
|
|
map.put("zfrRate", zfrValue);
|
|
|
}
|
|
}
|
|
|
IPage<Map> list = financeRecordService.selectFinanceRecordList(map, request);
|
|
IPage<Map> list = financeRecordService.selectFinanceRecordList(map, request);
|
|
|
- List listAll = list.getRecords();
|
|
|
|
|
- for (int j = 0; j < listAll.size(); j++) {
|
|
|
|
|
- Map<String,String> m = (Map<String, String>) listAll.get(j);
|
|
|
|
|
- //融资金额
|
|
|
|
|
- String zfrAmount = m.get("zfrAmount");
|
|
|
|
|
- zfrAmount = AmtUtil.divide(zfrAmount,AMOUNT,2);
|
|
|
|
|
- //实际放款金额
|
|
|
|
|
- String zfrLoanAmount = m.get("zfrLoanAmount");
|
|
|
|
|
- zfrLoanAmount = AmtUtil.divide(zfrLoanAmount,AMOUNT,2);
|
|
|
|
|
- m.put("zfrAmount",zfrAmount);
|
|
|
|
|
- m.put("zfrLoanAmount",zfrLoanAmount);
|
|
|
|
|
- }
|
|
|
|
|
return R.ok(list);
|
|
return R.ok(list);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -200,8 +186,7 @@ public class FinanceRecordController extends BaseController {
|
|
|
zfpcrChargeRate = AmtUtil.divide(zfpcrChargeRate,"100",4);
|
|
zfpcrChargeRate = AmtUtil.divide(zfpcrChargeRate,"100",4);
|
|
|
needPay = AmtUtil.multiply(zfrAmount,zfpcrChargeRate,2);
|
|
needPay = AmtUtil.multiply(zfrAmount,zfpcrChargeRate,2);
|
|
|
}
|
|
}
|
|
|
- map.put("needPay",AmtUtil.multiply(needPay,AMOUNT,2));
|
|
|
|
|
- map.put("zfrAmount",AmtUtil.divide(zfrAmount,AMOUNT,2));
|
|
|
|
|
|
|
+ map.put("needPay",needPay);
|
|
|
return AjaxResult.success(map);
|
|
return AjaxResult.success(map);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -240,7 +225,6 @@ public class FinanceRecordController extends BaseController {
|
|
|
String zfrFinanceId = CommonUtil.objToString(map.get("zfrFinanceId"));
|
|
String zfrFinanceId = CommonUtil.objToString(map.get("zfrFinanceId"));
|
|
|
//融资金额
|
|
//融资金额
|
|
|
String zfrAmount = CommonUtil.objToString(map.get("zfrAmount"));
|
|
String zfrAmount = CommonUtil.objToString(map.get("zfrAmount"));
|
|
|
- zfrAmount = AmtUtil.multiply(zfrAmount,AMOUNT,2);
|
|
|
|
|
//融资收款账号
|
|
//融资收款账号
|
|
|
String zfrCollectionAccount = CommonUtil.objToString(map.get("zfrCollectionAccount"));
|
|
String zfrCollectionAccount = CommonUtil.objToString(map.get("zfrCollectionAccount"));
|
|
|
//融资利率
|
|
//融资利率
|
|
@@ -394,10 +378,8 @@ public class FinanceRecordController extends BaseController {
|
|
|
String userId = user.getUserId() + "";
|
|
String userId = user.getUserId() + "";
|
|
|
//放款金额
|
|
//放款金额
|
|
|
String zfrLoanAmount = CommonUtil.objToString(map.get("zfrLoanAmount"));
|
|
String zfrLoanAmount = CommonUtil.objToString(map.get("zfrLoanAmount"));
|
|
|
- zfrLoanAmount = AmtUtil.multiply(zfrLoanAmount,AMOUNT,2);
|
|
|
|
|
//融资金额
|
|
//融资金额
|
|
|
String zfrAmount = CommonUtil.objToString(map.get("zfrAmount"));
|
|
String zfrAmount = CommonUtil.objToString(map.get("zfrAmount"));
|
|
|
- zfrAmount = AmtUtil.multiply(zfrAmount,AMOUNT,2);
|
|
|
|
|
//融信id
|
|
//融信id
|
|
|
String zfrFinanceId = CommonUtil.objToString(map.get("zfrFinanceId"));
|
|
String zfrFinanceId = CommonUtil.objToString(map.get("zfrFinanceId"));
|
|
|
//授信额度
|
|
//授信额度
|
|
@@ -478,10 +460,6 @@ public class FinanceRecordController extends BaseController {
|
|
|
map.put("billIdList",CommonUtil.listToStr4InSql(billIdList));
|
|
map.put("billIdList",CommonUtil.listToStr4InSql(billIdList));
|
|
|
}
|
|
}
|
|
|
List<Map> list = financeRecordService.selectBillInfList(map);
|
|
List<Map> list = financeRecordService.selectBillInfList(map);
|
|
|
- for (Map map1 : list){
|
|
|
|
|
- String zbiAmount = CommonUtil.objToString(map1.get("zbiAmount"));
|
|
|
|
|
- map1.put("zbiAmount",AmtUtil.divide(zbiAmount,AMOUNT,2));
|
|
|
|
|
- }
|
|
|
|
|
return AjaxResult.success(list);
|
|
return AjaxResult.success(list);
|
|
|
}
|
|
}
|
|
|
|
|
|