FeignClient 合并

shopping-cart-application-service/src/main/java/cn/freemud/demo/manager/coupon/KgdCouponServiceImpl.java

 package cn.freemud.demo.manager.coupon;
 
-import cn.freemud.base.log.LogTreadLocal;
-import cn.freemud.base.util.JsonUtil;
 import cn.freemud.constant.ResponseCodeConstant;
-import cn.freemud.demo.entities.bo.goods.ValidateShopProductRequestBO;
 import cn.freemud.demo.entities.bo.coupon.CheckSpqBO;
 import cn.freemud.demo.entities.bo.coupon.GetCheckSpqBo;
 import cn.freemud.demo.entities.bo.coupon.GetCouponDetailBO;
 import cn.freemud.demo.entities.bo.goods.GetProductBySkuIdResponseBO;
 import cn.freemud.demo.entities.bo.goods.ValiadShopProductBO;
+import cn.freemud.demo.entities.bo.goods.ValidateShopProductRequestBO;
 import cn.freemud.demo.entities.bo.product.GetProductBySkuIdBO;
 import cn.freemud.demo.entities.bo.promotion.CouponDetailBO;
 import cn.freemud.demo.entities.bo.store.GetStoreBO;
@@ -22,7 +20,6 @@ import cn.freemud.enums.ResponseResult;
 import cn.freemud.enums.StoreItemStatus;
 import cn.freemud.interceptor.ServiceException;
 import cn.freemud.redis.RedisCache;
-import cn.freemud.service.thirdparty.CardBinClient;
 import cn.freemud.service.thirdparty.CouponOnlineClient;
 import cn.freemud.utils.RedisUtil;
 import com.freemud.application.sdk.api.productcenter.request.product.valid.ValidateShopProductType;
