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

Ka 储值卡增加营销规则同享配置id1046436 zxh 20220505

See merge request !141

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

@@ -312,8 +312,6 @@ public class SellCouponOrderServiceImpl implements OrderFactoryService {
         AssortmentCustomerInfoVo userLoginInfoDto = checkOrder.checkOrderByMemberNew(requestVo.getSessionId());
         // 如果用户适用SVC 卡支付，则校验svc卡,
         Integer enableSharing = checkOrder.checkMemberSvcCard(userLoginInfoDto.getPartnerId(), userLoginInfoDto.getMemberId(), requestVo);
-        // fisherman 当前时间点 默认走同享逻辑上线 2022年5月26日17:23:00
-        enableSharing = 1;
         String trackingNo = LogThreadLocal.getTrackingNo();
         String partnerId = userLoginInfoDto.getPartnerId();
         String storeId = requestVo.getShopId();

order-application-service/src/main/java/cn/freemud/service/thirdparty/SvcAppClient.java

@@ -25,7 +25,6 @@ public interface SvcAppClient {
 
     //批量查询卡配置规则
     @PostMapping(value = "/svc/cardapply/multi-info")
-    @LogIgnoreFeign(logMessage = "/svc/cardapply/multi-info")
     BaseResponse<List<CardApplyRes>> multiInfo(@RequestBody List<BatchSvcInfoRequest> requestList);
 
 }