From 98fd79b16d10adc4884b8c06e95d1123ac897009 Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 25 Aug 2022 17:33:21 +0800 Subject: [PATCH] // test --- ...xProfitSharingReceiverApplyController.java | 16 ++++++++++++++ .../WxProfitSharingReceiverApplyMapper.java | 3 +++ .../WxProfitSharingReceiverApplyService.java | 4 ++++ ...ProfitSharingReceiverApplyServiceImpl.java | 22 +++++++++++++++---- .../WxProfitSharingReceiverApplyMapper.xml | 10 +++++++++ 5 files changed, 51 insertions(+), 4 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxProfitSharingReceiverApplyController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxProfitSharingReceiverApplyController.java index 11f12c4c0..bca44ba3b 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxProfitSharingReceiverApplyController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxProfitSharingReceiverApplyController.java @@ -167,6 +167,22 @@ public class WxProfitSharingReceiverApplyController extends BaseController { return wxProfitSharingReceiverApplyService.applyment(receiverAdd); } + @ApiOperation("刷新审核状态") + @GetMapping("/syncApplymentStates") + public ResultData syncApplymentStates(Long id) { + log.debug("[" + getIpAddr() + "] merchantProfitSharingReceiver::syncApplymentStates"); + if(id == null){ + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "ID不能为空"); + } + + WxProfitSharingReceiverApply receiverApply = wxProfitSharingReceiverApplyService.findResultStateById(id); + if(receiverApply == null){ + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(), "未找到进件数据"); + } + + return wxProfitSharingReceiverApplyService.handApplymentStates(receiverApply); + } + /** * 获取授权函 * { diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxProfitSharingReceiverApplyMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxProfitSharingReceiverApplyMapper.java index 933af10f4..6a0e161f4 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxProfitSharingReceiverApplyMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxProfitSharingReceiverApplyMapper.java @@ -3,6 +3,7 @@ package com.iformall.mapper; import com.iformall.common.CommonMapper; import com.iformall.domain.po.WxProfitSharingReceiver; import com.iformall.domain.po.WxProfitSharingReceiverApply; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -13,4 +14,6 @@ public interface WxProfitSharingReceiverApplyMapper extends CommonMapper findListByApplymentState(WxProfitSharingReceiverApply apply); List findListByVerifyResult(WxProfitSharingReceiverApply apply); + + WxProfitSharingReceiverApply findResultStateById(@Param("id") Long id); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxProfitSharingReceiverApplyService.java b/mallinkService/src/main/java/com/iformall/service/WxProfitSharingReceiverApplyService.java index df24f824d..dc54c07dc 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxProfitSharingReceiverApplyService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxProfitSharingReceiverApplyService.java @@ -18,6 +18,8 @@ public interface WxProfitSharingReceiverApplyService { WxProfitSharingReceiverApply selectById(Long id); + WxProfitSharingReceiverApply findResultStateById(Long id); + WxProfitSharingReceiverApply selectByPlat(TenantEntity tenantEntity, Long merchantId, EnumAppPlat plat); WxProfitSharingReceiverApply detailByPlat(TenantEntity tenantEntity, Long merchantId, EnumAppPlat plat); @@ -31,4 +33,6 @@ public interface WxProfitSharingReceiverApplyService { ResultData modifySettlement(WxProfitSharingReceiverApply receiverAdd,String subMchid); ResultData handVerifyResult(WxProfitSharingReceiverApply apply); + + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingReceiverApplyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingReceiverApplyServiceImpl.java index fea88953d..559d38783 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingReceiverApplyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingReceiverApplyServiceImpl.java @@ -59,6 +59,11 @@ public class WxProfitSharingReceiverApplyServiceImpl implements WxProfitSharingR return wxProfitSharingReceiverApplyMapper.selectById(id); } + @Override + public WxProfitSharingReceiverApply findResultStateById(Long id) { + return wxProfitSharingReceiverApplyMapper.findResultStateById(id); + } + @Override public WxProfitSharingReceiverApply selectByPlat(TenantEntity tenantEntity, Long merchantId, EnumAppPlat plat) { WxProfitSharingReceiverApply receiverApply = new WxProfitSharingReceiverApply(); @@ -150,10 +155,12 @@ public class WxProfitSharingReceiverApplyServiceImpl implements WxProfitSharingR @Transactional(rollbackFor = {Exception.class}) public ResultData handApplymentStates(WxProfitSharingReceiverApply receiverApply) { if(receiverApply == null || !EnumSharingReceiverApplymentState.getNeedSyncList().contains(receiverApply.getApplymentState())){ - return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(), "该状态无需同步"); +// return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(), "该状态无需同步"); + return new ResultData(receiverApply); } - WxPayService wxPayService = wxPayAccountService.getWxPayService(receiverApply.getTenantId()); + try { + WxPayService wxPayService = wxPayAccountService.getWxPayService(receiverApply.getTenantId()); ApplymentStateQueryResult applymentStateQueryResult = wxPayService.getApplyment4SubService().queryApplyStatusByBusinessCode(receiverApply.getOutRequestNo()); EnumSharingReceiverApplymentState enumApplymentState = EnumSharingReceiverApplymentState.getEnum(applymentStateQueryResult.getApplymentState()); if(enumApplymentState != null && !enumApplymentState.getCode().equals(receiverApply.getApplymentState())){ @@ -190,8 +197,15 @@ public class WxProfitSharingReceiverApplyServiceImpl implements WxProfitSharingR } wxProfitSharingReceiverService.saveOrUpdate(receiverUpd); } - } - return new ResultData(); + + receiverApply.setSubMchid(receiverApplyUpd.getSubMchid()); + receiverApply.setSignUrl(receiverApplyUpd.getSignUrl()); + receiverApply.setApplymentState(receiverApplyUpd.getApplymentState()); + receiverApply.setApplymentStateDesc(receiverApplyUpd.getApplymentStateDesc()); + receiverApply.setAuditDetail(receiverApplyUpd.getAuditDetail()); + receiverApply.setUpdateTime(receiverApplyUpd.getUpdateTime()); + } + return new ResultData(receiverApply); } catch (WxPayException e) { e.printStackTrace(); return new ResultData(ErrorCode.SYS_SERVER_ERROR.getCode(),e.getMessage()); diff --git a/mallinkService/src/main/resources/mapper/WxProfitSharingReceiverApplyMapper.xml b/mallinkService/src/main/resources/mapper/WxProfitSharingReceiverApplyMapper.xml index c8243af4e..6c1927873 100644 --- a/mallinkService/src/main/resources/mapper/WxProfitSharingReceiverApplyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxProfitSharingReceiverApplyMapper.xml @@ -138,6 +138,16 @@ + +