Merge branch 'feature/20201208_collageOrder_miaohui' into develop

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

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

@@ -192,6 +192,8 @@ public class OrderServiceImpl implements Orderservice {
     private String cloud_print_exchange;
     @Value("${collage.pre_order_pay.goods_tag}")
     private String collageGoodsTag;
+    @Value("${collage.pre_order_pay.goods_tag_list}")
+    private String collageGoodsTagList;
 
     /**
      * coco商户
@@ -2715,7 +2717,11 @@ public class OrderServiceImpl implements Orderservice {
             if (null != orderBean.getMarketingType() && OrderMarketType.COLLAGE.getIndex() == orderBean.getMarketingType()) {
                 // 拼单人数大于1人时参加拼单补贴
                 if (null != orderBean.getProductList() && orderBean.getProductList().stream().map(QueryOrdersResponse.DataBean.OrderBean.ProductBean::getUserId).distinct().collect(Collectors.toList()).size() > 1) {
-                    request.setGoodsTag(collageGoodsTag);
+                    Map<String, String> goodsTagMap = this.goodsTagMap();
+                    if (null != goodsTagMap && !goodsTagMap.isEmpty()) {
+                        // 根据商户号获取
+                        request.setGoodsTag(goodsTagMap.get(orderBean.getCompanyId()) == null ? collageGoodsTag : goodsTagMap.get(orderBean.getCompanyId()));
+                    }
                 }
             }
             // add by miaohui for 拼单群收款判断拼单人数大于1时参与微信平台补贴活动，创建预支付时上送goodsTag，后续抽成促销服务活动时删除此逻辑 end
@@ -3652,4 +3658,16 @@ public class OrderServiceImpl implements Orderservice {
         orderRelationService.queryOrdrBuild(queryOrderResponseVo,response);
 
     }
+
+    private Map<String, String> goodsTagMap() {
+        Map<String, String> map = new HashMap<>();
+        try {
+            for (String pg : collageGoodsTagList.split(",")) {
+                map.put(pg.split(":")[0], pg.split(":")[1]);
+            }
+        } catch (Exception e) {
+            log.error("goodsTag解析失败：" + collageGoodsTagList);
+        }
+        return map;
+    }
 }

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

@@ -693,7 +693,7 @@ public class ShoppingCartCollageServiceImpl extends AbstractShoppingCartImpl imp
 
         //设置更新响应信息
         setAddAndUpdateResponse(shoppingCartGoodsResponseVo, calculationDiscountResult, cartGoodsList, shoppingCartGoodsResponseVo.getToastMsg(), partnerId, storeId, userId, ShoppingCartConstant.QUERY_INFO, shoppingCartInfoRequestVo);
-        //设置均摊信息，商品行信息
+        //设置均摊信息
         updateShoppingCartGoodsApportion(shoppingCartGoodsResponseVo, calculationDiscountResult, shoppingCartGoodsDto, premiumExchangeActivity, shoppingCartInfoRequestVo);
         // 计算第一次使用会员卡需多支付的金额  单位:分
         getNeedCardAmount(shoppingCartInfoRequestVo, shoppingCartGoodsDto);
@@ -703,13 +703,13 @@ public class ShoppingCartCollageServiceImpl extends AbstractShoppingCartImpl imp
         shoppingCartGoodsDto.setThresholdAmount(shoppingCartGoodsResponseVo.getThresholdAmount());
         shoppingCartGoodsDto.setIsDiscountDelivery(shoppingCartGoodsResponseVo.getIsDiscountDelivery());
         shoppingCartGoodsDto.setDiscountDeliveryActivityCode(shoppingCartGoodsResponseVo.getDiscountDeliveryActivityCode());
+        if (calculationDiscountResult != null){
+            shoppingCartGoodsDto.setSendPoint(calculationDiscountResult.getSendPointVo());
+        }
 
         // 购物车购买人包装费计算
         updatePackPrice(shoppingCartGoodsResponseVo, shoppingCartGoodsDto);
 
-        // 重新计算购物车行折扣总金额
-        updateTotalDiscountAmount(calculationDiscountResult, shoppingCartGoodsDto);
-
         return ResponseUtil.success(shoppingCartGoodsDto);
     }
 
@@ -734,22 +734,6 @@ public class ShoppingCartCollageServiceImpl extends AbstractShoppingCartImpl imp
         }
     }
 
-    /**
-     * 重新计算拼单购物车行总折扣金额
-     */
-    private void updateTotalDiscountAmount(ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult, ShoppingCartGoodsDto shoppingCartGoodsDto) {
-        if (null != shoppingCartGoodsDto && null != shoppingCartGoodsDto.getProducts() && null != calculationDiscountResult && null != calculationDiscountResult.getGoods()) {
-            shoppingCartGoodsDto.getProducts().stream().forEach(product -> {
-                calculationDiscountResult.getGoods().stream().forEach(goods -> {
-                    if (goods.getCartGoodsUid().equals(product.getCartGoodsUid())) {
-                        long totalDiscountAmount = product.getOriginalPrice() * product.getQty() - goods.getRealAmount();
-                        product.setTotalDiscountAmount(Integer.valueOf(String.valueOf(totalDiscountAmount)));
-                    }
-                });
-            });
-        }
-    }
-
     @Override
     public ActivityCalculationDiscountResponseDto.CalculationDiscountResult getActivityCalculationDiscountResponse(String partnerId, String storeId, String userId, String appId, Integer orderType, boolean isMember, List<CartGoods> cartGoodsList, List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons, List<ShoppingCartInfoRequestVo.SendGoods> sendGoodsList, String menuType, Long distributionFee) {
         ActivityCalculationDiscountRequestDto activityCalculationDiscountRequestDto = getActivityCalculationDiscountRequestDto(partnerId, storeId, userId, appId, orderType);