注释券码sdk

assortment-ordercenter-sdk/pom.xml

@@ -26,7 +26,7 @@
         <dependency>
             <artifactId>couponcenter-sdk</artifactId>
             <groupId>com.freemud.application.service.sdk</groupId>
-            <version>1.10.2.RELEASE</version>
+            <version>4.0.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -61,7 +61,7 @@
         <dependency>
             <artifactId>promotioncenter-sdk</artifactId>
             <groupId>com.freemud.application.service.sdk</groupId>
-            <version>2.7.RELEASE</version>
+            <version>2.7.2.SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

order-application-service/pom.xml

@@ -41,7 +41,7 @@
         <dependency>
             <artifactId>couponcenter-sdk</artifactId>
             <groupId>com.freemud.application.service.sdk</groupId>
-            <version>1.10.2.RELEASE</version>
+            <version>4.0.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>cn.freemud</groupId>
@@ -66,7 +66,7 @@
         <dependency>
             <artifactId>promotioncenter-sdk</artifactId>
             <groupId>com.freemud.application.service.sdk</groupId>
-            <version>2.7.RELEASE</version>
+            <version>2.7.2.SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.sdk.api.assortment</groupId>
@@ -190,11 +190,11 @@
             <artifactId>commons-collections4</artifactId>
             <version>4.1</version>
         </dependency>
-        <dependency>
-            <groupId>com.freemud.application.service.sdk</groupId>
-            <artifactId>open-store-open-platform-sdk</artifactId>
-            <version>1.3.5-SNAPSHOT</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.freemud.application.service.sdk</groupId>-->
+<!--            <artifactId>open-store-open-platform-sdk</artifactId>-->
+<!--            <version>1.3.5-SNAPSHOT</version>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger2</artifactId>

order-application-service/src/main/java/cn/freemud/adapter/CouponAdapter.java

@@ -34,7 +34,7 @@ import cn.freemud.utils.BeanUtil;
 import cn.freemud.utils.LogUtil;
 import com.alibaba.fastjson.JSON;
 import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType;
-import com.freemud.card.sdk.vo.coupon.request.MemberAddCouponVo;
+//import com.freemud.card.sdk.vo.coupon.request.MemberAddCouponVo;
 import com.freemud.sdk.api.assortment.order.enums.OldOrderAccountType;
 import com.freemud.sdk.api.assortment.order.enums.QueryOrderAccountType;
 import com.freemud.sdk.api.assortment.order.request.order.CreateOrderAccountRequest;
@@ -325,30 +325,30 @@ public class CouponAdapter {
         return createActivityRecordDto;
     }
 
