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

yifu-business/yifu-business-biz/src/main/java/com/yifu/cloud/plus/v1/business/controller/system/TBusWarningController.java

@@ -6,6 +6,7 @@ import com.yifu.cloud.plus.v1.business.entity.system.TBusWarning;
 import com.yifu.cloud.plus.v1.business.service.system.TBusWarningService;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.DateUtil;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
+import com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.AllArgsConstructor;
@@ -60,6 +61,7 @@ public class TBusWarningController {
       * @Date 2021-8-24 18:18:01
       */
 	 @Operation(summary = "获取所有要自动发送的主表，以及人员信息进行定时任务发送", description = "获取所有要自动发送的主表，以及人员信息进行定时任务发送")
+	 @Inner
 	 @PostMapping("/inner/doBatchSendBusSms")
      public void doBatchSendBusSms() {
           tBusWarningService.doBatchSendBusSms();
@@ -73,6 +75,7 @@ public class TBusWarningController {
       * @Date 2021-8-24 18:18:06
       */
 	 @Operation(summary = "更新当日所有发送的短信状态", description = "更新当日所有发送的短信状态")
+	 @Inner
 	 @PostMapping("/inner/doUpdateSendBusSmsStatus")
      public void doUpdateSendBusSmsStatus() {
           tBusWarningService.doUpdateSendBusSmsStatus(DateUtil.getCurrentDateString(DateUtil.ISO_DATE_FORMAT));

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/util/DoJointInsuranceTask.java

@@ -248,7 +248,6 @@ public class DoJointInsuranceTask {
 		} else {
 			viewVo = ekpSettleService.selectFundViewBySettleNo(vo.getSettleNo(),vo.getPayFlag());
 		}
-		log.info("获取信息条数:",viewVo.toString());
 		if (!viewVo.isEmpty()) {
 			viewVo.forEach(e -> e.setPayFlag(vo.getPayFlag()));
 			socialDaprUtils.updateSocialSettleStatus(viewVo);

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

@@ -49,10 +49,10 @@
 	<select id="selectSettleStatusBySettleNo" resultMap="BaseResultStatusMap">
 		select
 			b.detailsId,
-			if(b.earningStatus = '已结算','0',if(b.earningStatus = '结算中','1',if(b.earningStatus = '无需结算','3','2'))),
-			if(b.receiptStatus = '已收','0',if(b.receiptStatus = '垫付','2','1')),
-			if(b.zhichuEarningStatus = '已结算','0',if(b.zhichuEarningStatus = '结算中','1',if(b.zhichuEarningStatus = '无需结算','3','2'))),
-			if(b.payStatus = '已付','0','1'),
+			if(b.earningStatus = '已结算','0',if(b.earningStatus = '结算中','1',if(b.earningStatus = '无需结算','3','2'))) earningStatus,
+			if(b.receiptStatus = '已收','0',if(b.receiptStatus = '垫付','2','1')) receiptStatus,
+			if(b.zhichuEarningStatus = '已结算','0',if(b.zhichuEarningStatus = '结算中','1',if(b.zhichuEarningStatus = '无需结算','3','2'))) zhichuEarningStatus,
+			if(b.payStatus = '已付','0','1') payStatus,
 			b.orderType
 		from
 			view_insurance_info b
@@ -70,10 +70,10 @@
 	<select id="selectSocialViewStatusBySettleNo" resultMap="BaseResultSocialStatusMap">
 		select
 			a.detailsId,
-			if(a.earningStatus = '已结算','0',if(a.earningStatus = '结算中','1',if(a.earningStatus = '已冻结','3','2'))),
-			if(a.receiptStatus = '已收','0',if(a.receiptStatus = '垫付','2','1')),
-			if(a.zhichuEarningStatus = '已结算','0',if(a.zhichuEarningStatus = '结算中','1','2')),
-			if(a.payStatus = '已付','0','1'),
+			if(a.earningStatus = '已结算','0',if(a.earningStatus = '结算中','1',if(a.earningStatus = '已冻结','3','2'))) earningStatus,
+			if(a.receiptStatus = '已收','0',if(a.receiptStatus = '垫付','2','1')) receiptStatus,
+			if(a.zhichuEarningStatus = '已结算','0',if(a.zhichuEarningStatus = '结算中','1','2')) zhichuEarningStatus,
+			if(a.payStatus = '已付','0','1') payStatus,
 			a.orderType
 		from
 			view_social_info a
@@ -91,10 +91,10 @@
 	<select id="selectFundViewBySettleNo" resultMap="BaseResultSocialStatusMap">
 		select
 			a.detailsId,
-			if(a.earningStatus = '已结算','0',if(a.earningStatus = '结算中','1',if(a.earningStatus = '已冻结','3','2'))),
-			if(a.receiptStatus = '已收','0',if(a.receiptStatus = '垫付','2','1')),
-			if(a.zhichuEarningStatus = '已结算','0',if(a.zhichuEarningStatus = '结算中','1','2')),
-			if(a.payStatus = '已付','0','1')
+			if(a.earningStatus = '已结算','0',if(a.earningStatus = '结算中','1',if(a.earningStatus = '已冻结','3','2'))) earningStatus,
+			if(a.receiptStatus = '已收','0',if(a.receiptStatus = '垫付','2','1')) receiptStatus,
+			if(a.zhichuEarningStatus = '已结算','0',if(a.zhichuEarningStatus = '结算中','1','2')) zhichuEarningStatus,
+			if(a.payStatus = '已付','0','1') payStatus
 		from
 			view_funds_info a
 		where
@@ -111,8 +111,8 @@
 	<select id="selectFIncomelViewBySettleNo" resultMap="BaseResultStatusMap">
 		select
 			a.detailsId,
-			if(a.earningStatus = '已结算','0',if(a.earningStatus = '结算中','1',if(a.earningStatus = '已冻结','3','2'))),
-			if(a.receiptStatus = '已收','0',if(a.receiptStatus = '垫付','2','1'))
+			if(a.earningStatus = '已结算','0',if(a.earningStatus = '结算中','1',if(a.earningStatus = '已冻结','3','2'))) earningStatus,
+			if(a.receiptStatus = '已收','0',if(a.receiptStatus = '垫付','2','1')) receiptStatus
 		from
 			view_riskfund_info a
 		where
@@ -123,8 +123,8 @@
 	<select id="selectIncomeViewBySettleNo" resultMap="BaseResultStatusMap">
 		select
 			a.detailsId,
-			if(a.earningStatus = '已结算','0',if(a.earningStatus = '结算中','1',if(a.earningStatus = '已冻结','3','2'))),
-			if(a.receiptStatus = '已收','0',if(a.receiptStatus = '垫付','2','1'))
+			if(a.earningStatus = '已结算','0',if(a.earningStatus = '结算中','1',if(a.earningStatus = '已冻结','3','2'))) earningStatus,
+			if(a.receiptStatus = '已收','0',if(a.receiptStatus = '垫付','2','1')) receiptStatus
 		from
 			view_management_info a
 		where
@@ -135,10 +135,10 @@
 	<select id="selectSalarylViewBySettleNo" resultMap="BaseResultSocialStatusMap">
 		select
 			a.detailsId,
-			if(a.earningStatus = '已结算','0',if(a.earningStatus = '结算中','1',if(a.earningStatus = '已冻结','3','2'))),
-			if(a.receiptStatus = '已收','0',if(a.receiptStatus = '垫付','2','1')),
-			if(a.zhichuEarningStatus = '已结算','0',if(a.zhichuEarningStatus = '结算中','1','2')),
-			if(a.payStatus = '已付','0','1')
+			if(a.earningStatus = '已结算','0',if(a.earningStatus = '结算中','1',if(a.earningStatus = '已冻结','3','2'))) earningStatus,
+			if(a.receiptStatus = '已收','0',if(a.receiptStatus = '垫付','2','1')) receiptStatus,
+			if(a.zhichuEarningStatus = '已结算','0',if(a.zhichuEarningStatus = '结算中','1','2')) zhichuEarningStatus,
+			if(a.payStatus = '已付','0','1') payStatus
 		from
 			view_salary_info a
 		where

yifu-social/yifu-social-biz/src/main/resources/application-test.yml

@@ -32,7 +32,7 @@ spring:
             type: CLASS_BASED
         tables:
           t_payment_info:
-            actual-data-nodes: ds0.t_payment_info_20$->{17..22}
+            actual-data-nodes: ds0.t_payment_info_20$->{17..23}
             key-generate-strategy:
               column: ID
               key-generator-name: snowflake