Merge remote-tracking branch 'origin/qa' into qa

order-application-service/src/main/java/cn/freemud/service/impl/CollageOrderServiceImpl.java

@@ -74,22 +74,6 @@ public class CollageOrderServiceImpl implements CollageOrderService {
 
         BaseResponse orderCreateResponse = this.orderService.createOrderNew(createOrderVo);
 
-        /*
-        Object result = orderCreateResponse.getResult();
-
-        if (null != result) {
-            String oid = null;
-            if (result instanceof CreateOrderOperateDto && null != ((CreateOrderOperateDto) result).getProductOrderBean()) {
-                oid = ((CreateOrderOperateDto) result).getProductOrderBean().getOid();
-            } else if (result instanceof CreateOrderResponseVo) {
-                oid = ((CreateOrderResponseVo) result).getOid();
-            }
-
-            if (null != oid) {
-
-            }
-        }
-         */
         return orderCreateResponse;
     }
 

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

@@ -87,7 +87,7 @@ public class CollageOrderServiceImpl implements CollageOrderService {
         if (null != collageMemberStateList && collageMemberStateList.size() > 0 && collageMemberStateList.stream().filter(member -> member.getUserId().equals(currentUserId)).count() > 0) {
             collageOrderResponseVo.setCollageMemberStateList(collageMemberStateList);
             // 未加购完毕人数统计
-            collageOrderResponseVo.setShoppingMemberNum(collageMemberStateList.stream().filter(member -> member.getState() == CollageMemberStateType.SHOPPING.getValue()).collect(Collectors.toList()).size());
+            collageOrderResponseVo.setShoppingMemberNum(collageMemberStateList.stream().filter(member -> CollageMemberStateType.SHOPPING.getValue().equals(member.getState())).collect(Collectors.toList()).size());
 
             return ResponseUtil.success(collageOrderResponseVo);
         } else {

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

@@ -277,13 +277,15 @@ public class ShoppingCartCollageServiceImpl extends AbstractShoppingCartImpl imp
             // 商品数量
             Integer productsCount = 0;
             // 商品原价总价
+            Long originalAmount = 0L;
             Long totalAmount = 0L;
             List<CartGoods> products = userGoods.get(cmbs.getUserId());
             if(products != null && !products.isEmpty()){
                 for(CartGoods cg :products){
                     packPrice = packPrice + (cg.getPackPrice() == null ? 0 : cg.getPackPrice());
                     productsCount = productsCount + (cg.getQty() == null ? 0 : cg.getQty());
-                    totalAmount = totalAmount + (cg.getOriginalAmount() == null ? 0 : cg.getOriginalAmount());
+                    originalAmount = originalAmount + (cg.getOriginalAmount() == null ? 0 : cg.getOriginalAmount());
+                    totalAmount = totalAmount + (cg.getAmount() == null ? 0 : cg.getAmount());
                 }
             }
             // 只有总的包装费不为0、null时才计算个人包装费
@@ -292,7 +294,7 @@ public class ShoppingCartCollageServiceImpl extends AbstractShoppingCartImpl imp
             }
             shoppingCartCollageGoodsResponseVo.setProductsCount(productsCount);
             shoppingCartCollageGoodsResponseVo.setTotalAmount(totalAmount);
-            shoppingCartCollageGoodsResponseVo.setOriginalTotalAmount(totalAmount);
+            shoppingCartCollageGoodsResponseVo.setOriginalTotalAmount(originalAmount);
             shoppingCartCollageGoodsResponseVo.setProducts(products);
             shoppingCartCollageGoodsResponseVo.setStates(cmbs.getState());
             userProducts.add(shoppingCartCollageGoodsResponseVo);

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

@@ -258,14 +258,30 @@ public class ShoppingCartMCoffeeServiceImpl {
                     //使用券的是，如果购物车已经存在这个券，先清除，再添加
                     cartGoods.setQty(0);
                 }
-                if (StringUtils.isNotEmpty(goodsId) && StringUtils.isNotEmpty(couponCode) && goodsId.equals(cartGoods.getSkuId()) && StringUtils.isBlank(cartGoods.getCouponCode()) && isContinue) {
+                if (StringUtils.isNotEmpty(goodsId) && StringUtils.isNotEmpty(couponCode) && isContinue
+                        && goodsId.equals(cartGoods.getSkuId()) && StringUtils.isBlank(cartGoods.getCouponCode())) {
                     // 如果购物车商品存在商品规格，替换时复制规格信息
                     if (CollectionUtils.isNotEmpty(cartGoods.getSpecialExtra())) {
                         addShoppingCartGoodsRequestVo.setSpecialExtra(cartGoods.getSpecialExtra());
                     }
                     if (cartGoods.getQty() > 1 ){
                         cartGoods.setQty(cartGoods.getQty() - 1);
-                    }else {
+                    } else {
+                        //如果购物车存在相同的商品，则先删除购物车商品，在新增商品券购物车行
+                        cartGoods.setQty(0);
+                    }
+                    isContinue= false;
+                }
+                if(StringUtils.isNotEmpty(goodsId) && StringUtils.isNotEmpty(couponCode) && isContinue
+                        && cartGoods.getName().equals("啡常搭") && CollectionUtils.isNotEmpty(cartGoods.getProductComboList()) && cartGoods.getProductComboList().size() == 1
+                        && CollectionUtils.isEmpty(cartGoods.getProductGroupList()) && cartGoods.getProductComboList().get(0).getSkuId().equals(goodsId)) {
+                    // 如果购物车商品存在商品规格，替换时复制规格信息
+                    if (CollectionUtils.isNotEmpty(cartGoods.getProductComboList().get(0).getSpecialExtra())) {
+                        addShoppingCartGoodsRequestVo.setSpecialExtra(cartGoods.getProductComboList().get(0).getSpecialExtra());
+                    }
+                    if (cartGoods.getQty() > 1 ){
+                        cartGoods.setQty(cartGoods.getQty() - 1);
+                    } else {
                         //如果购物车存在相同的商品，则先删除购物车商品，在新增商品券购物车行
                         cartGoods.setQty(0);
                     }