Merge branch 'feature/20201208_collageOrder_miaohui' into 'develop'

goodsTag取值逻辑修正

See merge request !96

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

@@ -2718,10 +2718,8 @@ public class OrderServiceImpl implements Orderservice {
                 // 拼单人数大于1人时参加拼单补贴
                 if (null != orderBean.getProductList() && orderBean.getProductList().stream().map(QueryOrdersResponse.DataBean.OrderBean.ProductBean::getUserId).distinct().collect(Collectors.toList()).size() > 1) {
                     Map<String, String> goodsTagMap = this.goodsTagMap();
-                    if (null != goodsTagMap && !goodsTagMap.isEmpty()) {
-                        // 根据商户号获取
-                        request.setGoodsTag(goodsTagMap.get(orderBean.getCompanyId()) == null ? collageGoodsTag : goodsTagMap.get(orderBean.getCompanyId()));
-                    }
+                    String goodsTag = goodsTagMap.get(orderBean.getCompanyId());
+                    request.setGoodsTag(StringUtils.isBlank(goodsTag) ? collageGoodsTag : goodsTag);
                 }
             }
             // add by miaohui for 拼单群收款判断拼单人数大于1时参与微信平台补贴活动，创建预支付时上送goodsTag，后续抽成促销服务活动时删除此逻辑 end