Merge branch 'KA-测试购物车list不重复调用'

# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/CalculationCommonService.java

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

@@ -1062,12 +1062,13 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo = goodsList.getResult();
             // fisherman -> 储值卡互斥需求 发现bug 导致返回购物车数据不对 当前时间节点无法修复 重新请求一次
             if (Objects.nonNull(shoppingCartInfoRequestVo.getEnableSharing()) && shoppingCartInfoRequestVo.getEnableSharing().compareTo(0) == 0) {
-                logUtil.info("fisherman -> 当前请求了2次计算操作", JSON.toJSONString(shoppingCartInfoRequestVo), JSON.toJSONString(shoppingCartGoodsResponseVo));
-                goodsList = getGoodsList(shoppingCartInfoRequestVo);
-                if (goodsList == null || !ResponseResult.SUCCESS.getCode().equals(goodsList.getCode())) {
-                    return goodsList;
+                if (shoppingCartGoodsResponseVo.getChanged() != null && shoppingCartGoodsResponseVo.getChanged() ==true) {
+                    goodsList = getGoodsList(shoppingCartInfoRequestVo);
+                    if (goodsList == null || !ResponseResult.SUCCESS.getCode().equals(goodsList.getCode())) {
+                        return goodsList;
+                    }
+                    shoppingCartGoodsResponseVo = goodsList.getResult();
                 }
-                shoppingCartGoodsResponseVo = goodsList.getResult();
             }
             //SVC卡支付
             SVCCardPay(cardCodes, shoppingCartInfoRequestVo.getReceiveId(), partnerId, storeId, shoppingCartGoodsResponseVo);
@@ -2447,7 +2448,15 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             toastMsg = shoppingCartInfoRequestVo != null && ObjectUtils.equals(SubmitPageEnum.YES.getCode(), shoppingCartInfoRequestVo.getFlag()) ? SHOPPING_CART_EMPTY_GOODS_LIST : SHOPPING_CART_INVALIAD_GOODS;
             setToastMsgIfNotExist(shoppingCartGoodsResponseVo, toastMsg);
             //结算页，只有商品全部非法（即products为空）时，才提示changed为true toastMsg 不为空
-            if (shoppingCartInfoRequestVo != null && ObjectUtils.equals(SubmitPageEnum.YES.getCode(), shoppingCartInfoRequestVo.getFlag())) {
+            boolean changed = shoppingCartInfoRequestVo != null
+                    &&shoppingCartInfoRequestVo.getEnableSharing() != null
+                    && shoppingCartInfoRequestVo.getEnableSharing().compareTo(0) == 0
+                    && Objects.nonNull(shoppingCartGoodsResponseVo.getChanged())
+                    && shoppingCartGoodsResponseVo.getChanged().compareTo(true) == 0;
+            if (changed) {
+                shoppingCartGoodsResponseVo.setChanged(true);
+                shoppingCartGoodsResponseVo.setToastMsg("购物车数据异常,需要重新请求购物车list接口");
+            } else {
                 shoppingCartGoodsResponseVo.setChanged(CollectionUtils.isEmpty(cartGoodsList));
                 shoppingCartGoodsResponseVo.setToastMsg(CollectionUtils.isEmpty(cartGoodsList) ? toastMsg : "");
             }