|
|
|
@@ -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<String, Object> paramMap) throws Exception { |
|
|
|
@RequestMapping(value = "/notify/{tenantId}") |
|
|
|
public String __Notify(@PathVariable String tenantId,@RequestParam Map<String, Object> 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"; |
|
|
|
|