|
|
|
@@ -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())){ |
|
|
|
|