Skip to content

Y
yifu-mvp
Commit da250fa7 authored by fangxinjiang's avatar fangxinjiang
Browse files
Options

Merge remote-tracking branch 'origin/develop' into develop

parents 69a8b8c0 71d4fcb3
Expand all Show whitespace changes
Inline Side-by-side
Showing with 272 additions and 249 deletions
yifu-auth/src/main/resources/application.yml
View file @ da250fa7
...@@ -47,10 +47,6 @@ security: ...@@ -47,10 +47,6 @@ security:
- /v3/api-docs - /v3/api-docs
- /actuator/** - /actuator/**
- /swagger-ui/** - /swagger-ui/**
- /**/insuranceDetail/updateInsuranceSettle
- /**/insuranceDetail/urgentUpdateIsUse
- /insuranceDetail/urgentUpdateIsUse
- /insuranceDetail/updateInsuranceSettle
# Spring 相关 # Spring 相关
......
yifu-common/yifu-common-core/src/main/java/com/yifu.cloud.plus.v1/yifu/common/core/constant/CommonConstants.java
View file @ da250fa7
...@@ -328,6 +328,8 @@ public interface CommonConstants { ...@@ -328,6 +328,8 @@ public interface CommonConstants {
String PARAM_IS_NOT_ERROR = "传参异常，请检查参数"; String PARAM_IS_NOT_ERROR = "传参异常，请检查参数";
int EXCEL_EXPORT_LIMIT = 60000; int EXCEL_EXPORT_LIMIT = 60000;
String USER = "用户";
/** /**
* multipart/form-data * multipart/form-data
* @Author fxj * @Author fxj
......
yifu-common/yifu-common-core/src/main/java/com/yifu.cloud.plus.v1/yifu/common/core/constant/ValidityConstants.java
View file @ da250fa7
...@@ -69,6 +69,8 @@ public class ValidityConstants { ...@@ -69,6 +69,8 @@ public class ValidityConstants {
/** 最多200位 规则 */ /** 最多200位 规则 */
public static final String PATTERN_200 = "[\\s\\S]{1,200}$"; public static final String PATTERN_200 = "[\\s\\S]{1,200}$";
public static String NUMBER_OF_DECIMAL_PLACE= "^[1-9]\\d*\\.\\d*|0\\.\\d*[1-9]\\d*$";
/** 不超过两位小数的正数 */ /** 不超过两位小数的正数 */
public static final String POSITIVE_INTEGER_PATTERN_TWO_FLOAT = "^[+]?([0-9]+(.[0-9]{1,2})?)$"; public static final String POSITIVE_INTEGER_PATTERN_TWO_FLOAT = "^[+]?([0-9]+(.[0-9]{1,2})?)$";
/** 身份证规则(x只能大写) */ /** 身份证规则(x只能大写) */
......
yifu-common/yifu-common-ekp/src/main/java/com/yifu.cloud.plus.v1/yifu/ekp/util/EkpInsuranceUtil.java
View file @ da250fa7
...@@ -38,28 +38,19 @@ public class EkpInsuranceUtil { ...@@ -38,28 +38,19 @@ public class EkpInsuranceUtil {
* 注意key的书写格式,类似EL表达式的方式，属性关系用'.', 列表和数组关系用[]，Map关系用["xxx"] * 注意key的书写格式,类似EL表达式的方式，属性关系用'.', 列表和数组关系用[]，Map关系用["xxx"]
*/ */
public String sendToEkp(EkpInteractiveParam param){ public String sendToEkp(EkpInteractiveParam param){
log.info("推送EKP开始");
RestTemplate yourRestTemplate = new RestTemplate(); RestTemplate yourRestTemplate = new RestTemplate();
EKPInsurancePushParam pushParam = insuranceDetail2PushParam(param); EKPInsurancePushParam pushParam = insuranceDetail2PushParam(param);
try{ try{
String formValues = new ObjectMapper().writeValueAsString(pushParam); String formValues = new ObjectMapper().writeValueAsString(pushParam);
log.info("formValues:"+formValues);
//指向EKP的接口url //指向EKP的接口url
//把ModelingAppModelParameterAddForm转换成MultiValueMap //把ModelingAppModelParameterAddForm转换成MultiValueMap
JSONObject loginName = new JSONObject();
loginName.append("LoginName",ekpInsuranceProperties.getInsuranceLoginName());
String loginData = new ObjectMapper().writeValueAsString(loginName);
MultiValueMap<String,Object> wholeForm = new LinkedMultiValueMap<>(); MultiValueMap<String,Object> wholeForm = new LinkedMultiValueMap<>();
//wholeForm.add("docSubject", new String(docSubject.getBytes("UTF-8"),"ISO-8859-1") );
wholeForm.add("docSubject",ekpInsuranceProperties.getInsuranceFocSubject()); wholeForm.add("docSubject",ekpInsuranceProperties.getInsuranceFocSubject());
wholeForm.add("docCreator", "{\"LoginName\":\"admin\"}"); wholeForm.add("docCreator", "{\"LoginName\":\"admin\"}");
//wholeForm.add("docCreator", loginData);
wholeForm.add("docStatus", ekpInsuranceProperties.getInsuranceDocStatus()); wholeForm.add("docStatus", ekpInsuranceProperties.getInsuranceDocStatus());
wholeForm.add("fdModelId", ekpInsuranceProperties.getInsuranceFdModelId()); wholeForm.add("fdModelId", ekpInsuranceProperties.getInsuranceFdModelId());
wholeForm.add("fdFlowId", ekpInsuranceProperties.getInsuranceFdFlowId()); wholeForm.add("fdFlowId", ekpInsuranceProperties.getInsuranceFdFlowId());
//wholeForm.add("formValues", new String(formValues.getBytes("UTF-8"),"ISO-8859-1"));
wholeForm.add("formValues", formValues); wholeForm.add("formValues", formValues);
//wholeForm.add("formValues", new String("{\"fd_3adfe6af71a1cc\":\"王五\", \"fd_3adfe658c6229e\":\"2019-03-26\", \"fd_3adfe6592b4158\":\"这里内容\"}".getBytes("UTF-8"),"ISO-8859-1") );
HttpHeaders headers = new HttpHeaders(); HttpHeaders headers = new HttpHeaders();
//如果EKP对该接口启用了Basic认证，那么客户端需要加入 //如果EKP对该接口启用了Basic认证，那么客户端需要加入
//addAuth(headers,"yourAccount"+":"+"yourPassword");是VO，则使用APPLICATION_JSON //addAuth(headers,"yourAccount"+":"+"yourPassword");是VO，则使用APPLICATION_JSON
...@@ -67,14 +58,14 @@ public class EkpInsuranceUtil { ...@@ -67,14 +58,14 @@ public class EkpInsuranceUtil {
//必须设置上传类型，如果入参是字符串，使用MediaType.TEXT_PLAIN；如果 //必须设置上传类型，如果入参是字符串，使用MediaType.TEXT_PLAIN；如果
HttpEntity<MultiValueMap<String,Object>> entity = new HttpEntity<MultiValueMap<String,Object>>(wholeForm,headers); HttpEntity<MultiValueMap<String,Object>> entity = new HttpEntity<MultiValueMap<String,Object>>(wholeForm,headers);
//有返回值的情况 VO可以替换成具体的JavaBean //有返回值的情况 VO可以替换成具体的JavaBean
log.info("推送EKP开始,formValues:"+formValues);
ResponseEntity<String> obj = yourRestTemplate.exchange(ekpInsuranceProperties.getInsuranceUrl(), HttpMethod.POST, entity, String.class); ResponseEntity<String> obj = yourRestTemplate.exchange(ekpInsuranceProperties.getInsuranceUrl(), HttpMethod.POST, entity, String.class);
log.info("obj:"+obj);
String body = obj.getBody(); String body = obj.getBody();
if (StringUtils.isBlank(body)){ if (StringUtils.isBlank(body)){
log.error("交易失败"+body); log.error("交易失败:"+obj);
return null; return null;
}else{ }else{
log.info("交易成功："+body); log.info("交易成功："+obj);
return body; return body;
} }
}catch (Exception e){ }catch (Exception e){
......
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/constants/InsurancesConstants.java
View file @ da250fa7
...@@ -1096,6 +1096,26 @@ public class InsurancesConstants { ...@@ -1096,6 +1096,26 @@ public class InsurancesConstants {
*/ */
public static final String SETTLE_ID_ATYPISM = "结算id不一致"; public static final String SETTLE_ID_ATYPISM = "结算id不一致";
/**
* 获取项目信息失败
*/
public static final String GET_DEPT_DETAIL_ERROR = "获取项目信息失败:";
/**
* 获取项目信息失败
*/
public static final String ERROR_LIST = "errorList";
/**
* 获取项目信息失败
*/
public static final String SUCCESS_LIST = "successList";
/**
* OSS文件上传接口异常：
*/
public static final String OSS_ERROR = "OSS文件上传接口异常：";
......
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/util/BigDecimalUtils.java
View file @ da250fa7
package com.yifu.cloud.plus.v1.yifu.insurances.util; package com.yifu.cloud.plus.v1.yifu.insurances.util;
import com.google.common.base.Optional; import com.google.common.base.Optional;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ValidityConstants;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.regex.Matcher; import java.util.regex.Matcher;
...@@ -13,7 +15,6 @@ import java.util.regex.Pattern; ...@@ -13,7 +15,6 @@ import java.util.regex.Pattern;
* @Description 提供精确的浮点数运算(包括加、减、乘、除、四舍五入)工具类 * @Description 提供精确的浮点数运算(包括加、减、乘、除、四舍五入)工具类
**/ **/
public class BigDecimalUtils { public class BigDecimalUtils {
static Pattern p= Pattern.compile("^[1-9]\\d*\\.\\d*|0\\.\\d*[1-9]\\d*$");
/** /**
* BigDecimal的加法运算封装 * BigDecimal的加法运算封装
* @author : shijing * @author : shijing
...@@ -50,7 +51,7 @@ public class BigDecimalUtils { ...@@ -50,7 +51,7 @@ public class BigDecimalUtils {
Integer r = b1; Integer r = b1;
if (null != bn) { if (null != bn) {
for (Integer b : bn) { for (Integer b : bn) {
r += Optional.fromNullable(b).or(0); r += Optional.fromNullable(b).or(CommonConstants.ZERO_INT);
} }
} }
return r > 0 ? r : 0; return r > 0 ? r : 0;
...@@ -87,7 +88,7 @@ public class BigDecimalUtils { ...@@ -87,7 +88,7 @@ public class BigDecimalUtils {
r = r.subtract((null == b ? BigDecimal.ZERO : b)); r = r.subtract((null == b ? BigDecimal.ZERO : b));
} }
} }
return isZero ? (r.compareTo(BigDecimal.ZERO) == -1 ? BigDecimal.ZERO : r) : r; return isZero ? (r.compareTo(BigDecimal.ZERO) == CommonConstants.ONE_INT_NEGATE ? BigDecimal.ZERO : r) : r;
} }
/** /**
...@@ -105,10 +106,10 @@ public class BigDecimalUtils { ...@@ -105,10 +106,10 @@ public class BigDecimalUtils {
Integer r = b1; Integer r = b1;
if (null != bn) { if (null != bn) {
for (Integer b : bn) { for (Integer b : bn) {
r -= Optional.fromNullable(b).or(0); r -= Optional.fromNullable(b).or(CommonConstants.ZERO_INT);
} }
} }
return null != r && r > 0 ? r : 0; return null != r && r > CommonConstants.ZERO_INT ? r : CommonConstants.ZERO_INT;
} }
/** /**
...@@ -151,7 +152,7 @@ public class BigDecimalUtils { ...@@ -151,7 +152,7 @@ public class BigDecimalUtils {
return defaultValue; return defaultValue;
} }
try { try {
return BigDecimal.valueOf(b1.doubleValue()).divide(BigDecimal.valueOf(b2.doubleValue()), 2, BigDecimal.ROUND_HALF_UP); return BigDecimal.valueOf(b1.doubleValue()).divide(BigDecimal.valueOf(b2.doubleValue()), CommonConstants.TWO_INT, BigDecimal.ROUND_HALF_UP);
} catch (Exception e) { } catch (Exception e) {
return defaultValue; return defaultValue;
} }
...@@ -190,7 +191,7 @@ public class BigDecimalUtils { ...@@ -190,7 +191,7 @@ public class BigDecimalUtils {
if (null == b1 || null == b2) { if (null == b1 || null == b2) {
return BigDecimal.ZERO; return BigDecimal.ZERO;
} }
return BigDecimal.valueOf(b1.doubleValue()).multiply(BigDecimal.valueOf(b2.doubleValue())).setScale(2, BigDecimal.ROUND_HALF_UP); return BigDecimal.valueOf(b1.doubleValue()).multiply(BigDecimal.valueOf(b2.doubleValue())).setScale( CommonConstants.TWO_INT, BigDecimal.ROUND_HALF_UP);
} }
public static <T extends Number> BigDecimal safeMultiply(T b1, T b2, T b3) { public static <T extends Number> BigDecimal safeMultiply(T b1, T b2, T b3) {
if (null == b1 || null == b2 || null == b3) { if (null == b1 || null == b2 || null == b3) {
...@@ -249,7 +250,7 @@ public class BigDecimalUtils { ...@@ -249,7 +250,7 @@ public class BigDecimalUtils {
if (null == bigDecimal){ if (null == bigDecimal){
return true; return true;
} }
if (bigDecimal.compareTo(BigDecimal.ZERO) == 0){ if (bigDecimal.compareTo(BigDecimal.ZERO) == CommonConstants.ZERO_INT){
return true; return true;
} }
return false; return false;
...@@ -265,7 +266,7 @@ public class BigDecimalUtils { ...@@ -265,7 +266,7 @@ public class BigDecimalUtils {
if (null == b1) { if (null == b1) {
return BigDecimal.ZERO; return BigDecimal.ZERO;
} }
return BigDecimal.valueOf(b1.doubleValue()).setScale(2, BigDecimal.ROUND_HALF_UP); return BigDecimal.valueOf(b1.doubleValue()).setScale(CommonConstants.TWO_INT, BigDecimal.ROUND_HALF_UP);
} }
/** /**
...@@ -274,16 +275,16 @@ public class BigDecimalUtils { ...@@ -274,16 +275,16 @@ public class BigDecimalUtils {
* @return * @return
*/ */
public static boolean isBigDecimal(String str){ public static boolean isBigDecimal(String str){
if(str==null || str.trim().length() == 0){ if(str==null || str.trim().length() == CommonConstants.ZERO_INT){
return false; return false;
} }
char[] chars = str.toCharArray(); char[] chars = str.toCharArray();
int sz = chars.length; int sz = chars.length;
int i = (chars[0] == '-') ? 1 : 0; int i = (chars[CommonConstants.ZERO_INT] == '-') ? CommonConstants.ONE_INT : CommonConstants.ZERO_INT;
if(i == sz){ if(i == sz){
return false; return false;
} }
if(chars[i] == '.'){ if(chars[i] == CommonConstants.SPOT_CHAR){
//除了负号，第一位不能为'小数点' //除了负号，第一位不能为'小数点'
return false; return false;
} }
...@@ -333,6 +334,7 @@ public class BigDecimalUtils { ...@@ -333,6 +334,7 @@ public class BigDecimalUtils {
* @return double * @return double
*/ */
public static BigDecimal getNumberOfDecimalPlace(String str, int point) { public static BigDecimal getNumberOfDecimalPlace(String str, int point) {
Pattern p= Pattern.compile(ValidityConstants.NUMBER_OF_DECIMAL_PLACE);
Matcher m=p.matcher(str); Matcher m=p.matcher(str);
boolean b=m.matches(); boolean b=m.matches();
if(b){ if(b){
......
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/util/ValidityUtil.java
View file @ da250fa7
...@@ -122,7 +122,7 @@ public class ValidityUtil { ...@@ -122,7 +122,7 @@ public class ValidityUtil {
* @param email 邮箱（电子邮件） * @param email 邮箱（电子邮件）
* @return boolean * @return boolean
*/ */
public static boolean validateEamil(final String email){ public static boolean validateEmail(final String email){
if(Common.isEmpty(email)){ if(Common.isEmpty(email)){
return Boolean.FALSE ; return Boolean.FALSE ;
} }
...@@ -169,11 +169,11 @@ public class ValidityUtil { ...@@ -169,11 +169,11 @@ public class ValidityUtil {
return Boolean.FALSE ; return Boolean.FALSE ;
} }
BigDecimal bigDecimalMoney= new BigDecimal(money); BigDecimal bigDecimalMoney= new BigDecimal(money);
boolean max = bigDecimalMoney.compareTo(CommonConstants.MONEY_MAX) >0; boolean max = bigDecimalMoney.compareTo(CommonConstants.MONEY_MAX) >CommonConstants.ZERO_INT;
if(max){ if(max){
return Boolean.FALSE ; return Boolean.FALSE ;
} }
boolean min = bigDecimalMoney.compareTo(CommonConstants.MONEY_MIN) <=0; boolean min = bigDecimalMoney.compareTo(CommonConstants.MONEY_MIN) <=CommonConstants.ZERO_INT;
if(min){ if(min){
return Boolean.FALSE ; return Boolean.FALSE ;
} }
...@@ -202,7 +202,7 @@ public class ValidityUtil { ...@@ -202,7 +202,7 @@ public class ValidityUtil {
*/ */
public static boolean validateMoneyMax(final String money) { public static boolean validateMoneyMax(final String money) {
BigDecimal bigDecimalMoney= new BigDecimal(money); BigDecimal bigDecimalMoney= new BigDecimal(money);
boolean max = bigDecimalMoney.compareTo(CommonConstants.MONEY_MAX) >0; boolean max = bigDecimalMoney.compareTo(CommonConstants.MONEY_MAX) >CommonConstants.ZERO_INT;
if(max){ if(max){
return Boolean.FALSE ; return Boolean.FALSE ;
} }
...@@ -345,7 +345,7 @@ public class ValidityUtil { ...@@ -345,7 +345,7 @@ public class ValidityUtil {
if (!validateMobile(phone)){ if (!validateMobile(phone)){
return Boolean.FALSE; return Boolean.FALSE;
} }
String initializeInfo = "用户".concat(phone.substring(phone.length()-6, phone.length())); String initializeInfo = CommonConstants.USER.concat(phone.substring(phone.length()-CommonConstants.SIX_INT, phone.length()));
if (!str.trim().equals(initializeInfo)){ if (!str.trim().equals(initializeInfo)){
return Boolean.FALSE; return Boolean.FALSE;
} }
...@@ -393,13 +393,13 @@ public class ValidityUtil { ...@@ -393,13 +393,13 @@ public class ValidityUtil {
return false; return false;
} }
if(numStr==""){ if(CommonConstants.EMPTY_STRING.equals(numStr)){
return false; return false;
} }
//验证是否是float型 //验证是否是float型
if(numStr.contains(".")){ if(numStr.contains(CommonConstants.SPOT)){
if(numStr.indexOf('.')==numStr.lastIndexOf('.')){ if(numStr.indexOf(CommonConstants.SPOT_CHAR)==numStr.lastIndexOf(CommonConstants.SPOT_CHAR)){
StringTokenizer st=new StringTokenizer(numStr,"."); StringTokenizer st=new StringTokenizer(numStr,CommonConstants.SPOT);
while(st.hasMoreElements()){ while(st.hasMoreElements()){
String splitStr= st.nextToken(); String splitStr= st.nextToken();
for(int i=splitStr.length();--i>=0;){ for(int i=splitStr.length();--i>=0;){
...@@ -429,15 +429,15 @@ public class ValidityUtil { ...@@ -429,15 +429,15 @@ public class ValidityUtil {
return false; return false;
} }
if(numStr==""){ if(CommonConstants.EMPTY_STRING.equals(numStr)){
return false; return false;
} }
//验证是否是float型 //验证是否是float型
if(numStr.contains(".")){ if(numStr.contains(CommonConstants.SPOT)){
return false; return false;
}else{ }else{
//验证是否是int型 //验证是否是int型
for(int i=numStr.length();--i>=0;){ for(int i=numStr.length();--i>=CommonConstants.ZERO_INT;){
if(!Character.isDigit(numStr.charAt(i))){ if(!Character.isDigit(numStr.charAt(i))){
return false; return false;
} }
......
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceEnclosureServiceImpl.java
View file @ da250fa7
...@@ -63,15 +63,14 @@ public class TInsuranceEnclosureServiceImpl extends ServiceImpl<TInsuranceEnclos ...@@ -63,15 +63,14 @@ public class TInsuranceEnclosureServiceImpl extends ServiceImpl<TInsuranceEnclos
if (file.getSize() > (CommonConstants.FIFTY_INT*CommonConstants.BYTE*CommonConstants.BYTE)){ if (file.getSize() > (CommonConstants.FIFTY_INT*CommonConstants.BYTE*CommonConstants.BYTE)){
return R.failed(InsurancesConstants.INSURANCE_ENCLOSURE_SIZE_ERROR); return R.failed(InsurancesConstants.INSURANCE_ENCLOSURE_SIZE_ERROR);
} }
String enclosureName = Objects.requireNonNull(file.getOriginalFilename()).substring(0,file.getOriginalFilename().lastIndexOf(".")); String fileName = System.currentTimeMillis() + CommonConstants.DOWN_LINE_STRING + file.getOriginalFilename();
String fileName = System.currentTimeMillis() + "_" + file.getOriginalFilename();
//filePath不传默认存储空间的根目录 //filePath不传默认存储空间的根目录
//支持的附件格式 //支持的附件格式
String key = ""; String key = "";
if (!Common.isNotNull(filePath)) { if (!Common.isNotNull(filePath)) {
key = fileName; key = fileName;
} else { } else {
key = filePath + "/" + fileName; key = filePath + CommonConstants.SLASH_SPLIT_LINE_STRING + fileName;
} }
boolean flag = ossUtil.uploadFileByStream(file.getInputStream(), key, null); boolean flag = ossUtil.uploadFileByStream(file.getInputStream(), key, null);
if (flag) { if (flag) {
...@@ -92,7 +91,7 @@ public class TInsuranceEnclosureServiceImpl extends ServiceImpl<TInsuranceEnclos ...@@ -92,7 +91,7 @@ public class TInsuranceEnclosureServiceImpl extends ServiceImpl<TInsuranceEnclos
try { try {
this.save(insuranceEnclosure); this.save(insuranceEnclosure);
} catch (Exception e) { } catch (Exception e) {
log.error("OSS文件上传接口异常：" + e.getMessage()); log.error(InsurancesConstants.OSS_ERROR + e.getMessage());
ossUtil.deleteObject(null, key); ossUtil.deleteObject(null, key);
return R.failed("failed:" + e.getMessage()); return R.failed("failed:" + e.getMessage());
} }
......
yifu-insurances/yifu-insurances-biz/src/main/resources/application.yml
View file @ da250fa7
...@@ -39,7 +39,6 @@ security: ...@@ -39,7 +39,6 @@ security:
- /v3/api-docs - /v3/api-docs
- /actuator/** - /actuator/**
- /swagger-ui/** - /swagger-ui/**
- /insuranceDetail/updateInsuranceSettle
- /insuranceDetail/urgentUpdateIsUse - /insuranceDetail/urgentUpdateIsUse
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TForecastLibraryService.java
View file @ da250fa7
...@@ -130,4 +130,6 @@ public interface TForecastLibraryService extends IService<TForecastLibrary> { ...@@ -130,4 +130,6 @@ public interface TForecastLibraryService extends IService<TForecastLibrary> {
void pushForecastInfo(List<TForecastLibrary> library); void pushForecastInfo(List<TForecastLibrary> library);
void pushForecastFundInfo(List<TForecastLibrary> library);
} }
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @ da250fa7
...@@ -3153,6 +3153,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -3153,6 +3153,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
for (int i = 0; i < monthDiff; i++) { for (int i = 0; i < monthDiff; i++) {
//获取所有的预估数据 //获取所有的预估数据
List<TForecastLibrary> libraryFundInfoList = null; List<TForecastLibrary> libraryFundInfoList = null;
List<TForecastLibrary> libraryFundInfoList1 = new ArrayList<>();
libraryFundInfoList = forecastLibraryService.list(Wrappers.<TForecastLibrary>query().lambda() libraryFundInfoList = forecastLibraryService.list(Wrappers.<TForecastLibrary>query().lambda()
.eq(TForecastLibrary::getEmpIdcard, sf.getEmpIdcard()) .eq(TForecastLibrary::getEmpIdcard, sf.getEmpIdcard())
.eq(TForecastLibrary::getDataType, CommonConstants.ONE_INT) .eq(TForecastLibrary::getDataType, CommonConstants.ONE_INT)
...@@ -3162,8 +3163,13 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -3162,8 +3163,13 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
for (TForecastLibrary library :libraryFundInfoList) { for (TForecastLibrary library :libraryFundInfoList) {
//办理成功生成收入 //办理成功生成收入
createIncomeInfo(library); createIncomeInfo(library);
if (CommonConstants.ZERO_INT == library.getDataPush()) {
libraryFundInfoList1.add(library);
}
}
if (Common.isNotNull(libraryFundInfoList1)) {
forecastLibraryService.pushForecastFundInfo(libraryFundInfoList1);
} }
forecastLibraryService.pushForecastInfo(libraryFundInfoList);
} }
} }
...@@ -4063,52 +4069,19 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -4063,52 +4069,19 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
settleDomain.getManagementFee().toString(), settleDomain.getManagementType(), settleDomain.getManagementFee().toString(), settleDomain.getManagementType(),
settleDomain.getManagementFee()); settleDomain.getManagementFee());
} }
} else {
BigDecimal gMoney = BigDecimal.ZERO;
if (CommonConstants.TWO_STRING.equals(settleDomain.getManagementType())) {
gMoney = settleDomain.getManagementFee();
} else if (CommonConstants.THREE_STRING.equals(settleDomain.getManagementType())) {
gMoney = settleDomain.getManagementFee();
} else {
isSum = 1;
gMoney = BigDecimalUtils.safeMultiply(library.getSumAll(),
settleDomain.getManagementFee().divide(new BigDecimal("100"),
CommonConstants.FIVE_INT, BigDecimal.ROUND_HALF_UP));
}
if (!isExist || isSum == 1) {
createIncomeInsurance(library, settleDomain, CommonConstants.ONE_STRING,
settleDomain.getManagementFee().toString(), settleDomain.getManagementType(), gMoney);
}
} }
} }
} }
if (Common.isNotNull(settleDomain.getRiskServerItem()) && settleDomain.getRiskServerItem() if (Common.isNotNull(settleDomain.getRiskServerItem()) && settleDomain.getRiskServerItem()
.contains(CommonConstants.TWO_STRING)) { .contains(CommonConstants.TWO_STRING)) {
if (CommonConstants.ZERO_STRING.equals(settleDomain.getRiskFundTag())) {
//预估模式 //预估模式
if (CommonConstants.ONE_STRING.equals(settleDomain.getMrSettleType()) && if (CommonConstants.ONE_STRING.equals(settleDomain.getMrSettleType())) {
CommonConstants.ZERO_STRING.equals(settleDomain.getRiskFundTag())) {
if (!isExist) { if (!isExist) {
createIncomeInsurance(library, settleDomain, CommonConstants.TWO_STRING, createIncomeInsurance(library, settleDomain, CommonConstants.TWO_STRING,
settleDomain.getRiskFundFee().toString(), settleDomain.getRiskFundType(), settleDomain.getRiskFundFee().toString(), settleDomain.getRiskFundType(),
settleDomain.getRiskFundFee()); settleDomain.getRiskFundFee());
} }
} else {
if (CommonConstants.ZERO_STRING.equals(settleDomain.getRiskFundTag())) {
BigDecimal money = BigDecimal.ZERO;
if (CommonConstants.TWO_STRING.equals(settleDomain.getRiskFundType())) {
money = settleDomain.getRiskFundFee();
} else if (CommonConstants.THREE_STRING.equals(settleDomain.getRiskFundType())) {
money = settleDomain.getRiskFundFee();
} else {
isSum = 2;
money = BigDecimalUtils.safeMultiply(library.getSumAll(),
settleDomain.getRiskFundFee().divide(new BigDecimal("100"),
CommonConstants.FIVE_INT, BigDecimal.ROUND_HALF_UP));
}
if (!isExist || isSum == 2) {
createIncomeInsurance(library, settleDomain, CommonConstants.TWO_STRING,
settleDomain.getRiskFundFee().toString(), settleDomain.getRiskFundType(), money);
}
} }
} }
} }
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TForecastLibraryServiceImpl.java
View file @ da250fa7
...@@ -1853,6 +1853,7 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap ...@@ -1853,6 +1853,7 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
|| CommonConstants.THREE_STRING.equals(socialFundInfo.getSocialStatus())) { || CommonConstants.THREE_STRING.equals(socialFundInfo.getSocialStatus())) {
//获取所有的预估数据 //获取所有的预估数据
List<TForecastLibrary> librarySocialInfoList1 = new ArrayList<>();
List<TForecastLibrary> librarySocialInfoList = baseMapper.selectList(Wrappers.<TForecastLibrary>query().lambda() List<TForecastLibrary> librarySocialInfoList = baseMapper.selectList(Wrappers.<TForecastLibrary>query().lambda()
.eq(TForecastLibrary::getEmpIdcard, empIdCard) .eq(TForecastLibrary::getEmpIdcard, empIdCard)
.eq(TForecastLibrary::getDataType, CommonConstants.ZERO_INT) .eq(TForecastLibrary::getDataType, CommonConstants.ZERO_INT)
...@@ -1862,8 +1863,13 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap ...@@ -1862,8 +1863,13 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
for (TForecastLibrary library : librarySocialInfoList) { for (TForecastLibrary library : librarySocialInfoList) {
//办理成功生成收入 //办理成功生成收入
createIncomeInfo(library); createIncomeInfo(library);
if (CommonConstants.ZERO_INT == library.getDataPush()) {
librarySocialInfoList1.add(library);
}
}
if (Common.isNotNull(librarySocialInfoList1)) {
this.pushForecastInfo(librarySocialInfoList1);
} }
this.pushForecastInfo(librarySocialInfoList);
} }
} }
if (isSaveAndUpdate) { if (isSaveAndUpdate) {
...@@ -2308,6 +2314,14 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap ...@@ -2308,6 +2314,14 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
} }
} }
@Override
public void pushForecastFundInfo(List<TForecastLibrary> library) {
if (Common.isNotNull(library)) {
//推送数据封装并推送
initEkpPushFundParam(library);
}
}
public void initEkpPushSocialParam(List<TForecastLibrary> unPushInfo) { public void initEkpPushSocialParam(List<TForecastLibrary> unPushInfo) {
List<String> pushList = new ArrayList<>(); List<String> pushList = new ArrayList<>();
Map<String,Integer> map = new HashMap<>(); Map<String,Integer> map = new HashMap<>();
...@@ -2448,7 +2462,11 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap ...@@ -2448,7 +2462,11 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
socialParam.setFd_3adfe8c73cb5a4(CommonConstants.EMPTY_STRING); socialParam.setFd_3adfe8c73cb5a4(CommonConstants.EMPTY_STRING);
} }
//客户名称 //客户名称
socialParam.setFd_3adfe8c81a0e42(library.getUnitName()); if (Common.isNotNull(settleDomain.getCustomerName())) {
socialParam.setFd_3adfe8c81a0e42(settleDomain.getCustomerName());
} else {
socialParam.setFd_3adfe8c81a0e42(CommonConstants.EMPTY_STRING);
}
//社保户 //社保户
if (Common.isNotNull(library.getSocialHouseholdName())) { if (Common.isNotNull(library.getSocialHouseholdName())) {
socialParam.setFd_3aeafa25916e82(library.getSocialHouseholdName()); socialParam.setFd_3aeafa25916e82(library.getSocialHouseholdName());
...@@ -2610,14 +2628,14 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap ...@@ -2610,14 +2628,14 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
//员工身份证 //员工身份证
fundParam.setFd_3adfe8c7e4cf7a(library.getEmpIdcard()); fundParam.setFd_3adfe8c7e4cf7a(library.getEmpIdcard());
//预估单位代缴 //预估单位代缴
if (Common.isNotNull(library.getUnitSocialSum())) { if (Common.isNotNull(library.getUnitFundSum())) {
fundParam.setFd_3adfeb4e8064a8(library.getUnitSocialSum().toString()); fundParam.setFd_3adfeb4e8064a8(library.getUnitFundSum().toString());
} else { } else {
fundParam.setFd_3adfeb4e8064a8(CommonConstants.EMPTY_STRING); fundParam.setFd_3adfeb4e8064a8(CommonConstants.EMPTY_STRING);
} }
//预估个人代缴 //预估个人代缴
if (Common.isNotNull(library.getPersonalSocialSum())) { if (Common.isNotNull(library.getPersonalFundSum())) {
fundParam.setFd_3adfeb52a4d2e2(library.getPersonalSocialSum().toString()); fundParam.setFd_3adfeb52a4d2e2(library.getPersonalFundSum().toString());
} else { } else {
fundParam.setFd_3adfeb52a4d2e2(CommonConstants.EMPTY_STRING); fundParam.setFd_3adfeb52a4d2e2(CommonConstants.EMPTY_STRING);
} }
...@@ -2666,7 +2684,11 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap ...@@ -2666,7 +2684,11 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
//个人代缴 //个人代缴
fundParam.setFd_3adfeb5366dd82(CommonConstants.EMPTY_STRING); fundParam.setFd_3adfeb5366dd82(CommonConstants.EMPTY_STRING);
//客户名称 //客户名称
fundParam.setFd_3adfe8c81a0e42(library.getUnitName()); if (Common.isNotNull(settleDomain.getCustomerName())) {
fundParam.setFd_3adfe8c81a0e42(settleDomain.getCustomerName());
} else {
fundParam.setFd_3adfe8c81a0e42(CommonConstants.EMPTY_STRING);
}
//公积金账户 //公积金账户
if (Common.isNotNull(library.getProvidentHouseholdName())) { if (Common.isNotNull(library.getProvidentHouseholdName())) {
fundParam.setFd_3aeafa8cc144bc(library.getProvidentHouseholdName()); fundParam.setFd_3aeafa8cc144bc(library.getProvidentHouseholdName());
...@@ -2680,7 +2702,9 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap ...@@ -2680,7 +2702,9 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
//个人差异 //个人差异
fundParam.setFd_3adfeb5413fb44(CommonConstants.EMPTY_STRING); fundParam.setFd_3adfeb5413fb44(CommonConstants.EMPTY_STRING);
//应收 //应收
fundParam.setFd_3adfeb7b624f06(CommonConstants.EMPTY_STRING); if (Common.isNotNull(library.getSumAll())) {
fundParam.setFd_3adfeb7b624f06(library.getSumAll().toString());
}
//收款状态 //收款状态
fundParam.setFd_3add9eaeed2560(CommonConstants.EMPTY_STRING); fundParam.setFd_3add9eaeed2560(CommonConstants.EMPTY_STRING);
//结算单号 //结算单号
...@@ -2811,23 +2835,6 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap ...@@ -2811,23 +2835,6 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
settleDomain.getManagementFee().toString(), settleDomain.getManagementType(), settleDomain.getManagementFee().toString(), settleDomain.getManagementType(),
settleDomain.getManagementFee(), sourceType); settleDomain.getManagementFee(), sourceType);
} }
} else {
BigDecimal gMoney;
if (CommonConstants.TWO_STRING.equals(settleDomain.getManagementType())) {
gMoney = settleDomain.getManagementFee();
} else if (CommonConstants.THREE_STRING.equals(settleDomain.getManagementType())) {
gMoney = settleDomain.getManagementFee();
} else {
isSum = 1;
gMoney = BigDecimalUtils.safeMultiply(library.getSumAll(),
settleDomain.getManagementFee().divide(new BigDecimal("100"),
CommonConstants.FIVE_INT, BigDecimal.ROUND_HALF_UP));
}
if (!isExist || isSum == 1) {
createIncomeInsurance(library, settleDomain, CommonConstants.ONE_STRING,
settleDomain.getManagementFee().toString(), settleDomain.getManagementType(),
gMoney, sourceType);
}
} }
} }
} }
...@@ -2835,31 +2842,13 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap ...@@ -2835,31 +2842,13 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
&& CommonConstants.ONE_STRING.equals(sourceType)) || (settleDomain.getRiskServerItem().contains(CommonConstants.TWO_STRING) && CommonConstants.ONE_STRING.equals(sourceType)) || (settleDomain.getRiskServerItem().contains(CommonConstants.TWO_STRING)
&& CommonConstants.TWO_STRING.equals(sourceType)))) { && CommonConstants.TWO_STRING.equals(sourceType)))) {
//预估模式 //预估模式
if (CommonConstants.ONE_STRING.equals(settleDomain.getMrSettleType()) && if (CommonConstants.ZERO_STRING.equals(settleDomain.getRiskFundTag())) {
CommonConstants.ZERO_STRING.equals(settleDomain.getRiskFundTag())) { if (CommonConstants.ONE_STRING.equals(settleDomain.getMrSettleType())) {
if (!isExist) { if (!isExist) {
createIncomeInsurance(library, settleDomain, CommonConstants.TWO_STRING, createIncomeInsurance(library, settleDomain, CommonConstants.TWO_STRING,
settleDomain.getRiskFundFee().toString(), settleDomain.getRiskFundType(), settleDomain.getRiskFundFee().toString(), settleDomain.getRiskFundType(),
settleDomain.getRiskFundFee(), sourceType); settleDomain.getRiskFundFee(), sourceType);
} }
} else {
if (CommonConstants.ZERO_STRING.equals(settleDomain.getRiskFundTag())) {
BigDecimal money;
if (CommonConstants.TWO_STRING.equals(settleDomain.getRiskFundType())) {
money = settleDomain.getRiskFundFee();
} else if (CommonConstants.THREE_STRING.equals(settleDomain.getRiskFundType())) {
money = settleDomain.getRiskFundFee();
} else {
isSum = 2;
money = BigDecimalUtils.safeMultiply(library.getSumAll(),
settleDomain.getRiskFundFee().divide(new BigDecimal("100"),
CommonConstants.FIVE_INT, BigDecimal.ROUND_HALF_UP));
}
if (!isExist || isSum == 2) {
createIncomeInsurance(library, settleDomain, CommonConstants.TWO_STRING,
settleDomain.getRiskFundFee().toString(), settleDomain.getRiskFundType(),
money, sourceType);
}
} }
} }
} }
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
View file @ da250fa7
...@@ -2842,8 +2842,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa ...@@ -2842,8 +2842,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
&& CommonConstants.ONE_STRING.equals(socialFundFlag)) || (settleDomain.getRiskServerItem().contains(CommonConstants.TWO_STRING) && CommonConstants.ONE_STRING.equals(socialFundFlag)) || (settleDomain.getRiskServerItem().contains(CommonConstants.TWO_STRING)
&& CommonConstants.TWO_STRING.equals(socialFundFlag)))) { && CommonConstants.TWO_STRING.equals(socialFundFlag)))) {
//预估模式 //预估模式
if (CommonConstants.ONE_STRING.equals(settleDomain.getMrSettleType()) && if (CommonConstants.ZERO_STRING.equals(settleDomain.getRiskFundTag())) {
CommonConstants.ZERO_STRING.equals(settleDomain.getRiskFundTag())) { if (CommonConstants.ONE_STRING.equals(settleDomain.getMrSettleType())) {
if (!exitFlag) { if (!exitFlag) {
createIncomeInsurance(paymentInfo, settleDomain, CommonConstants.TWO_STRING, createIncomeInsurance(paymentInfo, settleDomain, CommonConstants.TWO_STRING,
settleDomain.getRiskFundFee().toString(), settleDomain.getRiskFundType(), settleDomain.getRiskFundFee().toString(), settleDomain.getRiskFundType(),
...@@ -2878,6 +2878,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa ...@@ -2878,6 +2878,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
} }
} }
} }
}
incomeService.saveBathDetail(detailList); incomeService.saveBathDetail(detailList);
} }
......
yifu-upms/yifu-upms-biz/src/main/resources/application.yml
View file @ da250fa7
...@@ -38,10 +38,6 @@ security: ...@@ -38,10 +38,6 @@ security:
- /v3/api-docs - /v3/api-docs
- /actuator/** - /actuator/**
- /swagger-ui/** - /swagger-ui/**
- /**/insuranceDetail/updateInsuranceSettle
- /**/insuranceDetail/urgentUpdateIsUse
- /insuranceDetail/urgentUpdateIsUse
- /insuranceDetail/updateInsuranceSettle
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment