Merge branch 'feature/20210111_P5V3_太阳蛋需求_yu.sun'

# Conflicts:
#	assortment-shoppingcart-sdk/pom.xml
#	shopping-cart-application-service/pom.xml
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
#	shopping-cart-application-service/src/test/java/cn.freemud/service/CartTest.java
#	shopping-cart-application-service/src/test/java/cn.freemud/service/CouponTest.java

assortment-shoppingcart-sdk/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>assortment-shoppingcart-sdk</artifactId>
-    <version>1.2.1.RELEASE</version>
+    <version>1.2.2.RELEASE</version>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/domain/CartGoods.java

@@ -94,7 +94,10 @@ public class CartGoods {
      * 商品券名称
      */
     private String couponName;
-
+    /**
+     * 是否是太阳蛋商品
+     */
+    private int isSunnyCoupon = 0;
     private String spuId;
     private String skuId;
     /**

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

@@ -26,7 +26,6 @@ import com.freemud.application.sdk.api.storecenter.response.StoreResponse;
 import com.freemud.sdk.api.assortment.order.adapter.OrderSdkAdapter;
 import com.freemud.sdk.api.assortment.order.enums.OrderSourceType;
 import com.freemud.sdk.api.assortment.order.response.order.QueryOrdersResponse;
-import javafx.util.Pair;
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

order-management/src/main/java/cn/freemud/management/service/impl/OrderDeliveryService.java

@@ -2,32 +2,17 @@ package cn.freemud.management.service.impl;
 
 import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.base.log.LogTreadLocal;
-import cn.freemud.management.adapter.DeliverySdkAdapter;
 import cn.freemud.management.entities.dto.request.delivery.DeliveryOrderRequest;
-import cn.freemud.management.entities.dto.request.order.OrderManagerRequest;
-import cn.freemud.management.enums.DeliveryStatus;
 import cn.freemud.management.enums.ResponseResult;
 import cn.freemud.management.service.OrderBaseService;
 import cn.freemud.management.service.handle.DeliveryHandle;
-import cn.freemud.management.util.CommonResp;
 import cn.freemud.management.util.ResponseUtil;
-import com.freemud.application.sdk.api.deliverycenter.dto.CancelDeliveryOrderRequestDto;
-import com.freemud.application.sdk.api.deliverycenter.dto.CreateDeliveryOrderRequestDto;
-import com.freemud.application.sdk.api.deliverycenter.response.CreateDeliveryOrderResponseDto;
-import com.freemud.application.sdk.api.deliverycenter.response.DeliveryResponseDto;
-import com.freemud.application.sdk.api.deliverycenter.service.DeliveryService;
-import com.freemud.application.sdk.api.log.LogThreadLocal;
 import com.freemud.application.sdk.api.storecenter.request.StoreInfoRequest;
 import com.freemud.application.sdk.api.storecenter.response.StoreResponse;
 import com.freemud.application.sdk.api.storecenter.service.StoreCenterService;
-import com.freemud.sdk.api.assortment.order.enums.OrderSourceType;
 import com.freemud.sdk.api.assortment.order.response.order.QueryOrdersResponse;
-import javafx.util.Pair;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.ObjectUtils;
-import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 @Slf4j

shopping-cart-application-service/pom.xml

@@ -45,7 +45,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-shoppingcart-sdk</artifactId>
-            <version>1.2.1.RELEASE</version>
+            <version>1.2.2.RELEASE</version>
         </dependency>
         <!--   再来一单查询订单信息  -->
         <dependency>

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/CartGoods.java

@@ -69,6 +69,10 @@ public class CartGoods {
      */
     private Integer goodsType;
     /**
+     * 是否是太阳蛋商品
+     */
+    private int isSunnyCoupon=0;
+    /**
      * 1:称重菜 或 套餐商品包含称重菜
      */
     private boolean weightType;

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java

@@ -1523,6 +1523,7 @@ public class ShoppingCartMCoffeeServiceImpl {
         if (null != addShoppingCartGoodsRequestVo.getMonthCardInfo()){
             cartGoods.setMonthCardInfo(addShoppingCartGoodsRequestVo.getMonthCardInfo());
         }
+        cartGoods.setIsSunnyCoupon(addShoppingCartGoodsRequestVo.getIsSunnyCoupon());
         cartGoods.setGoodsType(goodsType);
         cartGoods.setExtra(addShoppingCartGoodsRequestVo.getExtra());
         cartGoods.setSpecialExtra(addShoppingCartGoodsRequestVo.getSpecialExtra());

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/entity/MCoffeeAddGoodsRequestVo.java

@@ -121,6 +121,11 @@ public class MCoffeeAddGoodsRequestVo {
     private Integer couponType;
 
     /**
+     * 是否是太阳蛋商品
+     */
+    private int isSunnyCoupon = 0;
+
+    /**
      * 优惠券号
      */
     private String couponCode;

shopping-cart-application-service/src/test/java/cn.freemud/service/CouponTest.java

@@ -253,6 +253,6 @@ public class CouponTest {
         logger.info(JSONObject.toJSONString(activeInsertRespVo));
     }
 
-    
+
 
 }