@@ -175,7 +175,6 @@ public class OrderController {
shopCartOrders.add(shopCartOrder);
}
shopCartOrderMergerDto.setDvyType(orderParam.getDvyType());
- shopCartOrderMergerDto.setDvyType(1);
//根据价格进行店铺、满减、商品项的价格升序操作
for (int n = 0; n < shopCartOrders.size(); n++) {