Commit d11a0c5a by 周晓航

蜜雪->支付信息详情变动 新增2227商户用于测试

Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
parent aae76cdc
...@@ -3184,6 +3184,11 @@ public class OrderAdapter { ...@@ -3184,6 +3184,11 @@ public class OrderAdapter {
UnifiedOrderRequest orderPayDto = new UnifiedOrderRequest(); UnifiedOrderRequest orderPayDto = new UnifiedOrderRequest();
orderPayDto.setPartnerId(orderBean.getCompanyId()); orderPayDto.setPartnerId(orderBean.getCompanyId());
orderPayDto.setBody(paymentRequest.getPrincipalName()); orderPayDto.setBody(paymentRequest.getPrincipalName());
// fisherman 2227 测试商户号, 下个版本需要删除
if ("2080".equals(orderBean.getCompanyId()) || "2227".equals(orderBean.getCompanyId())) {
//【ID1035981】【蜜雪冰城】订单C端,拼接order_body字段:蜜雪冰城+门店编号
paymentRequest.setPrincipalName("蜜雪冰城"+orderBean.getShopId()+"店");
}
orderPayDto.setNotifyUrl(paymentRequest.getReverseNotifyiDcUrl()); orderPayDto.setNotifyUrl(paymentRequest.getReverseNotifyiDcUrl());
orderPayDto.setStoreId(orderBean.getShopId()); orderPayDto.setStoreId(orderBean.getShopId());
orderPayDto.setTransId(transId); orderPayDto.setTransId(transId);
......
...@@ -121,8 +121,8 @@ public class OrderCommonService { ...@@ -121,8 +121,8 @@ public class OrderCommonService {
paymentRequest.setWxAppId(wxAppId); paymentRequest.setWxAppId(wxAppId);
AssortmentOpenPlatformWxapp wxApp = openPlatformWxappManager.findByPartnerIdAndWxappId(partnerId, wxAppId); AssortmentOpenPlatformWxapp wxApp = openPlatformWxappManager.findByPartnerIdAndWxappId(partnerId, wxAppId);
paymentRequest.setPrincipalName(wxApp.getPrincipalName()); paymentRequest.setPrincipalName(wxApp.getPrincipalName());
// 2227 测试商户号, 下个版本需要删除 // fisherman 2227 测试商户号, 下个版本需要删除
if ("2080".equals(orderBean.getCompanyId()) || "2227".equals(orderBean.getCompanyId())) { if ("2080".equals(partnerId) || "2227".equals(partnerId)) {
//【ID1035981】【蜜雪冰城】订单C端,拼接order_body字段:蜜雪冰城+门店编号 //【ID1035981】【蜜雪冰城】订单C端,拼接order_body字段:蜜雪冰城+门店编号
paymentRequest.setPrincipalName("蜜雪冰城"+orderBean.getShopId()+"店"); paymentRequest.setPrincipalName("蜜雪冰城"+orderBean.getShopId()+"店");
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment