升级基础订单和聚合订单sdk

assortment-ordercenter-sdk/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>assortment-ordercenter-sdk</artifactId>
-    <version>1.4.8.RELEASE</version>
+    <version>1.4.9.RELEASE</version>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>ordercenter-sdk</artifactId>
-            <version>1.2.9.RELEASE</version>
+            <version>1.2.10.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

assortment-ordercenter-sdk/readme.md

@@ -45,4 +45,5 @@
 | 1.4.7.RELEASE | 创建订单增加appid字段 | wuping | 2020-05-18 |
 | 1.4.8.RELEASE | 规范orderExtInfoDto | 侯书虎 | 2020-05-19 |
 | 1.3.4-SNAPSHOT | 返回售后单创建时间 | wuping | 2020-04-27 |
-| 1.3.5-SNAPSHOT | 取消订单增加任务 | wuping | 2020-04-28 |
\ No newline at end of file
+| 1.3.5-SNAPSHOT | 取消订单增加任务 | wuping | 2020-04-28 |
+| 1.4.9.RELEASE | 售后单任务 | wuping | 2020-05-21 |
\ No newline at end of file

order-application-service/pom.xml

@@ -40,7 +40,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>1.4.8.RELEASE</version>
+            <version>1.4.9.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
@@ -93,7 +93,7 @@
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>storecenter-sdk</artifactId>
-            <version>2.6.1-SNAPSHOT</version>
+            <version>2.6.4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>cn.freemud</groupId>

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

@@ -2883,52 +2883,4 @@ public class OrderAdapter {
         return orderClientType;
     }
 
-
-    public Integer getNewOrderClient(String name) {
-        String _name = OrderSourceType.SAAS.getCode();
-        Integer orderClientType;
-        switch (name) {
-            case "saas":
-                orderClientType = 2;
-                break;
-            case "alipay":
-                orderClientType=3;
-                break;
-            case "jdwm":
-                orderClientType = 10;
-                break;
-            case "mtwm":
-                orderClientType = 11;
-                break;
-            case "eleme":
-                orderClientType = 8;
-                break;
-            case "bdwm":
-                orderClientType = 9;
-                break;
-            case "ebwm":
-                orderClientType = 9;
-                break;
-            case "saas_member":
-                orderClientType = 13;
-                break;
-            case "saas_order":
-                orderClientType = 14;
-                break;
-            case "pos":
-                orderClientType = 15;
-                break;
-            case "meal":
-                orderClientType = 19;
-                break;
-            case "saasmall":
-                orderClientType = 23;
-                break;
-            default:
-                orderClientType = OrderClientType.SAAS.getIndex();
-                break;
-        }
-        return orderClientType;
-    }
-
 }

order-application-service/src/main/java/cn/freemud/entities/vo/QueryOrderResponseVo.java

@@ -208,11 +208,6 @@ public class QueryOrderResponseVo {
     private String refundCreateTime;
 
     /**
-     * 退款文案提示  若48小时后商家未处理，自动同意/拒绝退款
-     */
-    private String refundTips;
-
-    /**
      * 订单备注
      */
     private String orderRemark;

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

@@ -95,13 +95,10 @@ import com.freemud.sdk.api.assortment.message.request.MessageTemplateRequest;
 import com.freemud.sdk.api.assortment.message.service.IMessageTemplatePushService;
 import com.freemud.sdk.api.assortment.order.adapter.ActivitySdkAdapter;
 import com.freemud.sdk.api.assortment.order.enums.OldOrderStatus;
-import com.freemud.sdk.api.assortment.order.entities.OrderExtInfoDTO;
-import com.freemud.sdk.api.assortment.order.enums.OldOrderStatus;
 import com.freemud.sdk.api.assortment.order.request.order.*;
 import com.freemud.sdk.api.assortment.order.response.order.*;
 import com.freemud.sdk.api.assortment.order.response.payment.OrderPayResponse;
 import com.freemud.sdk.api.assortment.order.service.OrderCenterSdkService;
-import com.freemud.sdk.api.assortment.order.util.LockUtils;
 import com.freemud.sdk.api.assortment.order.vo.ProductGroupVo;
 import com.freemud.sdk.api.assortment.orderdistributor.entity.dto.PaymentMqMessageDto;
 import com.freemud.sdk.api.assortment.orderdistributor.service.PaymentQueueService;
@@ -114,7 +111,6 @@ import com.google.common.collect.Maps;
 import com.google.gson.Gson;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.builder.ToStringBuilder;

ordercenter-sdk/pom.xml

@@ -8,7 +8,7 @@
         <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <version>1.2.9.RELEASE</version>
+    <version>1.2.10.RELEASE</version>
     <artifactId>ordercenter-sdk</artifactId>
 
     <dependencies>

ordercenter-sdk/readme.md

@@ -27,4 +27,5 @@
 | 1.2.8.RELEASE | 1.1.9-SNAPSHOT升RELEASE版本 | wuping | 2020-05-18 |
 | 1.2.9.RELEASE | 规范orderExtInfoDto | 侯书虎 | 2020-05-19 |
 | 1.3.3-SNAPSHOT | 创建售后单接口增加任务 | wuping | 2020-04-27 |
-| 1.3.4-SNAPSHOT | 取消订单增加任务 | wuping | 2020-04-28 |
\ No newline at end of file
+| 1.3.4-SNAPSHOT | 取消订单增加任务 | wuping | 2020-04-28 |
+| 1.2.10.RELEASE | 增加售后单任务 | wuping | 2020-05-21 |
\ No newline at end of file