Skip to content

Y
yifu-mvp
Commit a039c9d5 authored by huyuchen's avatar huyuchen
Browse files
Options

优化修改

parent ce10ef2a
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 14 deletions
yifu-common/yifu-common-dapr/src/main/java/com/yifu/cloud/plus/v1/yifu/common/dapr/util/SalaryDaprUtil.java
View file @ a039c9d5
...@@ -30,6 +30,6 @@ public class SalaryDaprUtil { ...@@ -30,6 +30,6 @@ public class SalaryDaprUtil {
* @return * @return
**/ **/
public void updateSalarySettleStatus(List<EkpSocialViewVo> infoVo) { public void updateSalarySettleStatus(List<EkpSocialViewVo> infoVo) {
HttpDaprUtil.invokeMethodPost(daprProperties.getAppUrl(),daprProperties.getAppId(),"/tincome/inner/updateSalarySettleStatus", JSON.toJSONString(infoVo), EkpSocialViewVo.class, SecurityConstants.FROM_IN); HttpDaprUtil.invokeMethodPost(daprProperties.getAppUrl(),daprProperties.getAppId(),"/tincome/inner/updateSalarySettleStatus", JSON.toJSONString(infoVo), Object.class, SecurityConstants.FROM_IN);
} }
} }
yifu-common/yifu-common-dapr/src/main/java/com/yifu/cloud/plus/v1/yifu/common/dapr/util/SocialDaprUtils.java
View file @ a039c9d5
...@@ -59,7 +59,7 @@ public class SocialDaprUtils { ...@@ -59,7 +59,7 @@ public class SocialDaprUtils {
* @return * @return
**/ **/
public void updatePaymentSocialAndFound(UpdateSocialFoundVo infoVo) { public void updatePaymentSocialAndFound(UpdateSocialFoundVo infoVo) {
HttpDaprUtil.invokeMethodPost(daprProperties.getAppUrl(),daprProperties.getAppId(),"/tpaymentinfo/inner/updatePaymentSocialAndFound", JSON.toJSONString(infoVo), UpdateSocialFoundVo.class, SecurityConstants.FROM_IN); HttpDaprUtil.invokeMethodPost(daprProperties.getAppUrl(),daprProperties.getAppId(),"/tpaymentinfo/inner/updatePaymentSocialAndFound", JSON.toJSONString(infoVo), Object.class, SecurityConstants.FROM_IN);
} }
/** /**
...@@ -70,7 +70,7 @@ public class SocialDaprUtils { ...@@ -70,7 +70,7 @@ public class SocialDaprUtils {
* @return * @return
**/ **/
public void updateForSocialAndFound(UpdateSocialFoundVo infoVo) { public void updateForSocialAndFound(UpdateSocialFoundVo infoVo) {
HttpDaprUtil.invokeMethodPost(daprProperties.getAppUrl(),daprProperties.getAppId(),"/tforecastlibrary/inner/updateForSocialAndFound", JSON.toJSONString(infoVo), UpdateSocialFoundVo.class, SecurityConstants.FROM_IN); HttpDaprUtil.invokeMethodPost(daprProperties.getAppUrl(),daprProperties.getAppId(),"/tforecastlibrary/inner/updateForSocialAndFound", JSON.toJSONString(infoVo), Object.class, SecurityConstants.FROM_IN);
} }
/** /**
...@@ -81,7 +81,7 @@ public class SocialDaprUtils { ...@@ -81,7 +81,7 @@ public class SocialDaprUtils {
* @return * @return
**/ **/
public void updateSocialAndFoundInfo(UpdateSocialFoundVo infoVo) { public void updateSocialAndFoundInfo(UpdateSocialFoundVo infoVo) {
HttpDaprUtil.invokeMethodPost(daprProperties.getAppUrl(),daprProperties.getAppId(),"/tsocialfundinfo/inner/updateSocialAndFoundInfo", JSON.toJSONString(infoVo), UpdateSocialFoundVo.class, SecurityConstants.FROM_IN); HttpDaprUtil.invokeMethodPost(daprProperties.getAppUrl(),daprProperties.getAppId(),"/tsocialfundinfo/inner/updateSocialAndFoundInfo", JSON.toJSONString(infoVo), Object.class, SecurityConstants.FROM_IN);
} }
/** /**
...@@ -133,7 +133,7 @@ public class SocialDaprUtils { ...@@ -133,7 +133,7 @@ public class SocialDaprUtils {
* @return * @return
**/ **/
public void deleteById(TIncomeDetail infoVo) { public void deleteById(TIncomeDetail infoVo) {
HttpDaprUtil.invokeMethodPost(daprProperties.getAppUrl(),daprProperties.getAppId(),"/tincomedetail/inner/deleteById", JSON.toJSONString(infoVo), TIncomeDetail.class, SecurityConstants.FROM_IN); HttpDaprUtil.invokeMethodPost(daprProperties.getAppUrl(),daprProperties.getAppId(),"/tincomedetail/inner/deleteById", JSON.toJSONString(infoVo), Object.class, SecurityConstants.FROM_IN);
} }
/** /**
...@@ -144,7 +144,7 @@ public class SocialDaprUtils { ...@@ -144,7 +144,7 @@ public class SocialDaprUtils {
* @return * @return
**/ **/
public void updateSocialSettleStatus(List<EkpSocialViewVo> infoVo) { public void updateSocialSettleStatus(List<EkpSocialViewVo> infoVo) {
HttpDaprUtil.invokeMethodPost(daprProperties.getAppUrl(),daprProperties.getAppId(),"/tpaymentinfo/inner/updateSocialSettleStatus", JSON.toJSONString(infoVo), EkpSocialViewVo.class, SecurityConstants.FROM_IN); HttpDaprUtil.invokeMethodPost(daprProperties.getAppUrl(),daprProperties.getAppId(),"/tpaymentinfo/inner/updateSocialSettleStatus", JSON.toJSONString(infoVo), Object.class, SecurityConstants.FROM_IN);
} }
/** /**
...@@ -155,6 +155,6 @@ public class SocialDaprUtils { ...@@ -155,6 +155,6 @@ public class SocialDaprUtils {
* @return * @return
**/ **/
public void updateIncomeSettleStatus(List<EkpInsuranceViewVo> infoVo) { public void updateIncomeSettleStatus(List<EkpInsuranceViewVo> infoVo) {
HttpDaprUtil.invokeMethodPost(daprProperties.getAppUrl(),daprProperties.getAppId(),"/tincome/inner/updateIncomeSettleStatus", JSON.toJSONString(infoVo), EkpInsuranceViewVo.class, SecurityConstants.FROM_IN); HttpDaprUtil.invokeMethodPost(daprProperties.getAppUrl(),daprProperties.getAppId(),"/tincome/inner/updateIncomeSettleStatus", JSON.toJSONString(infoVo), Object.class, SecurityConstants.FROM_IN);
} }
} }
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/util/DoJointInsuranceTask.java
View file @ a039c9d5
...@@ -248,6 +248,7 @@ public class DoJointInsuranceTask { ...@@ -248,6 +248,7 @@ public class DoJointInsuranceTask {
} else { } else {
viewVo = ekpSettleService.selectFundViewBySettleNo(vo.getSettleNo(),vo.getPayFlag()); viewVo = ekpSettleService.selectFundViewBySettleNo(vo.getSettleNo(),vo.getPayFlag());
} }
log.info("获取信息条数:",viewVo.size());
if (!viewVo.isEmpty()) { if (!viewVo.isEmpty()) {
viewVo.forEach(e ->{ viewVo.forEach(e ->{
e.setPayFlag(vo.getPayFlag());}); e.setPayFlag(vo.getPayFlag());});
......
yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/ekp/EkpSettleMapper.xml
View file @ a039c9d5
...@@ -53,9 +53,9 @@ ...@@ -53,9 +53,9 @@
if(b.receiptStatus = '已收','0',if(b.receiptStatus = '垫付','2','1')), if(b.receiptStatus = '已收','0',if(b.receiptStatus = '垫付','2','1')),
if(b.zhichuEarningStatus = '已结算','0',if(b.zhichuEarningStatus = '结算中','1',if(b.zhichuEarningStatus = '无需结算','3','2'))), if(b.zhichuEarningStatus = '已结算','0',if(b.zhichuEarningStatus = '结算中','1',if(b.zhichuEarningStatus = '无需结算','3','2'))),
if(b.payStatus = '已付','0','1'), if(b.payStatus = '已付','0','1'),
orderType b.orderType
from from
ekp.view_insurance_info b view_insurance_info b
where where
1 = 1 1 = 1
<if test="payFlag != null and payFlag != '' and payFlag == 0"> <if test="payFlag != null and payFlag != '' and payFlag == 0">
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
if(a.payStatus = '已付','0','1'), if(a.payStatus = '已付','0','1'),
a.orderType a.orderType
from from
ekp.view_social_info a view_social_info a
where where
1 = 1 1 = 1
<if test="payFlag != null and payFlag != '' and payFlag == 0"> <if test="payFlag != null and payFlag != '' and payFlag == 0">
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
if(a.zhichuEarningStatus = '已结算','0',if(a.zhichuEarningStatus = '结算中','1','2')), if(a.zhichuEarningStatus = '已结算','0',if(a.zhichuEarningStatus = '结算中','1','2')),
if(a.payStatus = '已付','0','1') if(a.payStatus = '已付','0','1')
from from
ekp.view_funds_info a view_funds_info a
where where
1 = 1 1 = 1
<if test="payFlag != null and payFlag != '' and payFlag == 0"> <if test="payFlag != null and payFlag != '' and payFlag == 0">
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
if(a.earningStatus = '已结算','0',if(a.earningStatus = '结算中','1',if(a.earningStatus = '已冻结','3','2'))), if(a.earningStatus = '已结算','0',if(a.earningStatus = '结算中','1',if(a.earningStatus = '已冻结','3','2'))),
if(a.receiptStatus = '已收','0',if(a.receiptStatus = '垫付','2','1')) if(a.receiptStatus = '已收','0',if(a.receiptStatus = '垫付','2','1'))
from from
ekp.view_riskfund_info a view_riskfund_info a
where where
a.earningNo = #{settleNo} a.earningNo = #{settleNo}
</select> </select>
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
if(a.earningStatus = '已结算','0',if(a.earningStatus = '结算中','1',if(a.earningStatus = '已冻结','3','2'))), if(a.earningStatus = '已结算','0',if(a.earningStatus = '结算中','1',if(a.earningStatus = '已冻结','3','2'))),
if(a.receiptStatus = '已收','0',if(a.receiptStatus = '垫付','2','1')) if(a.receiptStatus = '已收','0',if(a.receiptStatus = '垫付','2','1'))
from from
ekp.view_management_info a view_management_info a
where where
a.earningNo = #{settleNo} a.earningNo = #{settleNo}
</select> </select>
...@@ -140,7 +140,7 @@ ...@@ -140,7 +140,7 @@
if(a.zhichuEarningStatus = '已结算','0',if(a.zhichuEarningStatus = '结算中','1','2')), if(a.zhichuEarningStatus = '已结算','0',if(a.zhichuEarningStatus = '结算中','1','2')),
if(a.payStatus = '已付','0','1') if(a.payStatus = '已付','0','1')
from from
ekp.view_salary_info a view_salary_info a
where where
1 = 1 1 = 1
<if test="payFlag != null and payFlag != '' and payFlag == 0"> <if test="payFlag != null and payFlag != '' and payFlag == 0">
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
View file @ a039c9d5
...@@ -3292,6 +3292,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa ...@@ -3292,6 +3292,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
paymentInfo.setPayCollectFlag(viewVo.getPayCollectFlag()); paymentInfo.setPayCollectFlag(viewVo.getPayCollectFlag());
} }
baseMapper.updateStatusById(paymentInfo); baseMapper.updateStatusById(paymentInfo);
log.info("缴费库实缴费用状态更新");
} }
} else if (viewVo.getSettleFlag().contains(SocialConstants.DIFF_TYPE_ONE)) { } else if (viewVo.getSettleFlag().contains(SocialConstants.DIFF_TYPE_ONE)) {
//根据明细id更新结算状态 //根据明细id更新结算状态
......
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