|
|
@@ -13,7 +13,6 @@ import com.huyi.service.base.service.IZcFinanceProductService;
|
|
|
import com.huyi.service.financeProduct.service.IOwnFinanceProductService;
|
|
|
import com.keao.tianhu.starter.mybatis.plus.entity.QueryRequest;
|
|
|
import com.tianhu.common.core.constant.SalaryConstants;
|
|
|
-import com.tianhu.common.core.utils.AmtUtil;
|
|
|
import com.tianhu.common.core.utils.CommonUtil;
|
|
|
import com.tianhu.common.core.utils.DateUtils;
|
|
|
import com.tianhu.common.core.utils.IdUtils;
|
|
|
@@ -102,13 +101,13 @@ public class FinanceProductControllers extends BaseController {
|
|
|
map.put("end",CommonUtil.objToBigDecimal(end));
|
|
|
}
|
|
|
IPage<Map> list = ownFinanceProductService.selectFinanceProductList(map,request);
|
|
|
- //转换最小融资金额单位为万元
|
|
|
- List resList = list.getRecords();
|
|
|
- for(int i = 0;i<resList.size();i++){
|
|
|
- Map<String,String> res = (Map<String,String>)resList.get(i);
|
|
|
- String zfpMinimumAmount = AmtUtil.divide(res.get("zfpMinimumAmount"),"10000");
|
|
|
- res.put("zfpMinimumAmount",zfpMinimumAmount);
|
|
|
- }
|
|
|
+// //转换最小融资金额单位为万元
|
|
|
+// List resList = list.getRecords();
|
|
|
+// for(int i = 0;i<resList.size();i++){
|
|
|
+// Map<String,String> res = (Map<String,String>)resList.get(i);
|
|
|
+// String zfpMinimumAmount = AmtUtil.divide(res.get("zfpMinimumAmount"),"10000");
|
|
|
+// res.put("zfpMinimumAmount",zfpMinimumAmount);
|
|
|
+// }
|
|
|
return AjaxResult.success(list);
|
|
|
}
|
|
|
|
|
|
@@ -126,9 +125,9 @@ public class FinanceProductControllers extends BaseController {
|
|
|
//查询用户名称
|
|
|
Map resultMap = ownFinanceProductService.selectUserName(map);
|
|
|
ZcFinanceProduct zcFinanceProduct = zcFinanceProductService.getById(zfpId);
|
|
|
- //转换最小融资金额单位为万元
|
|
|
- String zfpMinimumAmount = AmtUtil.divide(CommonUtil.objToString(zcFinanceProduct.getZfpMinimumAmount()),"10000");
|
|
|
- zcFinanceProduct.setZfpMinimumAmount(zfpMinimumAmount);
|
|
|
+// //转换最小融资金额单位为万元
|
|
|
+// String zfpMinimumAmount = AmtUtil.divide(CommonUtil.objToString(zcFinanceProduct.getZfpMinimumAmount()),"10000");
|
|
|
+// zcFinanceProduct.setZfpMinimumAmount(zfpMinimumAmount);
|
|
|
resultMap.put("zcFinanceProduct",zcFinanceProduct);
|
|
|
//查询融资产品关联合同
|
|
|
LambdaQueryWrapper<ZcFinanceProConRel> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
@@ -194,7 +193,7 @@ public class FinanceProductControllers extends BaseController {
|
|
|
}
|
|
|
//最小融资金额
|
|
|
String zfpMinimumAmount = CommonUtil.objToString(map.get("zfpMinimumAmount"));
|
|
|
- String minAmount = AmtUtil.multiply(zfpMinimumAmount,"10000");
|
|
|
+// String minAmount = AmtUtil.multiply(zfpMinimumAmount,"10000");
|
|
|
if(CommonUtil.isEmpty(zfpMinimumAmount)){
|
|
|
return AjaxResult.error("最小融资金额不能为空");
|
|
|
}
|
|
|
@@ -299,7 +298,7 @@ public class FinanceProductControllers extends BaseController {
|
|
|
zcFinanceProduct.setZfpStatus("01");
|
|
|
zcFinanceProduct.setZfpManagementId(zfpManagementId);
|
|
|
zcFinanceProduct.setZfpSplit(zfpSplit);
|
|
|
- zcFinanceProduct.setZfpMinimumAmount(minAmount);
|
|
|
+ zcFinanceProduct.setZfpMinimumAmount(zfpMinimumAmount);
|
|
|
zcFinanceProduct.setZfpShortestPeriod(zfpShortestPeriod);
|
|
|
zcFinanceProduct.setZfpCharge(zfpCharge);
|
|
|
zcFinanceProduct.setZfpRecourse(zfpRecourse);
|
|
|
@@ -370,7 +369,7 @@ public class FinanceProductControllers extends BaseController {
|
|
|
String zfpAuthType = CommonUtil.objToString(map.get("zfpAuthType"));
|
|
|
//最小融资金额
|
|
|
String zfpMinimumAmount = CommonUtil.objToString(map.get("zfpMinimumAmount"));
|
|
|
- String minAmount = AmtUtil.multiply(zfpMinimumAmount,"10000");
|
|
|
+// String minAmount = AmtUtil.multiply(zfpMinimumAmount,"10000");
|
|
|
if(CommonUtil.isEmpty(zfpMinimumAmount)){
|
|
|
return AjaxResult.error("最小融资金额不能为空");
|
|
|
}
|