麦咖啡合代码和升级sdk

assortment-ordercenter-sdk/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>assortment-ordercenter-sdk</artifactId>
-    <version>2.0.8-RELEASE</version>
+    <version>2.0.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.3.12.RELEASE</version>
+            <version>1.3.13.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

order-application-service/pom.xml

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

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

@@ -2149,7 +2149,7 @@ public class OrderAdapter {
         createOrderProductDemoDto.setWeight(cartGoodsDetailDto.getWeight());
         createOrderProductDemoDto.setUnit(cartGoodsDetailDto.getUnit());
         createOrderProductDemoDto.setStapleFood(0);
-        createOrderProductDemoDto.setCategory(cartGoodsDetailDto.getClassificationId());
+//        createOrderProductDemoDto.setCategory(cartGoodsDetailDto.getClassificationId());
         createOrderProductDemoDto.setTax(cartGoodsDetailDto.getTax());
         createOrderProductDemoDto.setTaxId(cartGoodsDetailDto.getTaxId());
         createOrderProductDemoDto.setClassificationId(cartGoodsDetailDto.getClassificationId());

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

@@ -13,10 +13,7 @@ import cn.freemud.entities.vo.encircle.CreateReserveOrderVo;
 import cn.freemud.enums.*;
 import cn.freemud.interceptor.ServiceException;
 import cn.freemud.redis.RedisCache;
-import cn.freemud.service.AppOrderService;
-import cn.freemud.service.EncircleOrderService;
-import cn.freemud.service.MallOrderService;
-import cn.freemud.service.OrderAdapterService;
+import cn.freemud.service.*;
 import cn.freemud.utils.RedisUtil;
 import cn.freemud.utils.ResponseUtil;
 import com.freemud.api.assortment.datamanager.entity.vo.AssortmentCustomerInfoVo;

order-management/pom.xml

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

order-management/src/main/java/cn/freemud/management/adapter/McCafeCouponAdapter.java

 package cn.freemud.management.adapter;
 
 import cn.freemud.base.constant.Version;
-import cn.freemud.management.entities.dto.request.coupon.MCCafeCouponLockRequest;
-import cn.freemud.management.entities.dto.request.coupon.MCCafeCouponRequest;
-import cn.freemud.management.entities.dto.request.coupon.MCCafeProductRedeemVo;
-import cn.freemud.management.entities.dto.request.coupon.MCCafeTransactionVo;
+import cn.freemud.management.entities.dto.request.order.MCCafeCouponLockRequest;
+import cn.freemud.management.entities.dto.request.order.MCCafeCouponRequest;
+import cn.freemud.management.entities.dto.request.order.MCCafeProductRedeemVo;
+import cn.freemud.management.entities.dto.request.order.MCCafeTransactionVo;
 import cn.freemud.management.enums.ActivityTypeEnum;
 import cn.freemud.management.enums.CouponReqTypeEnum;
 import cn.freemud.management.enums.MCCafeChannelEnum;

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

 package cn.freemud.management.service.handle;
 
 import cn.freemud.management.adapter.McCafeCouponAdapter;
-import cn.freemud.management.entities.dto.request.coupon.MCCafeCouponLockRequest;
-import cn.freemud.management.entities.dto.request.coupon.MCCafeCouponRequest;
+import cn.freemud.management.entities.dto.request.order.MCCafeCouponLockRequest;
+import cn.freemud.management.entities.dto.request.order.MCCafeCouponRequest;
 import cn.freemud.management.thirdparty.CouponOfflineMCCafeClient;
 import com.alibaba.fastjson.JSONObject;
 import com.freemud.application.sdk.api.couponcenter.offline.response.CouponBaseResponse;

ordercenter-sdk/pom.xml

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