升级SDK，合并代码

assortment-ordercenter-sdk/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>assortment-ordercenter-sdk</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>6.4.10.RELEASE</version>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>ordercenter-sdk</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>1.0.3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

assortment-ordercenter-sdk/readme.md

@@ -195,3 +195,4 @@
 | 6.4.8.RELEASE|关联jar升级,商品相关价格落库RELEASE版| 丁凯 | 2019-11-28  |
 | 6.4.9.RELEASE| 订单支付后保存会员信息-优化错误处理  | 姜海波 | 2019-11-28  |
 | 1.0.0-SNAPSHOT | 迁移后包明改为cn.freemud开头第一版 | wuping | 2019-12-16 |
+| 6.4.10.RELEASE| 骑手小费  | 张明警 | 2019-12-26  |
\ No newline at end of file

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

@@ -582,6 +582,8 @@ public class OrderSdkAdapter {
             }
             if (orderCostResp.getCostType() == 5) {
                 accountBean.setType(OldOrderAccountType.CARD_ORIGINAL_AMOUNT.getCode());
+            }if (orderCostResp.getCostType() == 7) {
+                accountBean.setType(OldOrderAccountType.DRIVER_FEE.getCode());
             }
             accountBean.setAddInfo("");
             accountList.add(accountBean);

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/enums/OldOrderAccountType.java

@@ -22,6 +22,7 @@ public enum OldOrderAccountType {
     COUPON(5, "代金券", "COUPON"),
     PRODUCT_COUPON(6, "商品券", "PRODUCT_COUPON"),
     DISCOUNT_COUPON(7, "折扣券", "DISCOUNT_COUPON"),
+    DRIVER_FEE(7, "骑手小费", "DRIVER_FEE"),
     DISCOUNT_AMOUNT(21, "限时折扣", "DISCOUNT_AMOUNT"),
     PREMIUM_EXCHANGE(22, "加价购", "PREMIUM_EXCHANGE"),
     SECOND_DISCOUNT(23, "第二件N折", "SECOND_DISCOUNT"),