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

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -3373,7 +3373,7 @@ public class OrderServiceImpl implements Orderservice {
         AssortmentOpenPlatformIappWxappStore wxAppStore = assortmentOpenPlatformIappWxappStoreManager.selectWxappStoreByWxAppIdAndStoreId(wxAppid
                 , storeId
                 , byIndex.getEbcode());
-        if (StringUtils.isNotBlank(wxAppStore.getClientCode())) {
+        if (wxAppStore!=null && StringUtils.isNotBlank(wxAppStore.getClientCode())) {
             return wxAppStore.getClientCode();
         }
         return "";
@@ -3398,6 +3398,7 @@ public class OrderServiceImpl implements Orderservice {
 
         backOrdersStatusChange(orderBean.getOid(), orderBean.getStatus());
         if(ResponseCodeConstant.RESPONSE_SUCCESS.equals(request.getErrcode())) {
+            backOrdersStatusChange(orderBean.getOid(), orderBean.getStatus());
             return this.newSendPaySuccessNoticeMessage();
         } else {
             return this.newSendPayFaileMessage();