|
|
@@ -40,6 +40,7 @@ import com.yami.shop.bean.param.*;
|
|
|
import com.yami.shop.common.config.Constant;
|
|
|
import com.yami.shop.common.exception.GlobalException;
|
|
|
import com.yami.shop.common.util.Arith;
|
|
|
+import com.yami.shop.common.util.Json;
|
|
|
import com.yami.shop.common.util.PageAdapter;
|
|
|
import com.yami.shop.common.util.PageParam;
|
|
|
import com.yami.shop.dao.*;
|
|
|
@@ -210,7 +211,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
|
|
|
// 提交订单
|
|
|
eventPublisher.publishEvent(new SubmitOrderEvent(mergerOrder, orderList));
|
|
|
// 插入订单
|
|
|
- orderList.forEach(orderMapper::insert);
|
|
|
+ orderList.forEach(c->{
|
|
|
+ if (c.getDvyType().equals(1) && c.getHbOrderStatus()!=0) {
|
|
|
+ c.setHbOrderStatus(1);
|
|
|
+ }
|
|
|
+ orderMapper.insert(c);
|
|
|
+ });
|
|
|
List<OrderItem> orderItems = orderList.stream()
|
|
|
.flatMap(order -> order.getOrderItems().stream()
|
|
|
)
|