Skip to content

O
order-group
Commit 39b140b3 by xiaoer.li@freemud.com
Options

Merge branch 'feature/2020-1104-混合支付' into qa

parents 6884a45a cd45b4df
Showing with 2 additions and 1 deletions
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
...@@ -3373,7 +3373,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -3373,7 +3373,7 @@ public class OrderServiceImpl implements Orderservice {
AssortmentOpenPlatformIappWxappStore wxAppStore = assortmentOpenPlatformIappWxappStoreManager.selectWxappStoreByWxAppIdAndStoreId(wxAppid AssortmentOpenPlatformIappWxappStore wxAppStore = assortmentOpenPlatformIappWxappStoreManager.selectWxappStoreByWxAppIdAndStoreId(wxAppid
, storeId , storeId
, byIndex.getEbcode()); , byIndex.getEbcode());
if (StringUtils.isNotBlank(wxAppStore.getClientCode())) { if (wxAppStore!=null && StringUtils.isNotBlank(wxAppStore.getClientCode())) {
return wxAppStore.getClientCode(); return wxAppStore.getClientCode();
} }
return ""; return "";
...@@ -3398,6 +3398,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -3398,6 +3398,7 @@ public class OrderServiceImpl implements Orderservice {
backOrdersStatusChange(orderBean.getOid(), orderBean.getStatus()); backOrdersStatusChange(orderBean.getOid(), orderBean.getStatus());
if(ResponseCodeConstant.RESPONSE_SUCCESS.equals(request.getErrcode())) { if(ResponseCodeConstant.RESPONSE_SUCCESS.equals(request.getErrcode())) {
backOrdersStatusChange(orderBean.getOid(), orderBean.getStatus());
return this.newSendPaySuccessNoticeMessage(); return this.newSendPaySuccessNoticeMessage();
} else { } else {
return this.newSendPayFaileMessage(); return this.newSendPayFaileMessage();
......
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