Merge remote-tracking branch 'origin/KA-储值卡增加营销规则同享配置ID1046436-zxh-20220505'…

Merge remote-tracking branch 'origin/KA-储值卡增加营销规则同享配置ID1046436-zxh-20220505' into KA-储值卡增加营销规则同享配置ID1046436-zxh-20220505

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

@@ -1062,7 +1062,7 @@ 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次计算操作", shoppingCartInfoRequestVo.getSessionId());
+                logUtil.info("fisherman -> 当前请求了2次计算操作", JSON.toJSONString(shoppingCartInfoRequestVo), JSON.toJSONString(shoppingCartGoodsResponseVo));
                 goodsList = getGoodsList(shoppingCartInfoRequestVo);
                 if (goodsList == null || !ResponseResult.SUCCESS.getCode().equals(goodsList.getCode())) {
                     return goodsList;
@@ -1071,7 +1071,13 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             }
             //SVC卡支付
             SVCCardPay(cardCodes, shoppingCartInfoRequestVo.getReceiveId(), partnerId, storeId, shoppingCartGoodsResponseVo);
-            return ResponseUtil.success(goodsList.getResult());
+            ShoppingCartGoodsResponseVo result = goodsList.getResult();
+            if (Objects.nonNull(result.getSvcDiscountDesc())) {
+                String svcDiscountDesc = result.getSvcDiscountDesc();
+                result.setSvcDiscountDesc(svcDiscountDesc+"--"+result.getCurrentTime());
+            }
+            return ResponseUtil.success(result);
+//            return ResponseUtil.success(goodsList.getResult());
 
         }