Skip to content

O
order-group
Commit 35a5590c by 徐康
Options

排序

parent a4da27b8
Showing with 2 additions and 22 deletions
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
...@@ -596,17 +596,6 @@ public class ShoppingCartMCoffeeServiceImpl { ...@@ -596,17 +596,6 @@ public class ShoppingCartMCoffeeServiceImpl {
int size = cartGoodsList.size(); int size = cartGoodsList.size();
for(int i=0;i<size;i++) { for(int i=0;i<size;i++) {
//先把月卡放到最后 //先把月卡放到最后
if(null != cartGoodsList.get(i) && Objects.equals(1,cartGoodsList.get(i).getIsB3S1Coupon())) {
CartGoods cartGoods = cartGoodsList.get(i);
if(i != size-1) {
cartGoodsList.remove(i);
cartGoodsList.add(cartGoods);
break;
}
}
}
for(int i=0;i<size;i++) {
//先把月卡放到最后
if(null != cartGoodsList.get(i) && Objects.equals(1,cartGoodsList.get(i).getIsMonthCard())) { if(null != cartGoodsList.get(i) && Objects.equals(1,cartGoodsList.get(i).getIsMonthCard())) {
CartGoods cartGoods = cartGoodsList.get(i); CartGoods cartGoods = cartGoodsList.get(i);
if(i != size-1) { if(i != size-1) {
...@@ -869,17 +858,6 @@ public class ShoppingCartMCoffeeServiceImpl { ...@@ -869,17 +858,6 @@ public class ShoppingCartMCoffeeServiceImpl {
int size = cartGoodsList.size(); int size = cartGoodsList.size();
for(int i=0;i<size;i++) { for(int i=0;i<size;i++) {
//先把月卡放到最后 //先把月卡放到最后
if(null != cartGoodsList.get(i) && Objects.equals(1,cartGoodsList.get(i).getIsB3S1Coupon())) {
CartGoods cartGoods = cartGoodsList.get(i);
if(i != size-1) {
cartGoodsList.remove(i);
cartGoodsList.add(cartGoods);
break;
}
}
}
for(int i=0;i<size;i++) {
//先把月卡放到最后
if(null != cartGoodsList.get(i) && Objects.equals(1,cartGoodsList.get(i).getIsMonthCard())) { if(null != cartGoodsList.get(i) && Objects.equals(1,cartGoodsList.get(i).getIsMonthCard())) {
CartGoods cartGoods = cartGoodsList.get(i); CartGoods cartGoods = cartGoodsList.get(i);
if(i != size-1) { if(i != size-1) {
...@@ -1197,6 +1175,8 @@ public class ShoppingCartMCoffeeServiceImpl { ...@@ -1197,6 +1175,8 @@ public class ShoppingCartMCoffeeServiceImpl {
break; break;
} }
} }
}
for(int i=0;i<size;i++) {
if(shoppingCartGoodsDto.getProducts().get(i).getSkuId().equals(mcCafeTablewareSkuId)) { if(shoppingCartGoodsDto.getProducts().get(i).getSkuId().equals(mcCafeTablewareSkuId)) {
ShoppingCartGoodsDto.CartGoodsDetailDto cartGoodsDetailDto = shoppingCartGoodsDto.getProducts().get(i); ShoppingCartGoodsDto.CartGoodsDetailDto cartGoodsDetailDto = shoppingCartGoodsDto.getProducts().get(i);
cartGoodsDetailDto.setIsTableware(1); cartGoodsDetailDto.setIsTableware(1);
......
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