Merge remote-tracking branch 'origin/MVP1.4' into MVP1.4

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TInsuranceDetail.java

@@ -300,27 +300,51 @@ public class TInsuranceDetail extends BaseEntity {
 	/**
 	 * 收入信息结算状态 0 已结算 1 结算中 2 未结算 3 无需结算
 	 */
-	@Schema(description = "收入信息结算状态")
+	@Schema(description = "预估收入信息结算状态")
 	private String incomeSettleFlag;
 
 	/**
 	 * 收入信息结算状态 0 已收 1 未收 2 垫付
 	 */
-	@Schema(description = "收入信息收款状态")
+	@Schema(description = "预估收入信息收款状态")
 	private String incomeCollectFlag;
 
 	/**
 	 * 支出信息结算状态 0 已结算 1 结算中 2 未结算 3 无需结算
 	 */
-	@Schema(description = "支出信息结算状态")
+	@Schema(description = "预估支出信息结算状态")
 	private String paySettleFlag;
 
 	/**
 	 * 收入信息结算状态 0 已付 1 未付
 	 */
-	@Schema(description = "支出信息付款状态")
+	@Schema(description = "预估支出信息付款状态")
 	private String payCollectFlag;
 
+	/**
+	 * 收入信息结算状态 0 已结算 1 结算中 2 未结算 3 无需结算
+	 */
+	@Schema(description = "实缴收入信息结算状态")
+	private String sincomeSettleFlag;
+
+	/**
+	 * 收入信息结算状态 0 已收 1 未收 2 垫付
+	 */
+	@Schema(description = "实缴收入信息收款状态")
+	private String sincomeCollectFlag;
+
+	/**
+	 * 支出信息结算状态 0 已结算 1 结算中 2 未结算 3 无需结算
+	 */
+	@Schema(description = "实缴支出信息结算状态")
+	private String spaySettleFlag;
+
+	/**
+	 * 收入信息结算状态 0 已付 1 未付
+	 */
+	@Schema(description = "实缴支出信息付款状态")
+	private String spayCollectFlag;
+
 	/**
 	 * 创建人所在部门
 	 */

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/EkpInsuranceViewVo.java

@@ -37,5 +37,9 @@ public class EkpInsuranceViewVo implements Serializable {
 	 * 支出信息付款状态 0 已付 1 未付
 	 */
 	private String payCollectFlag;
+	/**
+	 * 订单类型
+	 */
+	private String orderType;
 
 }

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/mapper/ekp/EkpSettleMapper.java

@@ -24,7 +24,6 @@ public interface EkpSettleMapper {
 	 */
 	SettleVo getSettle(String id);
 
-
 	List<EkpInsuranceViewVo> selectSettleStatusBySettleNo(@Param("settleNo") String settleNo, @Param("payFlag") String payFlag);
 
 	List<EkpSocialViewVo> selectSocialViewStatusBySettleNo(@Param("settleNo") String settleNo,@Param("payFlag") String payFlag);

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

@@ -7242,13 +7242,24 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 					insuranceId = viewVo.getId().substring(0,19);
 					detail = baseMapper.selectById(insuranceId);
 					if (Common.isNotNull(detail)) {
-						//判断是收入还是支出结算单号
-						if (CommonConstants.ZERO_STRING.equals(vo.getPayFlag())) {
-							detail.setIncomeSettleFlag(viewVo.getIncomeSettleFlag());
-							detail.setIncomeCollectFlag(viewVo.getIncomeCollectFlag());
+						//判断订单类型是预估还是实缴
+						if (InsurancesConstants.ACTUAL_SETTLE_BILL.equals(viewVo.getOrderType())) {
+							//判断是收入还是支出结算单号
+							if (CommonConstants.ZERO_STRING.equals(vo.getPayFlag())) {
+								detail.setSincomeSettleFlag(viewVo.getIncomeSettleFlag());
+								detail.setSincomeCollectFlag(viewVo.getIncomeCollectFlag());
+							} else {
+								detail.setSpaySettleFlag(viewVo.getPaySettleFlag());
+								detail.setSpayCollectFlag(viewVo.getPayCollectFlag());
+							}
 						} else {
-							detail.setPaySettleFlag(viewVo.getPaySettleFlag());
-							detail.setPayCollectFlag(viewVo.getPayCollectFlag());
+							if (CommonConstants.ZERO_STRING.equals(vo.getPayFlag())) {
+								detail.setIncomeSettleFlag(viewVo.getIncomeSettleFlag());
+								detail.setIncomeCollectFlag(viewVo.getIncomeCollectFlag());
+							} else {
+								detail.setPaySettleFlag(viewVo.getPaySettleFlag());
+								detail.setPayCollectFlag(viewVo.getPayCollectFlag());
+							}
 						}
 						baseMapper.updateById(detail);
 					}

yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/ekp/EkpSettleMapper.xml

@@ -17,6 +17,7 @@
 		<result property="incomeCollectFlag" column="receiptStatus" jdbcType="VARCHAR"/>
 		<result property="paySettleFlag" column="zhichuEarningStatus" jdbcType="VARCHAR"/>
 		<result property="payCollectFlag" column="payStatus" jdbcType="VARCHAR"/>
+		<result property="orderType" column="orderType" jdbcType="VARCHAR"/>
 	</resultMap>
 
 	<resultMap id="BaseResultSocialStatusMap" type="com.yifu.cloud.plus.v1.yifu.insurances.vo.EkpSocialViewVo">
@@ -33,7 +34,7 @@
 	</sql>
 
 	<sql id="Base_Column_List_Status">
-		detailsId,earningStatus,receiptStatus,zhichuEarningStatus,payStatus
+		detailsId,earningStatus,receiptStatus,zhichuEarningStatus,payStatus,orderType
 	</sql>
 
 	<select id="getSettle" resultMap="BaseResultMap">

yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceDetailMapper.xml

@@ -66,6 +66,10 @@
 			<result property="incomeCollectFlag" column="INCOME_COLLECT_FLAG"/>
 			<result property="paySettleFlag" column="PAY_COLLECT_FLAG"/>
 			<result property="payCollectFlag" column="PAY_SETTLE_FLAG"/>
+			<result property="sincomeSettleFlag" column="SINCOME_SETTLE_FLAG"/>
+			<result property="sincomeCollectFlag" column="SINCOME_COLLECT_FLAG"/>
+			<result property="spaySettleFlag" column="SPAY_COLLECT_FLAG"/>
+			<result property="spayCollectFlag" column="SPAY_SETTLE_FLAG"/>
 	</resultMap>
 	<resultMap id="UpdateMap" type="com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceUpdateVO">
 		<id property="id" column="ID" jdbcType="VARCHAR"/>