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

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/mapper/TDepartSettlementInfoMapper.java

+package com.yifu.cloud.plus.v1.yifu.archives.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yifu.cloud.plus.v1.yifu.archives.entity.TDepartSettlementInfo;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 部门结算信息表
+ *
+ * @author pwang
+ * @date 2019-07-19 10:39:28
+ */
+@Mapper
+public interface TDepartSettlementInfoMapper extends BaseMapper<TDepartSettlementInfo> {
+}

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TDepartSettlementInfoServiceImpl.java

+package com.yifu.cloud.plus.v1.yifu.archives.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yifu.cloud.plus.v1.yifu.archives.entity.TDepartSettlementInfo;
+import com.yifu.cloud.plus.v1.yifu.archives.mapper.TDepartSettlementInfoMapper;
+import com.yifu.cloud.plus.v1.yifu.archives.service.TDepartSettlementInfoService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 部门结算信息表
+ *
+ * @author pwang
+ * @date 2019-07-19 11:42:58
+ */
+@Service("tDepartSettlementInfoService")
+public class TDepartSettlementInfoServiceImpl extends ServiceImpl<TDepartSettlementInfoMapper, TDepartSettlementInfo> implements TDepartSettlementInfoService {
+
+}

yifu-archives/yifu-archives-biz/src/main/resources/mapper/TDepartSettlementInfoMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.yifu.cloud.plus.v1.yifu.archives.mapper.TDepartSettlementInfoMapper">
+
+	<resultMap id="tDepartSettlementInfoMap" type="com.yifu.cloud.plus.v1.yifu.archives.entity.TDepartSettlementInfo">
+		<id property="id" column="ID"/>
+		<result property="socialCardTaker" column="SOCIAL_CARD_TAKER"/>
+		<result property="station" column="STATION"/>
+		<result property="managementTag" column="MANAGEMENT_TAG"/>
+		<result property="managementFee" column="MANAGEMENT_FEE"/>
+		<result property="managementType" column="MANAGEMENT_TYPE"/>
+		<result property="riskFundTag" column="RISK_FUND_TAG"/>
+		<result property="riskFundFee" column="RISK_FUND_FEE"/>
+		<result property="riskFundType" column="RISK_FUND_TYPE"/>
+		<result property="taxType" column="TAX_TYPE"/>
+		<result property="riskFundTaxTag" column="RISK_FUND_TAX_TAG"/>
+		<result property="managementTaxTag" column="MANAGEMENT_TAX_TAG"/>
+		<result property="unitSeriousIllnessProp" column="UNIT_SERIOUS_ILLNESS_PROP"/>
+		<result property="createUser" column="CREATE_USER"/>
+		<result property="createTime" column="CREATE_TIME"/>
+		<result property="lastUpdateUser" column="LAST_UPDATE_USER"/>
+		<result property="lastUpdateTime" column="LAST_UPDATE_TIME"/>
+		<result property="settleId" column="SETTLE_ID"/>
+		<result property="taxFee" column="TAX_FEE"/>
+		<result property="manageServerItem" column="MANAGE_SERVER_ITEM"/>
+		<result property="riskServerItem" column="RISK_SERVER_ITEM"/>
+	</resultMap>
+
+</mapper>

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/impl/TInsuranceDetailServiceImpl.java

@@ -1001,7 +1001,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 					}
 				}
 			}
-
 			//更新状态
 			this.saveOrUpdateBatch(successList);
 		}
@@ -1141,8 +1140,10 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				}
 			}
 		}
+		updateBatchById(successList);
 		if (CollectionUtils.isNotEmpty(successList)){
 			threadPool.execute(() -> {
+			//todo 根据结算类型是合并结算，推送预估保费到ekp(上面已经算好，这里直接判断有预估保费的就推送)
 			for (TInsuranceDetail tInsuranceDetail : successList) {
 				Integer settleType = tInsuranceDetail.getSettleType();
 				//如果是合并计算则推送至EKP
@@ -1156,16 +1157,12 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 								.set(TInsuranceSettle :: getEstimatePushTime,LocalDateTime.now());
 						//更新结算信息表
 						tInsuranceSettleService.update(settleWrapper);
-						//更新保单信息表
-						updateById(tInsuranceDetail);
-					}
 					}else{
-					updateById(tInsuranceDetail);
+						//todo 异常处理
+					}
 				}
 			}
 			});
-			//todo 根据结算类型是合并结算，推送预估保费到ekp(上面已经算好，这里直接判断有预估保费的就推送)
-			//结算状态是待结算，结算中、已结算是ekp反馈的，如果结算失败，反馈到我们这边的状态是待结算
 		}
 		//根据项目编码获取项目名称
 		setProjectNameByDeptNo(errorList);

yifu-insurances/yifu-insurances-biz/src/main/resources/application.yml

@@ -39,6 +39,8 @@ security:
         - /v3/api-docs
         - /actuator/**
         - /swagger-ui/**
+        - /insuranceDetail/updateInsuranceSettle
+        - /insuranceDetail/urgentUpdateIsUse