Authored by chenchao

Merge branch 'dev_order' into test6.8.2

... ... @@ -320,7 +320,7 @@ public class SellerOrderService implements IOrderListService, IOrderDetailServi
sellerOrderMapper.updateBySkups(soc, skupSet);
SellerOrderGoods sogc = new SellerOrderGoods();
sogc.setStatus(SkupStatus.SELF_CANCEL_PAY.getCode());
sogc.setStatus(SkupStatus.SELLER_CANCEL_SELL.getCode());
sellerOrderGoodsMapper.updateByPrimaryKeys(sogc, skupSet);
//4 划账记录
List<OrderInfo> orderList = soList.parallelStream().map(so->OrderInfo.builder()
... ...