@@ -51,9 +48,6 @@ public class KgdCouponServiceImpl implements CouponService {
     StoreService storeService;
 
     @Autowired
-    CardBinClient cardBinClient;
-
-    @Autowired
     private RedisCache redisCache;
 
     @Value("${coupon.app.id}")
@@ -219,7 +213,7 @@ public class KgdCouponServiceImpl implements CouponService {
         String couponAppSecret = RedisUtil.getCouponAppSecret(partnerId);
         String appSecret = redisCache.getValue(couponAppSecret);
         if (StringUtils.isBlank(appSecret)) {
-            GetAppKeyResponseDto getAppKeyResponseDto = cardBinClient.getAppKey(GetAppKeyRequestDto.builder().partnerId(partnerId).appId(appid).build());
+            GetAppKeyResponseDto getAppKeyResponseDto = couponOnlineClient.getAppKey(GetAppKeyRequestDto.builder().partnerId(partnerId).appId(appid).build());
             if (Objects.equals(String.valueOf(getAppKeyResponseDto.getStatusCode()), ResponseResult.SUCCESS.getCode())
                     && getAppKeyResponseDto.getData() != null) {
                 redisCache.save(couponAppSecret, getAppKeyResponseDto.getData().getAppKey());

shopping-cart-application-service/src/main/java/cn/freemud/demo/manager/customer/KgdCustomerServceImpl.java

@@ -11,10 +11,8 @@ import cn.freemud.entities.dto.GetPaidRuleResponseDto;
 import cn.freemud.entities.dto.user.GetSessionUserInfoDto;
 import cn.freemud.entities.dto.user.GetUserScoreUseDetailRequest;
 import cn.freemud.entities.dto.user.GetUserScoreUserDetailResponse;
-import cn.freemud.entities.vo.CustomerInfoVo;
 import cn.freemud.enums.ResponseResult;
 import cn.freemud.interceptor.ServiceException;
-import cn.freemud.service.thirdparty.CustomScoreClient;
 import cn.freemud.service.thirdparty.CustomerApplicationClient;
 import com.freemud.api.assortment.datamanager.entity.vo.AssortmentCustomerInfoVo;
 import com.freemud.api.assortment.datamanager.manager.customer.AssortmentCustomerInfoManager;
@@ -23,7 +21,6 @@ import com.freemud.application.sdk.api.log.ErrorLog;
 import com.freemud.application.sdk.api.membercenter.request.QueryReceiveAddressRequest;
 import com.freemud.application.sdk.api.membercenter.response.QueryReceiveAddressResponse;
 import com.freemud.application.sdk.api.membercenter.service.MemberCenterService;
-import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -34,7 +31,7 @@ public class KgdCustomerServceImpl implements CustomerService {
     private CustomerApplicationClient customerApplicationClient;
 
     @Autowired
-    private CustomScoreClient customScoreClient;
+    private CustomerApplicationClient customScoreClient;
 
     @Autowired
     private MemberCenterService memberCenterService;
@@ -94,7 +91,7 @@ public class KgdCustomerServceImpl implements CustomerService {
         GetUserScoreUserDetailResponse userScoreUseDetail = null;
         try {
             // 加入try catch是为了custom服务挂掉，购物车服务可以也可以正常
-            userScoreUseDetail = customScoreClient.getUserScoreUseDetail(request);
+            userScoreUseDetail = customerApplicationClient.getUserScoreUseDetail(request);
         } catch (Exception ex) {
             ErrorLog.errorConvertJson(this.getClass(),"getUserScoreUseDetailError",ex);
         }

shopping-cart-application-service/src/main/java/cn/freemud/enums/OrderSourceType.java

-/**
- * All rights Reserved, Designed By www.freemud.cn
- *
- * @Title: OrderSourceType
- * @Package cn.freemud.enums
- * @Description:
- * @author: liming.guo
- * @date: 2018/6/1 21:40
- * @version V1.0
- * @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
- * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
- */
-package cn.freemud.enums;
-
-public enum OrderSourceType {
-
-    BDWM("bdwm", "百度外卖"),
-
-    JDWM("jdwm", "京东到家"),
-
-    MTWM("mtwm", "美团外卖"),
-
-    SDG("sdg", "闪电购"),
-
-    ELEME("eleme", "饿了么外卖"),
-
-    FMWD("fmwd", "非码微店"),
-
-    MALL("mall", "非码Mall"),
-
-    SAAS("saas", "saas 点餐"),
-
-    SAASMALL("saasmall", "微商城"),
-    ;
-
-    private String code;
-
-    private String desc;
-
-    OrderSourceType(String code, String desc) {
-        this.code = code;
-        this.desc = desc;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public void setCode(String code) {
-        this.code = code;
-    }
-
-    public String getDesc() {
-        return desc;
-    }
-
-    public void setDesc(String desc) {
-        this.desc = desc;
-    }
-}
+///**
+// * All rights Reserved, Designed By www.freemud.cn
+// *
+// * @Title: OrderSourceType
+// * @Package cn.freemud.enums
+// * @Description:
+// * @author: liming.guo
+// * @date: 2018/6/1 21:40
+// * @version V1.0
+// * @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
+// * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+// */
+//package cn.freemud.enums;
+//
+//public enum OrderSourceType {
+//
+//    BDWM("bdwm", "百度外卖"),
+//
+//    JDWM("jdwm", "京东到家"),
+//
+//    MTWM("mtwm", "美团外卖"),
+//
+////    SDG("sdg", "闪电购"),
+//
+//    ELEME("eleme", "饿了么外卖"),
+//
+//    FMWD("fmwd", "非码微店"),
+//
+//    MALL("mall", "非码Mall"),
+//
+//    SAAS("saas", "saas 点餐"),
+//
+//    SAASMALL("saasmall", "微商城"),
+//    ;
+//
+//    private String code;
+//
+//    private String desc;
+//
+//    OrderSourceType(String code, String desc) {
+//        this.code = code;
+//        this.desc = desc;
+//    }
+//
+//    public String getCode() {
+//        return code;
+//    }
+//
+//    public void setCode(String code) {
+//        this.code = code;
+//    }
+//
+//    public String getDesc() {
+//        return desc;
+//    }
+//
+//    public void setDesc(String desc) {
+//        this.desc = desc;
+//    }
+//}

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

@@ -68,8 +68,6 @@ public class CouponServiceImpl implements CouponService {
     @Autowired
     private RedisCache redisCache;
     @Autowired
-    private CardBinClient cardBinClient;
-    @Autowired
     private ProductClient storeItemClient;
     @Autowired
     private ItemService itemService;
@@ -167,7 +165,7 @@ public class CouponServiceImpl implements CouponService {
         String couponAppSecret = RedisUtil.getCouponAppSecret(partnerId);
         String appSecret = redisCache.getValue(couponAppSecret);
         if (StringUtils.isBlank(appSecret)) {
-            GetAppKeyResponseDto getAppKeyResponseDto = cardBinClient.getAppKey(GetAppKeyRequestDto.builder().partnerId(partnerId).appId(appid).build());
+            GetAppKeyResponseDto getAppKeyResponseDto = couponOnlineClient.getAppKey(GetAppKeyRequestDto.builder().partnerId(partnerId).appId(appid).build());
             if (Objects.equals(String.valueOf(getAppKeyResponseDto.getStatusCode()), ResponseResult.SUCCESS.getCode())
                     && getAppKeyResponseDto.getData() != null) {
                 redisCache.save(couponAppSecret, getAppKeyResponseDto.getData().getAppKey());
@@ -207,7 +205,7 @@ public class CouponServiceImpl implements CouponService {
             requestDto.setPartnerId(Integer.valueOf(partnerId));
             String sign = SignUtil.createMD5Sign(requestDto, appSecret);
             requestDto.setSign(sign);
-            BatchQueryActivityInfoResponseDto batchQueryActivityInfoResponseDto = cardBinClient.batchQueryActivityInfo(requestDto);
+            BatchQueryActivityInfoResponseDto batchQueryActivityInfoResponseDto = couponOnlineClient.batchQueryActivityInfo(requestDto);
             if (Objects.equals(batchQueryActivityInfoResponseDto.getStatusCode(), ResponseCodeConstant.RESPONSE_SUCCESS_0_STR)
                     && CollectionUtils.isNotEmpty(batchQueryActivityInfoResponseDto.getActivities())) {
                 ActivityChannelEnum finalActivityChannelEnum = activityChannelEnum;
@@ -564,12 +562,6 @@ public class CouponServiceImpl implements CouponService {
                 && !Objects.equals(couponDetailResponseDto.getDetails().get(0).getStatus(), CouponStatus.STATUS_2.getCode())) {
             return null;
         }
-
-        if(CouponTypeEnum.TYPE_0.getCode().equals(couponDetailResponseDto.getDetails().get(0).getType())
-                && Integer.valueOf(1).equals(couponDetailResponseDto.getDetails().get(0).getSubType())) {
-            throw new ServiceException(ResponseResult.SHOPPING_CART_PRODUCT_CAN_NOT_USE, "老版本不支持商品券黑名单商品，请升级小程序。");
-        }
-
 //        List<String> couPonstoreIds = Lists.newArrayList();
         //TODO 判断该券是否在这个门店下(一个券可以在多个门店下使用)
         if (CollectionUtils.isNotEmpty(couponDetailResponseDto.getDetails().get(0).getActiveRestrictionVOS())) {
@@ -1075,7 +1067,7 @@ public class CouponServiceImpl implements CouponService {
         requestDto.setPartnerId(Integer.valueOf(partnerId));
         String sign = SignUtil.createMD5Sign(requestDto, appSecret);
         requestDto.setSign(sign);
-        BatchQueryActivityInfoResponseDto batchQueryActivityInfoResponseDto = cardBinClient.batchQueryActivityInfo(requestDto);
+        BatchQueryActivityInfoResponseDto batchQueryActivityInfoResponseDto = couponOnlineClient.batchQueryActivityInfo(requestDto);
         if (batchQueryActivityInfoResponseDto == null || !Objects.equals(batchQueryActivityInfoResponseDto.getStatusCode(), ResponseCodeConstant.RESPONSE_SUCCESS_0_STR) || CollectionUtils.isEmpty(batchQueryActivityInfoResponseDto.getActivities())) {
             return null;
         }

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

@@ -12,7 +12,7 @@ import cn.freemud.entities.dto.user.GetUserScoreUserDetailResponse;
 import cn.freemud.entities.vo.*;
 import cn.freemud.enums.ActivityTypeEnum;
 import cn.freemud.service.IPromotionService;
-import cn.freemud.service.thirdparty.CustomScoreClient;
+import cn.freemud.service.thirdparty.CustomerApplicationClient;
 import com.freemud.application.sdk.api.constant.FMStatusCode;
 import com.freemud.application.sdk.api.log.ErrorLog;
 import org.apache.commons.collections4.CollectionUtils;
@@ -38,7 +38,7 @@ import java.util.List;
 @Service
 public class CustomerScoreService implements IPromotionService {
     @Autowired
-    private CustomScoreClient customScoreClient;
+    private CustomerApplicationClient customScoreClient;
 
     @Override
     public void updateShoppingCartGoodsDiscount(CouponPromotionVO couponPromotionVO, ActivityQueryDto activityQueryDto, CalculationDiscountResult calculationDiscountResult, List<CartGoods> cartGoodsList, ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo, UserLoginInfoDto userLoginInfoDto, ShoppingCartInfoRequestVo shoppingCartInfoRequestVo) {

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

@@ -184,9 +184,6 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
     private MemberPropertyService memberPropertyService;
 
     @Autowired
-    private CustomScoreClient customScoreClient;
-
-    @Autowired
     private ShoppingCartRelationFactory shoppingCartRelationFactory;
     @Resource
     private MapperFacade mapperFacade;
@@ -1339,7 +1336,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             scoreRequest.setMemberId(memberId);
             scoreRequest.setPaidAmount(request.getActualPayAmount());
             scoreRequest.setPartnerId(partnerId);
-            GetUserScoreUserDetailResponse userScoreUseDetail = customScoreClient.getUserScoreUseDetail(scoreRequest);
+            GetUserScoreUserDetailResponse userScoreUseDetail = customerApplicationClient.getUserScoreUseDetail(scoreRequest);
             GetMemberInfoResponseVo.Score score = new GetMemberInfoResponseVo.Score();
             if (userScoreUseDetail != null && userScoreUseDetail.getResult() != null) {
                 GetUserScoreUserDetailResponse.UserScoreDetailVo result = userScoreUseDetail.getResult();

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/promotion/ScoreSharingService.java

@@ -12,7 +12,7 @@ import cn.freemud.entities.vo.ShoppingCartCustomerScoreVo;
 import cn.freemud.entities.vo.ShoppingCartGoodsResponseVo;
 import cn.freemud.entities.vo.ShoppingCartInfoRequestVo;
 import cn.freemud.enums.ActivityTypeEnum;
-import cn.freemud.service.thirdparty.CustomScoreClient;
+import cn.freemud.service.thirdparty.CustomerApplicationClient;
 import com.freemud.application.sdk.api.constant.FMStatusCode;
 import com.freemud.application.sdk.api.log.ErrorLog;
 import org.apache.commons.collections4.CollectionUtils;
@@ -35,7 +35,7 @@ import java.math.BigDecimal;
 public class ScoreSharingService {
 
     @Autowired
-    private CustomScoreClient customScoreClient;
+    private CustomerApplicationClient customScoreClient;
 
     public void scoreResponse(CalculationDiscountResult discountResult
             , ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo

shopping-cart-application-service/src/main/java/cn/freemud/service/thirdparty/ActivityClient.java

@@ -73,7 +73,7 @@ public interface ActivityClient {
      * 促销新的算价对接
      */
     @PostMapping("/promotioncenter/calculateservice/discount/sharing")
-    //@IgnoreFeignLogAnnotation(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR},statusCodeFieldName= ResponseCodeKeyConstant.STATUS_CODE,messageFieldName=ResponseCodeKeyConstant.MEG)
+    @IgnoreFeignLogAnnotation(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR},statusCodeFieldName= ResponseCodeKeyConstant.STATUS_CODE,messageFieldName=ResponseCodeKeyConstant.MEG)
     ActivityCalculationDiscountResponseDto calculationSharingDiscount(ActivityCalculationDiscountRequestDto shareDiscountRequestDto);
 
     @PostMapping("/activity/getV3Promotion")

shopping-cart-application-service/src/main/java/cn/freemud/service/thirdparty/CouponClient.java

@@ -27,37 +27,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 @RequestMapping(produces = {"application/json;charset=UTF-8"})
 public interface CouponClient {
 
-//    /**
-//     * 领取优惠券
-//     */
-//    @PostMapping("/coupon/create")
-//    CouponBaseResponseDto create(CouponCreateDto couponCreateDto);
-//
-//    /**
-//     * 查询用户优惠券列表
-//     */
-//    @PostMapping("/coupon/list")
-//    CouponListResponseDto list(CouponListDto couponListDto);
-//
-//    /**
-//     * 优惠券核销
-//     */
-//    @Deprecated
-//    @PostMapping("/coupon/verification")
-//    CouponBaseResponseDto verification(CouponVerificationDto couponVerificationDto);
-//
-//    /**
-//     * 核销验证接口
-//     */
-//    @PostMapping("/check/user/coupon")
-//    CouponBaseResponseDto verifyCheck(VerifyCheckRequestDto verifyCheckRequestDto);
-//
-//    /**
-//     * 核销成功通知接口
-//     */
-//    @PostMapping("/coupon/verification/notice")
-//    CouponBaseResponseDto verifyNotice(VerifyNoticeRequestDto verifyNoticeRequestDto);
-
     /**
      * 麦咖啡校验券是否可用
      */

shopping-cart-application-service/src/main/java/cn/freemud/service/thirdparty/CouponOnlineClient.java

@@ -4,7 +4,7 @@ package cn.freemud.service.thirdparty;
 import cn.freemud.annotations.IgnoreFeignLogAnnotation;
 import cn.freemud.constant.ResponseCodeConstant;
 import cn.freemud.constant.ResponseCodeKeyConstant;
-import cn.freemud.entities.dto.GetCouponDetailResponseDto;
+import cn.freemud.entities.dto.*;
 import cn.freemud.entities.dto.coupon.CouponResponseDTO;
 import cn.freemud.entities.dto.coupon.FastBatchQueryTemplateInfoRequest;
 import cn.freemud.entities.dto.coupon.FastTemplateInfoResponseVO;
@@ -20,8 +20,29 @@ import java.util.Map;
 
 @FeignClient(name = "OPEN-STORE-ONLINE-COUPON-SERVICE", url = "${saas.coupononlineclient.feign.url}", configuration = FormSupportConfig.class)
 public interface CouponOnlineClient {
+
+
+    /**
+     * 获取密钥
+     * @param requestDto
+     * @return
+     */
+    @PostMapping("/getAppKey")
+    @IgnoreFeignLogAnnotation(logMessage = "getAppKey",excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR},statusCodeFieldName= ResponseCodeKeyConstant.STATUS_CODE,messageFieldName=ResponseCodeKeyConstant.MEG)
+    GetAppKeyResponseDto getAppKey(GetAppKeyRequestDto requestDto);
+
+    /**
+     * 活动信息批量查询
+     * @param requestDto
+     * @return
+     */
+    @PostMapping(value = "/batchQueryActivityInfo")
+    @IgnoreFeignLogAnnotation(logMessage = "batchQueryActivityInfo",excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR},statusCodeFieldName= ResponseCodeKeyConstant.STATUS_CODE,messageFieldName=ResponseCodeKeyConstant.MEG)
+    BatchQueryActivityInfoResponseDto batchQueryActivityInfo(BatchQueryActivityInfoRequestDto requestDto);
+
+
     /**
-     * 查询券详情  黑白名单接口
+     * 查询券详情
      */
     @IgnoreFeignLogAnnotation(logMessage = "getCouponDetails",excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR},statusCodeFieldName= ResponseCodeKeyConstant.STATUS_CODE)
     @PostMapping(value = "/code_v4", produces = MediaType.APPLICATION_JSON_UTF8_VALUE,

shopping-cart-application-service/src/main/java/cn/freemud/service/thirdparty/CustomerApplicationClient.java

@@ -7,9 +7,12 @@ import cn.freemud.constant.ResponseCodeKeyConstant;
 import cn.freemud.entities.dto.GetPaidRuleRequestDto;
 import cn.freemud.entities.dto.GetPaidRuleResponseDto;
 import cn.freemud.entities.dto.user.GetSessionUserInfoDto;
+import cn.freemud.entities.dto.user.GetUserScoreUseDetailRequest;
+import cn.freemud.entities.dto.user.GetUserScoreUserDetailResponse;
 import cn.freemud.entities.vo.CustomerInfoVo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 /**
@@ -38,5 +41,11 @@ public interface CustomerApplicationClient {
     @IgnoreFeignLogAnnotation(logMessage = "getSessionUserInfo",excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR},statusCodeFieldName= ResponseCodeKeyConstant.STATUS_CODE,messageFieldName=ResponseCodeKeyConstant.MSG)
     BaseResponse<CustomerInfoVo>getSessionUserInfo(GetSessionUserInfoDto getSessionUserInfoDto);
 
+    /**
+     * 用户可用积分
+     */
+    @PostMapping(value = "/user/scoreUseDetail")
+    @IgnoreFeignLogAnnotation(logMessage = "getUserScoreUseDetail",excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR},statusCodeFieldName= ResponseCodeKeyConstant.STATUS_CODE,messageFieldName=ResponseCodeKeyConstant.MSG)
+    GetUserScoreUserDetailResponse getUserScoreUseDetail(@RequestBody GetUserScoreUseDetailRequest getUserScoreUseDetailRequest);
 
 }

shopping-cart-application-service/src/main/java/cn/freemud/service/thirdparty/MemberToolsClient.java

@@ -15,8 +15,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 public interface MemberToolsClient {
 
 
-    // TODO: 21-3-31 和 CustomerClient　待合并
-
     /**
      * 根据会员手机号和商户获取会员信息
      */

shopping-cart-application-service/src/main/java/cn/freemud/service/thirdparty/OpenPlatformClient.java

@@ -26,35 +26,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 @RequestMapping(produces = {"application/json;charset=UTF-8"})
 public interface OpenPlatformClient {
 
-//    @PostMapping("/openPlatform/getWxappUserInfo")
-//    GetWxappUserInfoResponseDto getOpenPlatformUserInfo(@RequestBody GetWxappUserInfoDto getWxappUserInfoDto);
-//
-//    @PostMapping("/openPlatform/getAccessTokenAndTemplateId")
-//    GetWxappAccessTokenResponseDto getAccessTokenAndTemplateId(@RequestBody GetWxappAccessTokenDto getWxappAccessTokenDto);
-//
-//    @PostMapping("/banner/fromAssistant/getPartnerBannerList")
-//    GetBannerStoreResultDto getBannerPictureList(@RequestBody GetBannerPictureListDto getBannerPictureList);
-//
-//    @PostMapping("/banner/fromAssistant/getNewBannerList")
-//    GetNewBannerResponseDto getNewBannerList(@RequestBody GetBannerPictureListDto bannerPictureListDto);
-//
-//    @PostMapping("/storeDelivery/getInfo")
-//    GetStoreDeliveryResultDto getStoreDeliveryInfo(@RequestBody GetStoreDeliveryRequestDto getStoreDeliveryRequestDto);
-//
-//    @PostMapping("/thirdDelivery/betweenService/getDelivery")
-//    GetDeliveryResponseDto getDelivery(@RequestBody GetDeliveryRequestDto getDeliveryRequestDto);
-//
-//    /**
-//     * 加入微信卡包
-//     */
-//    @PostMapping("/weixincard/weixinCardForApp/addweixincardcode")
-//    AddWeixinCardCodeResponseDto addWeiXinCardCode(@RequestBody AddWeixinCardCodeRequestDto requestDto);
-//
-//    /**
-//     * 查询券是否可以加入微信卡包
-//     */
-//    @PostMapping("/weixincard/weixinCardForApp/addWeixinCardJudge")
-//    AddWeixinCardJudgeResponseDto addWeixinCardJudge(@RequestBody AddWeixinCardJudgeRequestDto requestDto);
 
     /**
      * 解码code获取微信卡券对应商品信息
@@ -66,12 +37,4 @@ public interface OpenPlatformClient {
     WeixinProductResponseDto getWeixinProductRequestDto(WeixinProductRequestDto requestDto);
 
 
-    /**
-     * 获取小程序支付payEbCode
-     * @param requestDto
-     * @return
-     */
-//    @PostMapping("/payment/getPayEbCodeByAppId")
-//    GetPayEbCodeByAppIdResponseDto getPayEbCodeByAppId(GetPayEbCodeByAppIdRequestDto requestDto);
-
 }

shopping-cart-application-service/src/main/java/cn/freemud/service/thirdparty/StockClient.java

@@ -35,12 +35,4 @@ public interface StockClient {
     @IgnoreFeignLogAnnotation(logMessage = "getAvailableStocks",excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR},statusCodeFieldName= ResponseCodeKeyConstant.STATUS_CODE,messageFieldName=ResponseCodeKeyConstant.MSG)
     GetProductStockResponseDto getAvailableStocks(@RequestBody GetProductStockRequestDto requestDto);
 
-    /**
-     * 修改库存接口，根据changeType字段区分使用，1增加库存，2减少库存，3修改库存
-     * @param requestDto
-     * @return
-     */
-    @PostMapping("/updateStocks")
-    @IgnoreFeignLogAnnotation(logMessage = "updateStocks",excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR},statusCodeFieldName= ResponseCodeKeyConstant.STATUS_CODE,messageFieldName=ResponseCodeKeyConstant.MSG)
-    BaseResponse updateStocks(@RequestBody UpdateProductStockRequestDto requestDto);
 }

shopping-cart-application-service/src/test/java/cn.freemud/client/CouoponOnlineTest.java

 package cn.freemud.client;
 
 import cn.freemud.entities.dto.BatchQueryActivityInfoRequestDto;
-import cn.freemud.entities.dto.BatchQueryActivityInfoResponseDto;
 import cn.freemud.service.CouponService;
-import cn.freemud.service.thirdparty.CardBinClient;
 import cn.freemud.service.thirdparty.CouponOnlineClient;
-import com.alibaba.fastjson.JSON;
 import com.freemud.application.sdk.api.util.SignUtil;
 import com.google.gson.Gson;
 import org.junit.Test;
@@ -32,8 +29,6 @@ public class CouoponOnlineTest {
     private CouponOnlineClient couponOnlineClient;
     @Autowired
     private CouponService couponService;
-    @Autowired
-    private CardBinClient cardBinClient;
     @Test
     public void getCouponDetailsMD5() {
         String appSecret=couponService.getAppSecret("1864");
@@ -56,7 +51,7 @@ public class CouoponOnlineTest {
         requestDto.setPartnerId(1864);
         String sign = SignUtil.createMD5Sign(requestDto, appSecret);
         requestDto.setSign(sign);
-        BatchQueryActivityInfoResponseDto batchQueryActivityInfoResponseDto = cardBinClient.batchQueryActivityInfo(requestDto);
+//        BatchQueryActivityInfoResponseDto batchQueryActivityInfoResponseDto = cardBinClient.batchQueryActivityInfo(requestDto);
 
     }
 

shopping-cart-application-service/src/test/java/cn.freemud/client/StockClientTest.java

@@ -76,9 +76,9 @@ public class StockClientTest {
 
         requestDto.setProductStocks(productStocks);
 
-        BaseResponse response = stockClient.updateStocks(requestDto);
+//        BaseResponse response = stockClient.updateStocks(requestDto);
 
-        System.out.println(response);
+//        System.out.println(response);
     }
 
 }