From 43defa41ad24b5d6c81d5f429eeb7d8840b4de22 Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 13 Feb 2023 20:31:57 +0800 Subject: [PATCH] //sharing --- .../com/iformall/controller/WxMerchantController.java | 2 +- .../WxProfitSharingReceiverApplyController.java | 2 +- .../java/com/iformall/controller/WxCarController.java | 4 ++-- .../service/WxProfitPaymentReceiverService.java | 3 +-- .../impl/WxProfitPaymentReceiverServiceImpl.java | 10 ++++------ .../pay/service/share/douyin/TtPayShareService.java | 2 +- .../pay/service/share/wx/v2/WxPayShareService.java | 2 +- .../pay/service/share/wx/v3/WxPayShareV3Service.java | 2 +- 8 files changed, 12 insertions(+), 15 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantController.java index dde903619..dee795c3e 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantController.java @@ -76,7 +76,7 @@ public class WxMerchantController extends BaseController { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "商户ID不能为空"); } wxMerchant.updateTenantInfo(getTenantInfo()); - return new ResultData(wxProfitPaymentReceiverService.findReceiver(getTenantInfo(),wxMerchant.getId(), EnumAppPlat.TOUTIAO,EnumProfitPaymentReceiverType.tt_merchant_number)); + return new ResultData(wxProfitPaymentReceiverService.findReceiver(getTenantInfo(),wxMerchant.getId(), EnumAppPlat.TOUTIAO)); } @ApiOperation("更新收款账户信息:必填项 id(商户ID) name(商户名称) accountId(账号ID) accountTypeValue(账号类型) accountName(账号名称)") diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxProfitSharingReceiverApplyController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxProfitSharingReceiverApplyController.java index 114137576..19cc74c8a 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxProfitSharingReceiverApplyController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxProfitSharingReceiverApplyController.java @@ -87,7 +87,7 @@ public class WxProfitSharingReceiverApplyController extends BaseController { if(merchant == null || EnumMerchantStatus.NOT_VALID.getCode().equals(merchant.getStatus())){ return new ResultData(ErrorCode.MERCHANT_INFO_NOT_VALID.getCode(),"商户不存在或已停用"); } - WxProfitPaymentReceiver receiver = wxProfitPaymentReceiverService.findReceiver(merchant, merchant.getId(), EnumAppPlat.WX, EnumProfitPaymentReceiverType.wx_special_merchant_number); + WxProfitPaymentReceiver receiver = wxProfitPaymentReceiverService.findReceiver(merchant, merchant.getId(), EnumAppPlat.WX); if(receiver != null && MerchantImportStatus.improt_success.getCode().equals(receiver.getWxImportStatus())){ return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(), "该商户已进件成功"); } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java index 4a03af478..312e9da60 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java @@ -468,14 +468,14 @@ public class WxCarController extends BaseController { return new ResultData(Result.ERROR,"未设置停车商户."); } - WxProfitPaymentReceiver receiver = wxProfitPaymentReceiverService.findReceiver(park, parkMerchant.getId(), EnumAppPlat.WX, EnumProfitPaymentReceiverType.wx_special_merchant_number); + WxProfitPaymentReceiver receiver = wxProfitPaymentReceiverService.findReceiver(park, parkMerchant.getId(), EnumAppPlat.WX); if (null == receiver || StringUtils.isBlank(receiver.getReceiverAccount())) { //查询商官商户 WxMerchant adminMerchant = wxMerchantService.findAdmin(park); if (null == adminMerchant) { return new ResultData(Result.ERROR,"未找到商管商户."); } - receiver = wxProfitPaymentReceiverService.findReceiver(park, adminMerchant.getId(), EnumAppPlat.WX, EnumProfitPaymentReceiverType.wx_special_merchant_number); + receiver = wxProfitPaymentReceiverService.findReceiver(park, adminMerchant.getId(), EnumAppPlat.WX); if (null == receiver || StringUtils.isBlank(receiver.getReceiverAccount())) { return new ResultData(Result.ERROR,"商管商户未设置收款账号."); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxProfitPaymentReceiverService.java b/mallinkService/src/main/java/com/iformall/service/WxProfitPaymentReceiverService.java index 04e5f0ab6..613a18505 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxProfitPaymentReceiverService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxProfitPaymentReceiverService.java @@ -49,10 +49,9 @@ public interface WxProfitPaymentReceiverService { * @param tenantEntity * @param merchantId * @param plat - * @param receiverType * @return */ - WxProfitPaymentReceiver findReceiver(TenantEntity tenantEntity, Long merchantId, EnumAppPlat plat, EnumProfitPaymentReceiverType receiverType); + WxProfitPaymentReceiver findReceiver(TenantEntity tenantEntity, Long merchantId, EnumAppPlat plat); ResultData updateReceiver(WxProfitPaymentReceiver receiver); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitPaymentReceiverServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitPaymentReceiverServiceImpl.java index 3ee548dcc..995d21989 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitPaymentReceiverServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitPaymentReceiverServiceImpl.java @@ -104,19 +104,18 @@ public class WxProfitPaymentReceiverServiceImpl implements WxProfitPaymentReceiv @Override - public WxProfitPaymentReceiver findReceiver(TenantEntity tenantEntity,Long merchantId, EnumAppPlat plat,EnumProfitPaymentReceiverType receiverType) { + public WxProfitPaymentReceiver findReceiver(TenantEntity tenantEntity,Long merchantId, EnumAppPlat plat) { WxProfitPaymentReceiver record = null; String key = Constant.paymentReceicerPrev + tenantEntity.getTenantId() + ":" + plat.getCode() - + ":" + merchantId - + ":" + receiverType.getCode(); + + ":" + merchantId; record = RedisCacheUtils.getCacheObject(paymentReceicerRedisTemplate, key, WxProfitPaymentReceiver.class); if(record == null){ WxProfitPaymentReceiver receiver = new WxProfitPaymentReceiver(); receiver.updateTenantInfo(tenantEntity); receiver.setMerchantId(merchantId); receiver.setPlat(plat.getCode()); - receiver.setReceiverType(receiverType.getCode()); +// receiver.setReceiverType(receiverType.getCode()); receiver.setStatus(EnumProfitSharingReceiverStatus.PROFIT_SHARING_RECEIVER_STATUS_VALID.getCode()); record = wxProfitPaymentReceiverMapper.findOne(receiver); if(record != null){ @@ -317,8 +316,7 @@ public class WxProfitPaymentReceiverServiceImpl implements WxProfitPaymentReceiv if(receiver != null){ String key = Constant.paymentReceicerPrev + receiver.getTenantId() + ":" + receiver.getPlat() - + ":" + receiver.getMerchantId() - + ":" + receiver.getReceiverType(); + + ":" + receiver.getMerchantId(); RedisCacheUtils.removeCache(paymentReceicerRedisTemplate, key); } } diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/share/douyin/TtPayShareService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/share/douyin/TtPayShareService.java index b0a02eff1..9a53d34a1 100644 --- a/mallinkService/src/main/java/com/iformall/service/pay/service/share/douyin/TtPayShareService.java +++ b/mallinkService/src/main/java/com/iformall/service/pay/service/share/douyin/TtPayShareService.java @@ -346,7 +346,7 @@ public class TtPayShareService extends PayShareBaseAdapterService{ return null; } - WxProfitPaymentReceiver record = wxProfitPaymentReceiverService.findReceiver(tenantEntity, merchantId,EnumAppPlat.TOUTIAO,EnumProfitPaymentReceiverType.tt_merchant_number); + WxProfitPaymentReceiver record = wxProfitPaymentReceiverService.findReceiver(tenantEntity, merchantId,EnumAppPlat.TOUTIAO); if(record != null && !MerchantImportStatus.improt_success.getCode().equals(record.getWxImportStatus()) && !MerchantImportStatus.improt_success.getCode().equals(record.getAlipayImportStatus()) && !MerchantImportStatus.improt_success.getCode().equals(record.getHzImportStatus())){ diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/share/wx/v2/WxPayShareService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/share/wx/v2/WxPayShareService.java index 5954bc8b3..4c5954c24 100644 --- a/mallinkService/src/main/java/com/iformall/service/pay/service/share/wx/v2/WxPayShareService.java +++ b/mallinkService/src/main/java/com/iformall/service/pay/service/share/wx/v2/WxPayShareService.java @@ -377,7 +377,7 @@ public class WxPayShareService extends PayShareBaseAdapterService{ if(merchantId == null || merchantId.equals(0L)){ return null; } - WxProfitPaymentReceiver record = wxProfitPaymentReceiverService.findReceiver(tenantEntity, merchantId,EnumAppPlat.WX,EnumProfitPaymentReceiverType.wx_special_merchant_number); + WxProfitPaymentReceiver record = wxProfitPaymentReceiverService.findReceiver(tenantEntity, merchantId,EnumAppPlat.WX); return record; } diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/share/wx/v3/WxPayShareV3Service.java b/mallinkService/src/main/java/com/iformall/service/pay/service/share/wx/v3/WxPayShareV3Service.java index 77d0ce286..b5dc44b1d 100644 --- a/mallinkService/src/main/java/com/iformall/service/pay/service/share/wx/v3/WxPayShareV3Service.java +++ b/mallinkService/src/main/java/com/iformall/service/pay/service/share/wx/v3/WxPayShareV3Service.java @@ -101,7 +101,7 @@ public class WxPayShareV3Service extends PayShareBaseAdapterService{ if(merchantId == null || merchantId.equals(0L)){ return null; } - WxProfitPaymentReceiver record = wxProfitPaymentReceiverService.findReceiver(tenantEntity, merchantId,EnumAppPlat.WX,EnumProfitPaymentReceiverType.wx_special_merchant_number); + WxProfitPaymentReceiver record = wxProfitPaymentReceiverService.findReceiver(tenantEntity, merchantId,EnumAppPlat.WX); return record; }