Merge branch 'qa' of gitlab.freemud.com:order-group-application/order-group into qa

order-application-service/src/main/java/cn/freemud/adapter/DeliveryAdapter.java

@@ -191,14 +191,20 @@ public class DeliveryAdapter {
 
                 OrderProductAddInfoDto extInfo = JSON.parseObject(productList.getExtInfo(), OrderProductAddInfoDto.class);
                 if(CollectionUtils.isNotEmpty(extInfo.getSpecialAttrs())) {
+                    String attr = "";
                     for (OrderSpecialExtraAttrRequest special : extInfo.getSpecialAttrs()) {
-                        grilling += special.getAttributeName() + "/";
+                        if(special.getAttributeName().indexOf("冰") >= 0) {
+                            attr = special.getAttributeName();
+                            break;
+                        }
+                    }
+                    if(attr.length() > 0) {
+                        productName += "("+attr+")";
                     }
                 }
 
                 if(CollectionUtils.isNotEmpty(productList.getMaterialProduct())) {
                     for (QueryOrdersResponseDto.DataBean.OrderBean.ProductBean material : productList.getMaterialProduct()) {
-                        productName += "/"+material.getSpecificationName();
                         grilling += material.getSpecificationName() + "/";
                     }
                 }
@@ -229,13 +235,18 @@ public class DeliveryAdapter {
                         if(CollectionUtils.isNotEmpty(extInfoCombo.getSpecialAttrs())) {
                             String attr = "";
                             for (OrderSpecialExtraAttrRequest special : extInfoCombo.getSpecialAttrs()) {
-                                grillingCombo += special.getAttributeName() + "/";
+                                if(special.getAttributeName().indexOf("冰") >= 0) {
+                                    attr = special.getAttributeName();
+                                    break;
+                                }
+                            }
+                            if(attr.length() > 0) {
+                                productNameCombo += "("+attr+")";
                             }
                         }
 
                         if(CollectionUtils.isNotEmpty(comboProduct.getMaterialProduct())) {
                             for (QueryOrdersResponseDto.DataBean.OrderBean.ProductBean material : comboProduct.getMaterialProduct()) {
-                                productNameCombo += "/"+material.getSpecificationName();
                                 grillingCombo += material.getSpecificationName() + "/";
                             }
                         }

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

@@ -3378,7 +3378,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 "";
@@ -3403,6 +3403,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();