合并代码

assortment-ordercenter-sdk/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>assortment-ordercenter-sdk</artifactId>
-    <version>1.1.6.SNAPSHOT</version>
+    <version>1.1.7.SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>

assortment-ordercenter-sdk/readme.md

@@ -9,4 +9,5 @@
 | 1.1.3.RELEASE| 1.9.10需求打包release版本（thirdCateId）  | 胡超 | 20200113  |
 | 1.1.4.RELEASE| 农工商submit接口  | 侯书虎 | 2020-01-13 |
 | 1.1.5.RELEASE| 农工商submit接口(del thirdCateId)  | 胡超 | 2020-01-13 |
-| 1.1.6.SNAPSHOT| 1.9.11商品组  | 胡超 | 2020-02-05 |
+| 1.1.6.SNAPSHOT| 1.9.11商品组  | 胡超 | 2020-02-05 |
\ No newline at end of file
+| 1.1.7.SNAPSHOT| 核销流程更改  | 侯书虎 | 2020-02-10 |
\ 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.1.7-SNAPSHOT</version>
+            <version>1.1.7.SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

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

@@ -5,8 +5,6 @@ import cn.freemud.entities.vo.AddUserOrderEvaluationNewRequestVo;
 import cn.freemud.utils.UnicodeUtil;
 import com.freemud.api.assortment.datamanager.entity.dto.InsertOrderEvaluationReqDto;
 import com.freemud.api.assortment.datamanager.entity.dto.InsertProductEvaluationReqDto;
-import com.freemud.application.sdk.api.util.DateTimeUtils;
-import com.freemud.sdk.api.assortment.order.response.order.OrderDetailResponse;
 import com.freemud.sdk.api.assortment.order.response.order.QueryOrdersResponse;
 import org.springframework.stereotype.Component;
 

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

@@ -6,7 +6,6 @@ import cn.freemud.base.util.DateUtil;
 import cn.freemud.entities.dto.AddProductEvaluationReqDto;
 import cn.freemud.entities.dto.Evaluation.OrderEvaluationStatus;
 import cn.freemud.entities.vo.AddUserOrderEvaluationNewRequestVo;
-import cn.freemud.entities.vo.AddUserOrderEvaluationRequestVo;
 import cn.freemud.entities.vo.GetEvaluationDetailByOrderIdRequestVo;
 import cn.freemud.entities.vo.GetEvaluationStatusNewRequestVo;
 import cn.freemud.enums.EvaluationStatus;