From cf111138feb80e3118442394ec001f9cb8a881a5 Mon Sep 17 00:00:00 2001 From: winter <664946893@qq.com> Date: Fri, 20 Dec 2024 22:41:52 +0800 Subject: [PATCH] fix --- .../controller/callback/AliPayController.java | 12 ++++++---- .../AliBusinessCircleOrderServiceImpl.java | 22 +++++++++++-------- .../WxBusinessCircleOrderServiceImpl.java | 19 ++++++++++------ 3 files changed, 33 insertions(+), 20 deletions(-) diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/AliPayController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/AliPayController.java index 201bce27d..ca5910a44 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/AliPayController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/AliPayController.java @@ -256,12 +256,16 @@ public class AliPayController extends BaseController { String mallName = jo.getString("mall_name"); // WxMerchant merchant = wxMerchantService.getById(Long.parseLong(mallStoreId)); - WxMerchant merchant = wxMerchantService.getMerchantByEncode(tenantId,mallStoreId); - if(merchant == null){ - logger.error("alipay notify . 找不到门店:"+paramMap); - return "fail"; + WxMerchant merchant = null; + if (StringUtils.isNotBlank(mallStoreId)) { + merchant = wxMerchantService.getMerchantByEncode(tenantId,mallStoreId); } +// if(merchant == null){ +// logger.error("alipay notify . 找不到门店:"+paramMap); +// return "fail"; +// } + aliBusinessCircleOrder.updateTenantInfo(merchant); aliBusinessCircleOrder.setTransactionId(tradeNo); aliBusinessCircleOrder.setAmount(amount); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java index 17181fd8f..6060345a6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java @@ -133,15 +133,19 @@ public class AliBusinessCircleOrderServiceImpl implements AliBusinessCircleOrder record.setCreateTime(now); record.setUpdateTime(now); - if(wxMerchant == null && StringUtils.isNotBlank(record.getMallStoreId())){ - wxMerchant = wxMerchantService.getMerchantByEncode(record.getTenantId(),record.getMallStoreId()); - } - if(wxMerchant != null){ - record.setMerchantId(wxMerchant.getId()); - record.setMerchantName(wxMerchant.getName()); - }else{ - logger.error("--Ali商圈付款通知消息未找到门店--mallStoreId="+record.getMallStoreId()); - record.setMerchantName("未知门店"); + if (StringUtils.isBlank(record.getMallStoreId())) { + record.setMerchantName("未知门店-未设置唯一码"); + }else { + if(wxMerchant == null && StringUtils.isNotBlank(record.getMallStoreId())){ + wxMerchant = wxMerchantService.getMerchantByEncode(record.getTenantId(),record.getMallStoreId()); + } + if(wxMerchant != null){ + record.setMerchantId(wxMerchant.getId()); + record.setMerchantName(wxMerchant.getName()); + }else{ + logger.error("--Ali商圈付款通知消息未找到门店--mallStoreId="+record.getMallStoreId()); + record.setMerchantName("未知门店-唯一码未匹配"); + } } if(record.getCUserId() != null){ diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java index 6d0b2d738..cf551ecb0 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java @@ -162,13 +162,18 @@ public class WxBusinessCircleOrderServiceImpl implements WxBusinessCircleOrderSe //TODO 第三方获取门店(标识可能发生变化) // WxMerchant wxMerchant = wxMerchantService.getById(Long.parseLong(record.getWxShopNumber())); - WxMerchant wxMerchant = wxMerchantService.getMerchantByEncode(record.getTenantId(),record.getWxShopNumber()); - if (wxMerchant != null) { - record.setMerchantId(wxMerchant.getId()); - record.setMerchantName(wxMerchant.getName()); - } else { - record.setMerchantName("未知门店"); - logger.error("--wx商圈付款通知消息未找到门店--shopName=" + record.getWxShopName() + "&shopNumber=" + record.getWxShopNumber()); + WxMerchant wxMerchant = null; + if (StringUtils.isBlank(record.getWxShopNumber())) { + record.setMerchantName("未知门店-未设置唯一码"); + }else { + wxMerchant = wxMerchantService.getMerchantByEncode(record.getTenantId(),record.getWxShopNumber()); + if (wxMerchant != null) { + record.setMerchantId(wxMerchant.getId()); + record.setMerchantName(wxMerchant.getName()); + } else { + record.setMerchantName("未知门店-唯一码未匹配"); + logger.error("--wx商圈付款通知消息未找到门店--shopName=" + record.getWxShopName() + "&shopNumber=" + record.getWxShopNumber()); + } } if(StringUtils.isNotBlank(record.getOpenid()) && StringUtils.isNotBlank(record.getAppid())){