fix 买三赠一更新商品数量

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/UpdateShoppingCartGoodsQtyRequestVo.java

@@ -37,6 +37,11 @@ public class UpdateShoppingCartGoodsQtyRequestVo extends BaseRequestVo {
     @NotNull(message = "qty不能为空")
     private Integer qty;
 
+    /**
+     * 更新前商品数量
+     */
+    private Integer oldQty;
+
     private String version;
     /**
      * 购物车版本号（围餐）

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

@@ -284,6 +284,7 @@ public class ShoppingCartMCoffeeServiceImpl {
         String menuType = updateShoppingCartGoodsQtyRequestVo.getMenuType();
         Integer orderType = updateShoppingCartGoodsQtyRequestVo.getOrderType();
         String receiveId = updateShoppingCartGoodsQtyRequestVo.getReceiveId();
+        Integer oldQty = updateShoppingCartGoodsQtyRequestVo.getOldQty();
 
         // 先验证商品是否存在
         List<CartGoods> cartGoodsList = assortmentSdkService.getShoppingCart(partnerId, storeId, userId, null, null, shoppingCartBaseService);
@@ -291,7 +292,11 @@ public class ShoppingCartMCoffeeServiceImpl {
         for (CartGoods cartGoods_ : cartGoodsList) {
             if (cartGoodsUid.equals(cartGoods_.getCartGoodsUid())) {
                 cartGoods = cartGoods_;
-                cartGoods_.setQty(qty);
+                if (oldQty == null ) {
+                    cartGoods_.setQty(qty);
+                }else {
+                    cartGoods_.setQty(cartGoods_.getQty() - (oldQty - qty));
+                }
                 break;
             }
         }

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

@@ -647,6 +647,7 @@ public class CouponDiscountCalculation {
                                     cartGoods1.setAmount(count - goodsDiscount.getDiscount());
                                     cartGoods1.setCouponName(goodsDiscount.getActivityName());
                                     cartGoods1.setOriginalAmount(count);
+                                    cartGoods1.setCartGoodsUid(cartGoods.getCartGoodsUid());
                                     cartGoodsListNew.add(cartGoods1);
                                     qty = qty - goodsDiscount.getActualGoodsNumber();
                                 }