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

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

@@ -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();
+//            return ResponseUtil.success(goodsList.getResult());
 
         }