Merge branch 'feature/2.0.1-collageOrder-刘鹏飞' into develop

# Conflicts:
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/CreateOrderProductRequest.java

@@ -185,6 +185,11 @@ public class CreateOrderProductRequest extends BaseConfig {
     private String userId;
 
     /**
+     * 加购人openId
+     */
+    private String openId;
+
+    /**
      * 加购人昵称
      */
     private String nickName;

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/order/QueryOrdersResponse.java

@@ -567,6 +567,11 @@ public class QueryOrdersResponse {
                 private String userId;
 
                 /**
+                 * 加购人openId
+                 */
+                private String openId;
+
+                /**
                  * 加购人昵称
                  */
                 private String nickName;

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

@@ -42,6 +42,11 @@ public class CartGoods {
     private String userId;
 
     /**
+     * 购买人的的openId
+     */
+    private String openId;
+
+    /**
      * 购买人的的头像
      */
     private String photoUrl;

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

@@ -15,6 +15,7 @@ import lombok.Data;
 @Data
 public class CollageMemberState {
     private String userId;
+    private String openId;
     private String nickName;
     private String photoUrl;
     private Boolean state;

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

@@ -50,6 +50,11 @@ public class CollageOrderDto
     private String currentUserId;
 
     /**
+     * 拼单当前用户openId
+     */
+    private String openId;
+
+    /**
      * 拼单当前用户昵称
      */
     private String nickName;

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

@@ -511,6 +511,7 @@ public class CollageOrderBaseServiceImpl implements CollageOrderBaseService {
     public void initCollageMemberState(String collageMemberStateHashKey, CollageOrderDto collageOrderDto) {
         CollageMemberState collageMemberState = new CollageMemberState();
         collageMemberState.setUserId(collageOrderDto.getCurrentUserId());
+        collageMemberState.setOpenId(collageOrderDto.getOpenId());
         collageMemberState.setNickName(collageOrderDto.getNickName());
         collageMemberState.setPhotoUrl(collageOrderDto.getPhotoUrl());
         collageMemberState.setState(CollageMemberStateType.SHOPPING.getValue());
@@ -526,6 +527,7 @@ public class CollageOrderBaseServiceImpl implements CollageOrderBaseService {
     public void addCollageMemberState(String collageMemberStateHashKey, CollageOrderDto collageOrderDto) {
         CollageMemberState collageMemberState = new CollageMemberState();
         collageMemberState.setUserId(collageOrderDto.getCurrentUserId());
+        collageMemberState.setOpenId(collageOrderDto.getOpenId());
         collageMemberState.setNickName(collageOrderDto.getNickName());
         collageMemberState.setPhotoUrl(collageOrderDto.getPhotoUrl());
         collageMemberState.setState(CollageMemberStateType.SHOPPING.getValue());

order-application-service/src/main/java/cn/freemud/entities/dto/shoppingCart/ShoppingCartGoodsDto.java

@@ -230,6 +230,11 @@ public class ShoppingCartGoodsDto {
         private String userId;
 
         /**
+         * 加购人openId
+         */
+        private String openId;
+
+        /**
          * 加购人昵称
          */
         private String userName;

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

@@ -49,6 +49,11 @@ public class ProductVo {
     private String userId;
 
     /**
+     * 加购人openId
+     */
+    private String openId;
+
+    /**
      * 加购人昵称
      */
     private String nickName;

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

@@ -26,6 +26,11 @@ public class UserProductVo {
     private String userId;
 
     /**
+     * 加购人openId
+     */
+    private String openId;
+
+    /**
      * 加购人昵称
      */
     private String nickName;

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

@@ -132,16 +132,15 @@ public class CollageOrderServiceImpl implements CollageOrderService {
 
         List<QueryOrdersResponse.DataBean.OrderBean.ProductBean> productList = order.getProductList();
 
-        // 群收款支付用户userId列表
-        List<String> payerUserIdList = productList.stream().filter(product -> !userInfo.getMemberId().equals(product.getUserId())).map(QueryOrdersResponse.DataBean.OrderBean.ProductBean::getUserId).distinct().collect(Collectors.toList());
-
+        // 群收款支付用户列表
+        List<String> payerOpenIdList = productList.stream().filter(product -> !userInfo.getMemberId().equals(product.getUserId())).map(QueryOrdersResponse.DataBean.OrderBean.ProductBean::getOpenId).distinct().collect(Collectors.toList());
+        // 组装群收款付款人列表
         GroupBuyRequest.UserInfo groupBuyUserInfo;
-        for (String payerUserId : payerUserIdList) {
-            Long amount = productList.stream().filter(product -> payerUserId.equals(product.getUserId())).map(QueryOrdersResponse.DataBean.OrderBean.ProductBean::getSalePrice).reduce(Long::sum).get();
+        for (String payerOpenId : payerOpenIdList) {
+            Long amount = productList.stream().filter(product -> payerOpenId.equals(product.getOpenId())).map(QueryOrdersResponse.DataBean.OrderBean.ProductBean::getSalePrice).reduce(Long::sum).get();
 
             groupBuyUserInfo = new GroupBuyRequest.UserInfo();
-            // TODO 新增openid值传入
-            groupBuyUserInfo.setOpenid("oORZK5A8hrejg0uBVSlkpv-KPgv4");
+            groupBuyUserInfo.setOpenid(payerOpenId);
             groupBuyUserInfo.setAmount(Integer.parseInt(String.valueOf(amount)));
             userInfoList.add(groupBuyUserInfo);
         }

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

@@ -1143,6 +1143,7 @@ public class OrderServiceImpl implements Orderservice {
 
             UserProductVo userProductVo = new UserProductVo();
             userProductVo.setUserId(products.get(0).getUserId());
+            userProductVo.setOpenId(products.get(0).getOpenId());
             userProductVo.setNickName(products.get(0).getNickName());
             userProductVo.setPhotoUrl(products.get(0).getPhotoUrl());
             userProductVo.setProducts(products);

order-application-service/src/test/java/cn.freemud/client/EcologyAdminApplicationClientTest.java

@@ -6,6 +6,7 @@ import cn.freemud.entities.vo.WechatGroupBuyVo;
 import cn.freemud.service.thirdparty.EcologyAdminApplicationClient;
 import cn.freemud.service.thirdparty.WeChatClient;
 import com.freemud.sdk.api.assortment.order.request.order.GroupBuyRequest;
+import com.freemud.sdk.api.assortment.order.response.order.GroupBuyResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -97,7 +98,7 @@ public class EcologyAdminApplicationClientTest {
 
         //String requestUrl = "https://api.weixin.qq.com/wxa/business/groupBuy/createOrder?access_token=" + accessToken;
 
-        String result = weChatClient.groupBuyCreateOrder(accessToken, groupBuyRequest);
-        log.info(result);
+        GroupBuyResponse groupBuyResponse = weChatClient.groupBuyCreateOrder(accessToken, groupBuyRequest);
+        log.info(groupBuyResponse.toString());
     }
 }

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/create/OrderItemCreateReq.java

@@ -129,6 +129,11 @@ public class OrderItemCreateReq {
     private String userId;
 
     /**
+     * 加购人openId
+     */
+    private String openId;
+
+    /**
      * 加购人昵称
      */
     private String nickName;

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/response/orderInfo/OrderItemResp.java

@@ -109,6 +109,9 @@ public class OrderItemResp {
     //加购人ID
     private String userId;
 
+    //加购人openId
+    private String openId;
+
     //加购人昵称
     private String nickName;
 

shopping-cart-application-service/src/main/java/cn/freemud/adapter/ShoppingCartConvertAdapter.java

@@ -103,6 +103,7 @@ public class ShoppingCartConvertAdapter {
         cartGoodsDetailDto.setOriginalPrice(cartGoods.getOriginalPrice());
 //        cartGoodsDetailDto.setTotalDiscountAmount(0);
         cartGoodsDetailDto.setUserId(cartGoods.getUserId());
+        cartGoodsDetailDto.setOpenId(cartGoods.getOpenId());
         cartGoodsDetailDto.setUserName(cartGoods.getUserName());
         cartGoodsDetailDto.setPhotoUrl(cartGoods.getPhotoUrl());
         cartGoodsDetailDto.setSalePrice(cartGoods.getOriginalPrice());

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/shoppingCart/ShoppingCartGoodsDto.java

@@ -180,6 +180,11 @@ public class ShoppingCartGoodsDto {
         private String userId;
 
         /**
+         * 购买人的的openId
+         */
+        private String openId;
+
+        /**
          * 购买人的的头像
          */
         private String photoUrl;

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

@@ -44,6 +44,11 @@ public class CartGoods {
     private String userId;
 
     /**
+     * 购买人的的openId
+     */
+    private String openId;
+
+    /**
      * 购买人的的头像
      */
     private String photoUrl;

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

@@ -30,6 +30,11 @@ public class ShoppingCartCollageGoodsResponseVo extends ShoppingCartGoodsBaseRes
     private String userName;
 
     /**
+     * 用户openId
+     */
+    private String openId;
+
+    /**
      * 用户头像
      */
     private String photoUrl;

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

@@ -103,6 +103,7 @@ public class CollageOrderServiceImpl implements CollageOrderService {
         CustomerInfoVo userInfo = this.getUserInfo(request.getSessionId());
         collageOrderDto.setCreateCollageUserId(userInfo.getMemberId());
         collageOrderDto.setCurrentUserId(userInfo.getMemberId());
+        collageOrderDto.setOpenId(userInfo.getOpenId());
         collageOrderDto.setNickName(userInfo.getNickName());
         collageOrderDto.setPhotoUrl(userInfo.getPhotoUrl());
 
@@ -254,6 +255,7 @@ public class CollageOrderServiceImpl implements CollageOrderService {
 
         // 设置拼单发起人
         collageOrderDto.setCreateCollageUserId(request.getCreateCollageUserId());
+        collageOrderDto.setOpenId(userInfo.getOpenId());
         collageOrderDto.setNickName(userInfo.getNickName());
         collageOrderDto.setPhotoUrl(userInfo.getPhotoUrl());
 

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

@@ -141,6 +141,7 @@ public class ShoppingCartCollageServiceImpl extends AbstractShoppingCartImpl imp
 
         CartGoods cartGoods = ShoppingCartConvertAdapter.convent2CartGoods(addShoppingCartGoodsRequestVo);
         cartGoods.setUserId(currentUserId);
+        cartGoods.setOpenId(currentUserInfoVo.getOpenId());
         cartGoods.setUserName(currentUserInfoVo.getNickName());
         cartGoods.setPhotoUrl(currentUserInfoVo.getPhotoUrl());
 
@@ -250,6 +251,7 @@ public class ShoppingCartCollageServiceImpl extends AbstractShoppingCartImpl imp
             shoppingCartCollageGoodsResponseVo.setUserName(cmbs.getNickName());
             shoppingCartCollageGoodsResponseVo.setPhotoUrl(cmbs.getPhotoUrl());
             shoppingCartCollageGoodsResponseVo.setUid(cmbs.getUserId());
+            shoppingCartCollageGoodsResponseVo.setOpenId(cmbs.getOpenId());
             // 包装费
             Long packPrice = 0L;
             // 商品数量
@@ -496,6 +498,7 @@ public class ShoppingCartCollageServiceImpl extends AbstractShoppingCartImpl imp
             ShoppingCartCollageGoodsResponseVo shoppingCartCollageGoodsResponseVo = new ShoppingCartCollageGoodsResponseVo();
             shoppingCartCollageGoodsResponseVo.setProducts(cartGoods);
             shoppingCartCollageGoodsResponseVo.setUid(currentUserId);
+            shoppingCartCollageGoodsResponseVo.setOpenId(currentUserInfoVo.getOpenId());
             shoppingCartCollageGoodsResponseVo.setUserName(currentUserInfoVo.getNickName());
             shoppingCartCollageGoodsResponseVo.setPhotoUrl(currentUserInfoVo.getPhotoUrl());
             shoppingCartCollageGoodsResponseVo.setPackPrice(shoppingCartGoodsResponseVo.getNewPackAmount());