sunyu::update::fix bug about monthCard

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/shoppingCart/ShoppingCartGoodsDto.java

@@ -4,6 +4,7 @@ import cn.freemud.entities.dto.OrderProductAddInfo;
 import cn.freemud.entities.dto.activity.ActivityDiscountsDto;
 import cn.freemud.entities.dto.activity.ShareDiscountActivityDto;
 import cn.freemud.entities.vo.CartGoods;
+import cn.freemud.entities.vo.MonthCardVo;
 import cn.freemud.entities.vo.SubtractStockVO;
 import com.alibaba.fastjson.JSON;
 import lombok.Builder;
@@ -254,6 +255,18 @@ public class ShoppingCartGoodsDto {
          */
         private Integer isTableware = 0;
         /**
+         * 是否是月享卡商品
+         */
+        private int isMonthCard;
+        /**
+         * 是否为种子券商品 1:是；0:否
+         */
+        private int isSeedCouponGoods;
+        /**
+         * 月享卡信息
+         */
+        private MonthCardVo monthCardInfo;
+        /**
          * 商品货号
          */
         private String productCode;

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java

@@ -757,11 +757,11 @@ public class ShoppingCartMCoffeeServiceImpl {
             int size = shoppingCartGoodsDto.getProducts().size();
             for(int i=0;i<size;i++) {
                 //先把月卡放到最后
-                if(Objects.equals(1,cartGoodsList.get(i).getIsMonthCard())) {
-                    CartGoods cartGoods = cartGoodsList.get(i);
+                if(Objects.equals(1,shoppingCartGoodsDto.getProducts().get(i).getIsMonthCard())) {
+                    ShoppingCartGoodsDto.CartGoodsDetailDto cartGoodsDetailDto = shoppingCartGoodsDto.getProducts().get(i);
                     if(i != size-1) {
-                        cartGoodsList.remove(i);
-                        cartGoodsList.add(cartGoods);
+                        shoppingCartGoodsDto.getProducts().remove(i);
+                        shoppingCartGoodsDto.getProducts().add(cartGoodsDetailDto);
                         break;
                     }
                 }