Commit 5295ada7 by huiyang.chen

Merge branch 'feature-2020/6/29-1.9.29-围餐-会阳' into develop

parents 166984b1 8ce317f8
...@@ -955,7 +955,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -955,7 +955,7 @@ public class OrderServiceImpl implements Orderservice {
} }
} }
if (IappIdType.WC_XCX.getCode().equals(userInfo.getIappId())) { /*if (IappIdType.WC_XCX.getCode().equals(userInfo.getIappId())) {
if(CollectionUtils.isNotEmpty(queryOrderResponseVo.getProducts()) ) { if(CollectionUtils.isNotEmpty(queryOrderResponseVo.getProducts()) ) {
queryOrderResponseVo.getProducts().stream().forEach(each -> { queryOrderResponseVo.getProducts().stream().forEach(each -> {
orderBean.getProductList().forEach(var -> { orderBean.getProductList().forEach(var -> {
...@@ -967,7 +967,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -967,7 +967,7 @@ public class OrderServiceImpl implements Orderservice {
}); });
} }
} }*/
// 判断是否有裂变活动 订单扩展信息判断必须有wxappid // 判断是否有裂变活动 订单扩展信息判断必须有wxappid
String extInfo = response.getData().getExtInfo(); String extInfo = response.getData().getExtInfo();
......
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