Merge remote-tracking branch 'origin/develop' into develop

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

@@ -135,11 +135,6 @@ public class ProductVo {
     private String unit;
 
     /**
-     * 优惠券名称
-     */
-    private String couponName;
-
-    /**
      * 1.5.5版本添加
      * 商品参与活动类型(61:买一赠一)
      */

order-management/pom.xml

@@ -65,7 +65,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>2.0.14-RELEASE</version>
+            <version>2.0.20-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

order-management/src/main/java/cn/freemud/management/service/handle/SaasOrderHandle.java

@@ -3,6 +3,7 @@ package cn.freemud.management.service.handle;
 import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.management.entities.dto.request.order.OrderManagerRequest;
 import cn.freemud.management.entities.dto.response.pay.PayRefundResponse;
+import cn.freemud.management.enums.RefundStatus;
 import cn.freemud.management.enums.ResponseResult;
 import cn.freemud.management.intercept.OrderServiceException;
 import cn.freemud.management.util.ResponseUtil;
@@ -14,7 +15,6 @@ import com.freemud.application.sdk.api.ordercenter.request.AfterSalesOperateReq;
 import com.freemud.application.sdk.api.ordercenter.request.OrderModifyRelatingCodeReq;
 import com.freemud.sdk.api.assortment.order.adapter.OrderSdkAdapter;
 import com.freemud.sdk.api.assortment.order.enums.PayRefundStatus;
-import com.freemud.sdk.api.assortment.order.enums.RefundStatus;
 import com.freemud.sdk.api.assortment.order.request.order.BaseQueryOrderRequest;
 import com.freemud.sdk.api.assortment.order.request.order.CancelOrderRequest;
 import com.freemud.sdk.api.assortment.order.request.order.OrderRefundRequest;