Merge branches 'feature/20210728_购物车满赠优惠空判断_wuping' and 'master' of…

Merge branches 'feature/20210728_购物车满赠优惠空判断_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group

order-management/src/main/java/cn/freemud/management/adapter/MessagePushAdapter.java

@@ -102,12 +102,16 @@ public class MessagePushAdapter {
         messageTemplateRequest.setPartnerId(order.getCompanyId());
         MessagePushOrderTemplateRequest messagePushOrderTemplateRequest = new MessagePushOrderTemplateRequest();
 
+        String address = order.getAddress();
+        if(StringUtils.isNotEmpty(address) ){
+            //处理字符串中带双引号
+            if(address.contains("\"")){
+                address = address.replace("\"","");
+            }
             // 微信推送 地址长度限制20字符, 多余截取不要
-        String address = StringUtils.isEmpty(order.getAddress()) ?
-                order.getAddress() :
-                (order.getAddress().length() > 20 ? order.getAddress().substring(0, 20) : order.getAddress());
+            address = address.length() > 20 ? address.substring(0, 20) :address;
+        }
         messagePushOrderTemplateRequest.setAddress(address);
-
         messagePushOrderTemplateRequest.setDaySeq(order.getDaySeq());
         messagePushOrderTemplateRequest.setGmtExpect(order.getGmtExpect());
         messagePushOrderTemplateRequest.setShopName(order.getShopName());