|
|
@@ -128,7 +128,6 @@ public class SubmitServiceImpl implements SubmitService {
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
@Override
|
|
|
public ResponseJson<Map<String, Object>> generateOrder(SubmitDto submitDto) {
|
|
|
- log.info("参数----------------------------------------------------" + submitDto);
|
|
|
// 获取机构用户Id
|
|
|
Integer clubUserId = baseMapper.getUserIdByClubId(submitDto.getClubId());
|
|
|
if (null == clubUserId || clubUserId == 0) {
|
|
|
@@ -1669,8 +1668,6 @@ public class SubmitServiceImpl implements SubmitService {
|
|
|
//统计拆分的shop
|
|
|
//List<OrderShopPo> collect = shops.stream().filter(s -> shops.stream().filter(so -> so.getShopId().equals(s.getShopId())).count() > 1).collect(Collectors.toList());
|
|
|
//对拆分的shop重新计算子订单佣金，应付，不计入店铺满减
|
|
|
- log.info("原shoporderlist--------------------》" + shopOrderList);
|
|
|
- log.info("原orderproductlist--------------------》" + orderProductList);
|
|
|
ArrayList<OrderShopPo> orderShopPos = new ArrayList<>();
|
|
|
for (OrderShopPo shop : shops) {
|
|
|
// 供应商名称
|
