Merge branch 'develop' of…

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

# Conflicts:
#	assortment-ordercenter-sdk/readme.md

assortment-ordercenter-sdk/readme.md

@@ -30,4 +30,5 @@
 | 1.4.4-SNAPSHOT | 订单扩展信息 | 丁凯 | 2020-04-13 |
 | 1.2.8.RELEASE | 增加延时队列 | 海波 | 2020-04-13 |
 | 1.4.5-SNAPSHOT | 订单app渠道 | 丁凯 | 2020-04-16 |
-| 1.4.7-SNAPSHOT | 增加实际配送费 | 海波 | 2020-04-17 |
+| 1.4.6-SNAPSHOT | 增加实际配送费 | 海波 | 2020-04-17 |
+| 1.4.7-SNAPSHOT | 去掉无用字符写入ext_info | 李小二 | 2020-04-17 |

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -2536,10 +2536,10 @@ public class OrderSdkAdapter {
             extInfo.setThirdCategoryId(product.getThirdCategoryId());
         }
 
-        extInfo.setStapleFood(product.getStapleFood());
-        //if (product.getStapleFood()!=null && product.getStapleFood()>0) {
-        //    extInfo.setStapleFood(1);
-        //}
+        //extInfo.setStapleFood(product.getStapleFood());
+        if (product.getStapleFood()!=null && product.getStapleFood()>0) {
+            extInfo.setStapleFood(1);
+        }
         // todo 订单行扩展字段商品组
         extInfo.setProductGroupList(product.getProductGroupList());
 

order-application-service/pom.xml

@@ -40,7 +40,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>1.4.6-SNAPSHOT</version>
+            <version>1.4.7-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>