Skip to content

O
order-group
Commit a2948ae1 by 缪晖
Options

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

goodsTag取值逻辑修正

See merge request !95
parents 870f063f f2896b45
Showing with 2 additions and 4 deletions
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
...@@ -2752,10 +2752,8 @@ public class OrderServiceImpl implements Orderservice { ...@@ -2752,10 +2752,8 @@ public class OrderServiceImpl implements Orderservice {
// 拼单人数大于1人时参加拼单补贴 // 拼单人数大于1人时参加拼单补贴
if (null != orderBean.getProductList() && orderBean.getProductList().stream().map(QueryOrdersResponse.DataBean.OrderBean.ProductBean::getUserId).distinct().collect(Collectors.toList()).size() > 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(); Map<String, String> goodsTagMap = this.goodsTagMap();
if (null != goodsTagMap && !goodsTagMap.isEmpty()) { String goodsTag = goodsTagMap.get(orderBean.getCompanyId());
// 根据商户号获取 request.setGoodsTag(StringUtils.isBlank(goodsTag) ? collageGoodsTag : goodsTag);
request.setGoodsTag(goodsTagMap.get(orderBean.getCompanyId()) == null ? collageGoodsTag : goodsTagMap.get(orderBean.getCompanyId()));
}
} }
} }
// add by miaohui for 拼单群收款判断拼单人数大于1时参与微信平台补贴活动，创建预支付时上送goodsTag，后续抽成促销服务活动时删除此逻辑 end // add by miaohui for 拼单群收款判断拼单人数大于1时参与微信平台补贴活动，创建预支付时上送goodsTag，后续抽成促销服务活动时删除此逻辑 end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment