Просмотр исходного кода

//ttpay 分账帐号

release_toaliyun_real
xhxu 3 лет назад
Родитель
Сommit
2e12be56e6
2 измененных файлов: 3 добавлений и 4 удалений
  1. +2
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingReceiverServiceImpl.java

+ 2
- 3
mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java Просмотреть файл

@@ -602,7 +602,6 @@ public class WxCouponServiceImpl implements WxCouponService {
record.setMakeMerchantId(makeMerchant.getId());
WxProfitSharingReceiver receiver = payShareServie.getReceiver(payAccount, makeMerchant.getId(), null, payMchType.getCode());

logger.info(JSON.toJSONString(receiver));
if (receiver == null) {
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(), "[\""+makeMerchant.getName()+"\"]未配置收款账户");
}
@@ -617,14 +616,14 @@ public class WxCouponServiceImpl implements WxCouponService {
List<String> badNames = new ArrayList();
for (WxMerchant merchant:merchantList) {
WxProfitSharingReceiver receiver = payShareServie.getReceiver(payAccount, merchant.getId(), null, payMchType.getCode());
logger.info(JSON.toJSONString(receiver));
if (receiver == null) {
badNames.add(merchant.getName());
continue;
}
if (EnumAppPlat.TOUTIAO.equals(plat)) {
QueryMerchantResult openPayResult = payAccount.getOpenPayResult();
logger.info(JSON.toJSONString(openPayResult));
if(!EnumYesOrNo.YES.getCode().equals(openPayResult.getAlipay())
&& !EnumYesOrNo.YES.getCode().equals(openPayResult.getWx())
&& !EnumYesOrNo.YES.getCode().equals(openPayResult.getHz())){


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingReceiverServiceImpl.java Просмотреть файл

@@ -481,7 +481,7 @@ public class WxProfitSharingReceiverServiceImpl implements WxProfitSharingReceiv
if(receiver != null){
String key = Constant.sharingReceicerPrev + receiver.getTenantId()
+ ":" + receiver.getMerchantId()
+ ":" + receiver.getPlat() + "a" + receiver.getReceiverType();
+ ":" + receiver.getPlat() + "a" + receiver.getSharingType();
RedisCacheUtils.removeCache(sharingReceicerRedisTemplate, key);
}
}


Загрузка…
Отмена
Сохранить