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

# 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);