Merge remote-tracking branch 'remotes/origin/feature/2.0.1-collageOrder-刘鹏飞' into develop

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	order-application-service/pom.xml

assortment-shoppingcart-sdk/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>assortment-shoppingcart-sdk</artifactId>
-    <version>1.1.6.RELEASE</version>
+    <version>2.0.3-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

assortment-shoppingcart-sdk/readme.md

@@ -7,4 +7,5 @@
 | 1.1.4-SNAPSHOT| 券码接口修改为channel_codes  | 梁崇福 | 2020-06-08  |
 | 1.1.5-SNAPSHOT| 增加统计分类编号：classificationId,classificationName  |  | 2020-06-12  |
 | 2.0.0-SNAPSHOT| 商品加料  | 李小二 | 2020-08-17  |
-| 2.0.1-SNAPSHOT| 拼单  | miaohhui | 2020-08-17  |
\ No newline at end of file
+| 2.0.1-SNAPSHOT| 拼单  | miaohhui | 2020-08-17  |
+| 2.0.3-SNAPSHOT| 拼单  | 刘鹏飞 | 2020-11-20  |
\ No newline at end of file

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/service/CollageOrderBaseService.java

@@ -127,4 +127,11 @@ public interface CollageOrderBaseService {
      * 清除用户在店铺下的拼单时间
      */
     BaseResponse cleanCollageMemberAddTime(CollageOrderDto collageOrderDto);
+
+    /**
+     * 修改用户加购状态 加购完毕
+     * @param collageOrderDto
+     * @return
+     */
+    BaseResponse getOneCollageMemberState(CollageOrderDto collageOrderDto);
 }

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/service/impl/CollageOrderBaseServiceImpl.java

@@ -219,7 +219,7 @@ public class CollageOrderBaseServiceImpl implements CollageOrderBaseService {
             return CartResponseUtil.success();
         } catch (Exception e) {
             ErrorLog.printErrorLog("修改拼单用户加购状态为继续选购异常", "CollageOrderBaseServiceImpl/shoppingCollageMemberState", this.collageOrderRequest(collageOrderDto),  e);
-            return CartResponseUtil.success("修改拼单用户加购状态为继续选购异常");
+            return CartResponseUtil.error("修改拼单用户加购状态为继续选购异常");
         }
     }
 
@@ -287,6 +287,17 @@ public class CollageOrderBaseServiceImpl implements CollageOrderBaseService {
         return CartResponseUtil.success();
     }
 
+    @Override
+    public BaseResponse<CollageMemberState> getOneCollageMemberState(CollageOrderDto collageOrderDto) {
+        try {
+            String collageMemberStateKey = this.genCollageMemberStateHashKey(collageOrderDto.getPartnerId(), collageOrderDto.getStoreId(), collageOrderDto.getCreateCollageUserId());
+            return CartResponseUtil.success(this.getCollageMemberState(collageMemberStateKey,collageOrderDto.getCurrentUserId()));
+        } catch (Exception e) {
+            ErrorLog.printErrorLog("获取拼单用户状态异常", "CollageOrderBaseServiceImpl/getOneCollageMemberState", this.collageOrderRequest(collageOrderDto),  e);
+            return CartResponseUtil.error("获取拼单用户状态异常");
+        }
+    }
+
     /**
      * 构建门店下拼单人员hashKey
      * @param partnerId
@@ -442,7 +453,7 @@ public class CollageOrderBaseServiceImpl implements CollageOrderBaseService {
         collageMemberState.setUserId(collageOrderDto.getCurrentUserId());
         collageMemberState.setNickName(collageOrderDto.getNickName());
         collageMemberState.setPhotoUrl(collageOrderDto.getPhotoUrl());
-        collageMemberState.setState(CollageMemberStateType.READY.getValue());
+        collageMemberState.setState(CollageMemberStateType.SHOPPING.getValue());
         redisTemplate.boundHashOps(collageMemberStateHashKey).put(collageOrderDto.getCurrentUserId(), collageMemberState);
         redisTemplate.boundHashOps(collageMemberStateHashKey).expire(1, TimeUnit.HOURS);
     }

shopping-cart-application-service/pom.xml

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

shopping-cart-application-service/src/main/java/cn/freemud/controller/ShoppingCartCollageController.java

@@ -106,4 +106,14 @@ public class ShoppingCartCollageController {
     public BaseResponse queryCarVer(@Validated @LogParams @RequestBody CollageShoppingCartVerRequestVo request) {
         return SDKCommonBaseContextWare.getBean(ShoppingCartCollageServiceImpl.class).queryCarVer(request);
     }
+
+    /**
+     * 查询购车信息无配送费
+     * SVC卡支付check，check购物车金额加配送费小于储值卡金额
+     */
+    @ApiAnnotation(logMessage = "listCartGoodsCheck")
+    @PostMapping(value = "/listCartGoodsCheck")
+    public BaseResponse listCartGoodsCheck(@Validated @LogParams @RequestBody ShoppingCartInfoRequestVo request) {
+        return SDKCommonBaseContextWare.getBean(ShoppingCartCollageServiceImpl.class).getGoodsListCheck(request);
+    }
 }

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

@@ -34,4 +34,28 @@ public class ShoppingCartCollageGoodsResponseVo extends ShoppingCartGoodsBaseRes
      */
     private String photoUrl;
 
+    /**
+     * 选好了状态
+     */
+    private Boolean states;
+
+    /**
+     * 包装费
+     */
+    private Long packPrice;
+
+    /**
+     * 商品总数
+     */
+    private Integer productsCount;
+
+    /**
+     * 原总价
+     */
+    private Long originalTotalAmount;
+    /**
+     * 现总价
+     */
+    private Long totalAmount;
+
 }

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

@@ -41,6 +41,12 @@ public class ShoppingCartInfoRequestVo extends BaseRequestVo {
      */
     private String createCollageUserId;
 
+    /**
+     * 拼单场景使用
+     * 0个人购物车1整个购物车
+     */
+    private Integer type;
+
     @NotEmpty(message = "appId不能为空")
     private String appId;
     /**

shopping-cart-application-service/src/main/java/cn/freemud/enums/ResponseResult.java

@@ -162,6 +162,7 @@ public enum ResponseResult {
     COLLAGE_CREATE_NOT_OUT_OF("49009", "拼单发起人不能退出拼单，请取消"),
     COLLAGE_MEMBER_NOT_ADD("49010", "用户未参加拼单，请确认"),
     COLLAGE_MEMBER_NOT_CREATE("49011", "只有拼单发起者才能移除拼单人员，请确认"),
+    COLLAGE_STATES_CHOOSE("49012", "获取用户选购状态失败"),
 
     /**
      * 微信卡券