From 87095406be7303b7b65677ce25fd6c5463ced80c Mon Sep 17 00:00:00 2001 From: winter <664946893@qq.com> Date: Fri, 20 Dec 2024 14:27:11 +0800 Subject: [PATCH] fix --- .../iformall/controller/callback/AliPayController.java | 9 +++++---- .../main/java/com/iformall/mapper/WxMerchantMapper.java | 2 +- .../java/com/iformall/service/WxMerchantService.java | 2 +- .../service/impl/AliBusinessCircleOrderServiceImpl.java | 2 +- .../service/impl/WxBusinessCircleOrderServiceImpl.java | 2 +- .../com/iformall/service/impl/WxMerchantServiceImpl.java | 4 ++-- .../service/impl/WxThirdPartyOrdersServiceImpl.java | 4 ++-- .../src/main/resources/mapper/WxMerchantMapper.xml | 2 +- 8 files changed, 14 insertions(+), 13 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 a4834d0ed..201bce27d 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/AliPayController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/AliPayController.java @@ -22,6 +22,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; @@ -205,8 +206,8 @@ public class AliPayController extends BaseController { * https://opendocs.alipay.com/pre-apis/00fi1b * @throws Exception 可能产生的任何异常 */ - @RequestMapping(value = "/notify") - public String __Notify(@RequestParam Map paramMap) throws Exception { + @RequestMapping(value = "/notify/{tenantId}") + public String __Notify(@PathVariable String tenantId,@RequestParam Map paramMap) throws Exception { String msgMethod = (String) paramMap.get("msg_method"); String notifyId = (String) paramMap.get("notify_id"); @@ -255,7 +256,7 @@ public class AliPayController extends BaseController { String mallName = jo.getString("mall_name"); // WxMerchant merchant = wxMerchantService.getById(Long.parseLong(mallStoreId)); - WxMerchant merchant = wxMerchantService.getMerchantByEncode(mallStoreId); + WxMerchant merchant = wxMerchantService.getMerchantByEncode(tenantId,mallStoreId); if(merchant == null){ logger.error("alipay notify . 找不到门店:"+paramMap); return "fail"; @@ -301,7 +302,7 @@ public class AliPayController extends BaseController { String mallName = jo.getString("mall_name"); // WxMerchant merchant = wxMerchantService.getById(Long.parseLong(mallStoreId)); - WxMerchant merchant = wxMerchantService.getMerchantByEncode(mallStoreId); + WxMerchant merchant = wxMerchantService.getMerchantByEncode(tenantId,mallStoreId); if(merchant == null){ logger.error("alipay notify . 找不到门店:"+paramMap); return "fail"; diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java index 785dff967..999a78c3a 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java @@ -46,7 +46,7 @@ public interface WxMerchantMapper extends CommonMapper { void reSetCashCount(WxMerchant record); - WxMerchant getMerchantByEncode(@Param("encode")String encode); + WxMerchant getMerchantByEncode(@Param("tenantId")String tenantId,@Param("encode")String encode); int recordedAmount(WxMerchant record); diff --git a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java index bbf4b8f32..8e738dbfb 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java @@ -169,7 +169,7 @@ public interface WxMerchantService { boolean hasMerchantBrand(WxMerchant wxMerchant); boolean hasMerchantIsAdmin(WxMerchant wxMerchant); - WxMerchant getMerchantByEncode(String encode); + WxMerchant getMerchantByEncode(String tenantId,String encode); Optional findByName(String name); 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 67fa0080f..17181fd8f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java @@ -134,7 +134,7 @@ public class AliBusinessCircleOrderServiceImpl implements AliBusinessCircleOrder record.setUpdateTime(now); if(wxMerchant == null && StringUtils.isNotBlank(record.getMallStoreId())){ - wxMerchant = wxMerchantService.getMerchantByEncode(record.getMallStoreId()); + wxMerchant = wxMerchantService.getMerchantByEncode(record.getTenantId(),record.getMallStoreId()); } if(wxMerchant != null){ record.setMerchantId(wxMerchant.getId()); 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 19d041a0d..6d0b2d738 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java @@ -162,7 +162,7 @@ public class WxBusinessCircleOrderServiceImpl implements WxBusinessCircleOrderSe //TODO 第三方获取门店(标识可能发生变化) // WxMerchant wxMerchant = wxMerchantService.getById(Long.parseLong(record.getWxShopNumber())); - WxMerchant wxMerchant = wxMerchantService.getMerchantByEncode(record.getWxShopNumber()); + WxMerchant wxMerchant = wxMerchantService.getMerchantByEncode(record.getTenantId(),record.getWxShopNumber()); if (wxMerchant != null) { record.setMerchantId(wxMerchant.getId()); record.setMerchantName(wxMerchant.getName()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index 9d3a2aeba..c7e1fbc61 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -1143,8 +1143,8 @@ public class WxMerchantServiceImpl implements WxMerchantService { } @Override - public WxMerchant getMerchantByEncode(String encode){ - return wxMerchantMapper.getMerchantByEncode(encode); + public WxMerchant getMerchantByEncode(String tenantId,String encode){ + return wxMerchantMapper.getMerchantByEncode(tenantId,encode); } @Override diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java index 21b73bf21..23a03c2a7 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java @@ -138,7 +138,7 @@ public class WxThirdPartyOrdersServiceImpl implements WxThirdPartyOrdersService //TODO 第三方获取门店(标识可能发生变化) // WxMerchant wxMerchant = wxMerchantService.getById(Long.parseLong(record.getShopNumber())); - WxMerchant wxMerchant = wxMerchantService.getMerchantByEncode(record.getShopNumber()); + WxMerchant wxMerchant = wxMerchantService.getMerchantByEncode(record.getTenantId(),record.getShopNumber()); if(wxMerchant != null){ record.setMerchantId(wxMerchant.getId()); record.setMerchantName(wxMerchant.getName()); @@ -408,7 +408,7 @@ public class WxThirdPartyOrdersServiceImpl implements WxThirdPartyOrdersService //TODO 第三方获取门店(标识可能发生变化) // WxMerchant wxMerchant = wxMerchantService.getById(Long.parseLong(record.getShopNumber())); - WxMerchant wxMerchant = wxMerchantService.getMerchantByEncode(record.getShopNumber()); + WxMerchant wxMerchant = wxMerchantService.getMerchantByEncode(record.getTenantId(),record.getShopNumber()); if(wxMerchant != null){ record.setMerchantId(wxMerchant.getId()); record.setMerchantName(wxMerchant.getName()); diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index 0ee4d9a4b..0b0e07a75 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -264,7 +264,7 @@