-    public MemberAddCouponVo convert2MemberAddCouponVo(ReceiveMemberCouponRequestVo requestVo) {
-        MemberAddCouponVo memberCardVo = new MemberAddCouponVo();
-        memberCardVo.setMemberId(requestVo.getMemberId());
-        memberCardVo.setPartnerId(requestVo.getPartnerId());
-        List<MemberAddCouponVo.Coupons> receiveMemberCouponList = Lists.newArrayList();
-        List<MemberAddCouponVo.Coupons> receiveMemberCouponListList = requestVo.getReceiveMemberCouponListList();
-        if (CollectionUtils.isNotEmpty(receiveMemberCouponListList)) {
-            receiveMemberCouponListList.forEach(coupon -> {
-                MemberAddCouponVo.Coupons addCoupon = new MemberAddCouponVo.Coupons();
-                addCoupon.setCouponCode(coupon.getCouponCode());
-                addCoupon.setEncodeCouponCode(coupon.getEncodeCouponCode());
-                addCoupon.setCouponChannel(coupon.getCouponChannel());
-                addCoupon.setActivityCode(coupon.getActivityCode());
-                addCoupon.setPromotionCode(coupon.getPromotionCode());
-                addCoupon.setCouponName(coupon.getCouponName());
-                addCoupon.setCouponType(coupon.getCouponType());
-                addCoupon.setStartTime(coupon.getStartTime());
-                addCoupon.setEndTime(coupon.getEndTime());
-                receiveMemberCouponList.add(addCoupon);
-            });
-        }
-        memberCardVo.setCoupons(receiveMemberCouponList);
-        return memberCardVo;
-    }
+//    public MemberAddCouponVo convert2MemberAddCouponVo(ReceiveMemberCouponRequestVo requestVo) {
+//        MemberAddCouponVo memberCardVo = new MemberAddCouponVo();
+//        memberCardVo.setMemberId(requestVo.getMemberId());
+//        memberCardVo.setPartnerId(requestVo.getPartnerId());
+//        List<MemberAddCouponVo.Coupons> receiveMemberCouponList = Lists.newArrayList();
+//        List<MemberAddCouponVo.Coupons> receiveMemberCouponListList = requestVo.getReceiveMemberCouponListList();
+//        if (CollectionUtils.isNotEmpty(receiveMemberCouponListList)) {
+//            receiveMemberCouponListList.forEach(Finals -> {
+//                MemberAddCouponVo.Coupons addCoupon = new MemberAddCouponVo.Coupons();
+//                addCoupon.setCouponCode(Finals.getCouponCode());
+//                addCoupon.setEncodeCouponCode(Finals.getEncodeCouponCode());
+//                addCoupon.setCouponChannel(Finals.getCouponChannel());
+//                addCoupon.setActivityCode(Finals.getActivityCode());
+//                addCoupon.setPromotionCode(Finals.getPromotionCode());
+//                addCoupon.setCouponName(Finals.getCouponName());
+//                addCoupon.setCouponType(Finals.getCouponType());
+//                addCoupon.setStartTime(Finals.getStartTime());
+//                addCoupon.setEndTime(Finals.getEndTime());
+//                receiveMemberCouponList.add(addCoupon);
+//            });
+//        }
+//        memberCardVo.setCoupons(receiveMemberCouponList);
+//        return memberCardVo;
+//    }
 
     public List<GetMemberCouponListResponseVo.MemberCoupon> convert2MemberCouponList(List<GetMemberCouponListResponseDto.Result.MemberCoupon> couponList, AddWeixinCardJudgeResponseDto responseDto, Map<String, String> couponBarCodeMap) {
         List<GetMemberCouponListResponseVo.MemberCoupon> memberCouponList = Lists.newArrayList();

order-application-service/src/main/java/cn/freemud/entities/coupon/Finals.java

+package cn.freemud.entities.coupon;
+
+public class Finals {
+
+    public static final String PARTNER_ID = "partner_id";
+    public static final String ACTION = "action";
+    public static final String ORDER_ID = "order_id";
+    public static final String SIGN = "sign";
+    public static final String ACTIVECODE = "active_code";
+    public static final String MERCHANT_ID = "merchant_id";
+    public static final String VALID_START = "valid_start";
+    public static final String VALID_ENDS = "valid_ends";
+    public static final String VALID_DAYS = "valid_days";
+    public static final String MOBILE = "mobile";
+    public static final String SMS_TEMPLATE = "sms_template";
+    public static final String TITLE = "title";
+    public static final String TIMESTAMP = "timestamp";
+    public static final String NUMBER = "number";
+    public static final String PARAMS = "params";
+    public static final String FLAG = "flag";
+    public static final String CODES = "codes";
+    public static final String STOREID = "storeId";
+    public static final String STORECHECK = "storecheck";
+    public static final String SEND_REASON = "send_reason";
+    public static final String STORE_ID = "store_id";
+    public static final String CARD_ID = "card_id";
+    public static final String APP_ID = "app_id";
+    public static final String MEMBER_ID = "member_id";
+    public static final String CHANNEL_ID_LIST = "channelIds";
+    public static final String CHANNEL_CODE_LIST = "channelCodes";
+    public static final Integer PRODUCT_COUPON = 0;
+    public static final Integer CASH_COUPON = 1;
+    public static final Integer ELSE_COUPON = 2;
+
+    public Finals() {
+    }
+
+}

order-application-service/src/main/java/cn/freemud/entities/dto/CouponCodeVerificationTransDto.java

@@ -10,7 +10,7 @@ import java.util.List;
  *
  * @version V1.0
  * @Title: CouponCodeVerificationTransVO
- * @Package com.freemud.walmart.vo.coupon
+ * @Package com.freemud.walmart.vo.Finals
  * @Description:
  * @author: biao.zhang
  * @date: 2018/11/19 14:50

order-application-service/src/main/java/cn/freemud/interceptor/ConfigInitBean.java

-package cn.freemud.interceptor;
-
-import com.freemud.card.sdk.comm.ConstantProfiles;
-import com.freemud.card.sdk.comm.IUrlConfig;
-import com.freemud.card.sdk.comm.UrlConfig;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Profile;
-
-/**
- * All rights Reserved, Designed By www.freemud.cn
- *
- * @version V1.0
- * @Title: ${FILE_NAME}
- * @Package com.freemud.mail.core
- * @Description: ${TODO}(用一句话描述该文件做什么)
- * @author: aiqi.gong
- * @date: 2019/1/4 15:49
- * @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
- * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
- */
-@Configuration
-public class ConfigInitBean {
-    @Profile("pro")
-    @Bean
-    IUrlConfig proiUrlConfig() {
-        return new UrlConfig(ConstantProfiles.PRO);
-    }
-
-    @Profile("test")
-    @Bean
-    IUrlConfig devOrTestIUrlConfig() {
-        return new UrlConfig(ConstantProfiles.TEST);
-    }
-
-    @Profile("qa")
-    @Bean
-    IUrlConfig qaIUrlConfig() {
-        return new UrlConfig(ConstantProfiles.QA);
-    }
-
-    @Profile("default")
-    @Bean
-    IUrlConfig defaultIUrlConfig() {
-        return new UrlConfig(ConstantProfiles.TEST);
-    }
-
-    @Profile("dev")
-    @Bean
-    IUrlConfig devIUrlConfig() {
-        return new UrlConfig(ConstantProfiles.DEV);
-    }
-
-    @Profile("pre-release")
-    @Bean
-    IUrlConfig preIUrlConfig() {
-        return new UrlConfig(ConstantProfiles.PRO);
-    }
-}
+//package cn.freemud.interceptor;
+//
+//import com.freemud.card.sdk.comm.ConstantProfiles;
+//import com.freemud.card.sdk.comm.IUrlConfig;
+//import com.freemud.card.sdk.comm.UrlConfig;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.context.annotation.Profile;
+//
+///**
+// * All rights Reserved, Designed By www.freemud.cn
+// *
+// * @version V1.0
+// * @Title: ${FILE_NAME}
+// * @Package com.freemud.mail.core
+// * @Description: ${TODO}(用一句话描述该文件做什么)
+// * @author: aiqi.gong
+// * @date: 2019/1/4 15:49
+// * @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
+// * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+// */
+//@Configuration
+//public class ConfigInitBean {
+//    @Profile("pro")
+//    @Bean
+//    IUrlConfig proiUrlConfig() {
+//        return new UrlConfig(ConstantProfiles.PRO);
+//    }
+//
+//    @Profile("test")
+//    @Bean
+//    IUrlConfig devOrTestIUrlConfig() {
+//        return new UrlConfig(ConstantProfiles.TEST);
+//    }
+//
+//    @Profile("qa")
+//    @Bean
+//    IUrlConfig qaIUrlConfig() {
+//        return new UrlConfig(ConstantProfiles.QA);
+//    }
+//
+//    @Profile("default")
+//    @Bean
+//    IUrlConfig defaultIUrlConfig() {
+//        return new UrlConfig(ConstantProfiles.TEST);
+//    }
+//
+//    @Profile("dev")
+//    @Bean
+//    IUrlConfig devIUrlConfig() {
+//        return new UrlConfig(ConstantProfiles.DEV);
+//    }
+//
+//    @Profile("pre-release")
+//    @Bean
+//    IUrlConfig preIUrlConfig() {
+//        return new UrlConfig(ConstantProfiles.PRO);
+//    }
+//}

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

@@ -118,7 +118,7 @@ public class CheckMCCafeOrder {
     @Autowired
     private DeliveryServiceFeiginMCCafeClient deliveryServiceFeiginMCCafeClient;
 
-    @Value("${mccafe.universal.coupon.code}")
+    @Value("${mccafe.universal.Finals.code}")
     private String withOrderBuyCouponCode;
 
     private static Gson gson = new Gson();

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

@@ -16,6 +16,7 @@ package cn.freemud.service.impl;
 import cn.freemud.adapter.CouponAdapter;
 import cn.freemud.base.util.DateUtil;
 import cn.freemud.constant.ResponseCodeConstant;
+import cn.freemud.entities.coupon.Finals;
 import cn.freemud.entities.dto.*;
 import cn.freemud.entities.dto.promotion.ShoppingCartGoodsResponse;
 import cn.freemud.entities.vo.*;
@@ -30,13 +31,14 @@ import cn.freemud.utils.LogUtil;
 import cn.freemud.utils.PropertyConvertUtil;
 import cn.freemud.utils.RedisUtil;
 import com.alibaba.fastjson.JSON;
-import com.freemud.card.sdk.comm.Finals;
-import com.freemud.card.sdk.comm.SignUtil;
+//import com.freemud.card.sdk.comm.Finals;
+//import com.freemud.card.sdk.comm.SignUtil;
 import com.freemud.card.sdk.service.CouponAvailableService;
-import com.freemud.card.sdk.vo.coupon.CouponStateVo;
-import com.freemud.card.sdk.vo.coupon.Product;
-import com.freemud.card.sdk.vo.coupon.request.CouponAvailableReqVo;
-import com.freemud.card.sdk.vo.coupon.response.CouponAvailableRespVo;
+//import com.freemud.card.sdk.vo.coupon.CouponStateVo;
+//import com.freemud.card.sdk.vo.coupon.Product;
+//import com.freemud.card.sdk.vo.coupon.request.CouponAvailableReqVo;
+//import com.freemud.card.sdk.vo.coupon.response.CouponAvailableRespVo;
+import com.freemud.application.sdk.api.util.SignUtil;
 import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
@@ -56,7 +58,7 @@ public class CouponServiceImpl implements CouponService {
     @Autowired
     private CouponOnlineClient couponOnlineClient;
 
-    @Value("${coupon.app.id}")
+    @Value("${Finals.app.id}")
     private String appid;
     @Autowired
     private RedisCache redisCache;
@@ -64,11 +66,16 @@ public class CouponServiceImpl implements CouponService {
     private CardBinClient cardBinClient;
     @Autowired
     private CustomerExtendClient customerExtendClient;
-    @Autowired
-    private CouponAvailableService couponAvailableService;
+//    @Autowired
+//    private CouponAvailableService couponAvailableService;
     @Autowired
     private CouponAdapter couponAdapter;
 
+    @Autowired
+    private CouponAdapterClient couponAdaptClient;
+
+
+
     @Override
     public GetCouponDetailResponseDto getMemberCoupon(GetMemberCouponRequestVo requestVo) {
         //TODO 券详情查券服务
@@ -273,7 +280,11 @@ public class CouponServiceImpl implements CouponService {
             }
             // 书写逻辑
             couponAvailableReqVo.setCouponCodes(calCouponCodes);
-            CouponAvailableRespVo couponsAvailable = couponAvailableService.getCouponsAvailable(couponAvailableReqVo, appSecret);
+//            CouponAvailableRespVo couponsAvailable = couponAvailableService.getCouponsAvailable(couponAvailableReqVo, appSecret);
+
+
+            CouponAvailableRespDto couponsAvailable = couponAdaptClient.getCouponsAvailable(couponAvailableReqVo);
+
             LogUtil.info("availableCoupon_couponAvailableService.getCouponsAvailable", JSON.toJSONString(couponAvailableReqVo), JSON.toJSONString(couponsAvailable));
             if (Objects.equals(String.valueOf(couponsAvailable.getResult()), ResponseResult.SUCCESS.getCode())
                     && CollectionUtils.isNotEmpty(couponsAvailable.getCouponStateList())) {

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

@@ -82,9 +82,9 @@ import com.freemud.api.assortment.datamanager.meal.MealCacheManager;
 import com.freemud.application.sdk.api.constant.ResponseConstant;
 import com.freemud.application.sdk.api.constant.ResponseResultEnum;
 import com.freemud.application.sdk.api.couponcenter.offline.service.OfflineCouponSdkService;
-import com.freemud.application.sdk.api.deliverycenter.response.DeliveryInfoDto;
-import com.freemud.application.sdk.api.deliverycenter.response.DeliveryResponseDto;
-import com.freemud.application.sdk.api.deliverycenter.service.DeliveryService;
+//import com.freemud.application.sdk.api.deliverycenter.response.DeliveryInfoDto;
+//import com.freemud.application.sdk.api.deliverycenter.response.DeliveryResponseDto;
+//import com.freemud.application.sdk.api.deliverycenter.service.DeliveryService;
 import com.freemud.application.sdk.api.log.ApiLog;
 import com.freemud.application.sdk.api.log.ErrorLog;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
@@ -250,8 +250,8 @@ public class OrderServiceImpl implements Orderservice {
     //门店SDK
     @Autowired
     private StoreCenterService storeCenterService;
-    @Autowired
-    private DeliveryService deliveryService;
+//    @Autowired
+//    private DeliveryService deliveryService;
     @Autowired
     private MQService mqService;
     @Autowired

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

@@ -116,7 +116,7 @@ public class SellCouponOrderServiceImpl {
     private CouponService couponService;
 
 
-    @Value("${coupon.app.id}")
+    @Value("${Finals.app.id}")
     private String appId;
 
     @Value("#{${ngs.virtual.store.idmap:null}}")
@@ -445,7 +445,7 @@ public class SellCouponOrderServiceImpl {
      */
     private String getAppKey(String partnerId, String trackingNo) {
         RedisCache redisCache = SDKCommonBaseContextWare.getBean(RedisCache.class);
-        String  key = "kgd:coupon:appKey:partner:";
+        String  key = "kgd:Finals:appKey:partner:";
         String appKey = redisCache.getValue(key + partnerId);
         if (StringUtils.isEmpty(appKey)) {
             PartnerRequest partnerRequest = new PartnerRequest();

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

+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @Title: OrderClient
+ * @Package cn.freemud.service.thirdparty
+ * @Description:
+ * @author: liming.guo
+ * @date: 2018/8/10 16:06
+ * @version V1.0
+ * @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+ */
+package cn.freemud.service.thirdparty;
+
+import cn.freemud.entities.dto.coupon.CouponAvailableRespDto;
+import cn.freemud.entities.vo.coupon.CouponAvailableReqVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+
+@FeignClient(name = "OPEN-STORE-COUPON-ADAPTER-SERVICE", url = "${saas.couponadapterclient.feign.url}")
+@RequestMapping(produces = {"application/json;charset=UTF-8"})
+public interface CouponAdapterClient {
+
+    /**
+     * 获取可用券信息
+     *
+     * @param couponAvailableReqVo
+     * @return
+     */
+    @PostMapping("/getCouponsAvailable")
+    CouponAvailableRespDto getCouponsAvailable(CouponAvailableReqVo couponAvailableReqVo);
+
+}

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

@@ -25,32 +25,32 @@
 //    /**
 //     * 领取优惠券
 //     */
-//    @PostMapping("/coupon/create")
+//    @PostMapping("/Finals/create")
 //    CouponBaseResponseDto create(CouponCreateDto couponCreateDto);
 //
 //    /**
 //     * 查询用户优惠券列表
 //     */
-//    @PostMapping("/coupon/list")
+//    @PostMapping("/Finals/list")
 //    CouponListResponseDto list(CouponListDto couponListDto);
 //
 //    /**
 //     * 优惠券核销
 //     */
 //    @Deprecated
-//    @PostMapping("/coupon/verification")
+//    @PostMapping("/Finals/verification")
 //    CouponBaseResponseDto verification(CouponVerificationDto couponVerificationDto);
 //
 //    /**
 //     * 核销验证接口
 //     */
-//    @PostMapping("/check/user/coupon")
+//    @PostMapping("/check/user/Finals")
 //    CouponBaseResponseDto verifyCheck(VerifyCheckRequestDto verifyCheckRequestDto);
 //
 //    /**
 //     * 核销成功通知接口
 //     */
-//    @PostMapping("/coupon/verification/notice")
+//    @PostMapping("/Finals/verification/notice")
 //    CouponBaseResponseDto verifyNotice(VerifyNoticeRequestDto verifyNoticeRequestDto);
 //
 //}

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

@@ -32,6 +32,6 @@ public interface CouponOnlineClient {
     /**
      * 查询券详情
      */
-    @PostMapping(value = "/coupon/state/invalid/coupons")
+    @PostMapping(value = "/Finals/state/invalid/coupons")
     InvalidCouponsResponseDto invalidCoupons(@RequestBody InvalidCouponsRequestDto invalidCouponsRequestDto);
 }

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

@@ -27,7 +27,7 @@ public interface CustomerExtendClient {
     /**
      * 会员优惠券列表
      */
-    @PostMapping(value = "/customerextendservice/coupon/getCoupons")
+    @PostMapping(value = "/customerextendservice/Finals/getCoupons")
     GetMemberCouponListResponseDto getMemberCouponListRequestDto(@RequestBody GetMemberCouponListRequestDto getMemberCouponListRequestDto);
 
     @PostMapping(value = "/customerextendservice/qujia/receiveCard")

order-application-service/src/main/java/cn/freemud/utils/RedisUtil.java

@@ -8,7 +8,7 @@ public class RedisUtil {
     private final static String BASE_URL = "micro_program:";
     private final static String ENTER_SHOP_KEY = BASE_URL + "ENTER_SHOP_KEY_";
     private final static String JOIN_FISSION_ACTIVITIES_KEY = BASE_URL + "JOIN_FISSION_ACTIVITIES_KEY_";
-    private final static String COUPON_APP_SECRET = "coupon:app_secret_";
+    private final static String COUPON_APP_SECRET = "Finals:app_secret_";
 
     public static String getEnterShopKey(String userId) {
         return ENTER_SHOP_KEY + userId;

order-application-service/src/test/java/cn.freemud/controller/CouponControllerTest.java

@@ -52,7 +52,7 @@ public class CouponControllerTest {
         getMemberCouponListRequestVo.setSessionId("02177GOm1HpYJp0W4jRm1bYwOm177GOl");
         String str = JSONObject.toJSONString(getMemberCouponListRequestVo);
         try {
-            mockMvc.perform(post("/coupon/getCouponList").content(str).
+            mockMvc.perform(post("/Finals/getCouponList").content(str).
                     contentType(MediaType.APPLICATION_JSON_UTF8).accept(MediaType.APPLICATION_JSON_UTF8)).andDo(print()).
                     andExpect(jsonPath("$.code").value("100"));
         } catch (Exception e) {

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

@@ -88,7 +88,6 @@ public class CouponServiceImpl implements CouponService {
 
     private final Gson gson = new Gson();
     //@Autowired
-
     //private MemberProductClient memberProductClient;
     @Autowired
     private CustomerExtendClient customerExtendClient;
@@ -506,7 +505,6 @@ public class CouponServiceImpl implements CouponService {
             couponAvailableReqVo.setCouponCodes(calCouponCodes);
             //CouponAvailableRespVo couponsAvailable = couponAvailableService.getCouponsAvailable(couponAvailableReqVo, appSecret);
             CouponAvailableRespDto couponsAvailable = couponAdaptClient.getCouponsAvailable(couponAvailableReqVo);
-            ;
             LogUtil.info("availableCoupon_couponAvailableService.getCouponsAvailable", JSON.toJSONString(couponAvailableReqVo), JSON.toJSONString(couponsAvailable));
             if (Objects.equals(String.valueOf(couponsAvailable.getResult()), ResponseResult.SUCCESS.getCode())
                     && CollectionUtils.isNotEmpty(couponsAvailable.getCouponStateList())) {