freemud-card-sdk 去除

order-application-service/pom.xml

@@ -262,11 +262,11 @@
             <version>2.7.0</version>
         </dependency>
         <!-- 券码SDK -->
-        <dependency>
-            <groupId>com.freemud.card.sdk</groupId>
-            <artifactId>freemud-card-sdk</artifactId>
-            <version>2.4.18-RELEASE</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.freemud.card.sdk</groupId>-->
+<!--            <artifactId>freemud-card-sdk</artifactId>-->
+<!--            <version>2.4.18-RELEASE</version>-->
+<!--        </dependency>-->
 
         <dependency>
             <groupId>io.github.openfeign.form</groupId>

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

@@ -332,17 +332,17 @@ public class CouponAdapter {
 //        List<MemberAddCouponVo.Coupons> receiveMemberCouponList = Lists.newArrayList();
 //        List<MemberAddCouponVo.Coupons> receiveMemberCouponListList = requestVo.getReceiveMemberCouponListList();
 //        if (CollectionUtils.isNotEmpty(receiveMemberCouponListList)) {
-//            receiveMemberCouponListList.forEach(Finals -> {
+//            receiveMemberCouponListList.forEach(coupon -> {
 //                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());
+//                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);
 //            });
 //        }

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

+package cn.freemud.entities.coupon;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @Title: cn.freemud.entities.vo CouponAvailableReqVo
+ * @Description: TDO 描述....
+ * @author: family
+ * @date: 2020/6/30
+ * @Copyright: www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+ */
+@Data
+public class CouponAvailableReqVo {
+
+    //渠道id
+    private String providerId;
+    //商户号
+    private String merchantId;
+    //门店id（校验门店限制）
+    private String storeId;
+    //组织机构id列表（校验渠道限制）
+    private List<String> channelIdList;
+    //组织机构code列表（校验渠道限制）
+    private List<String> channelCodeList;
+    //券码列表
+    private List<String> couponCodes;
+    //金额
+    private Integer totalAmount;
+    private String appId;
+    private String redeemChannel;
+    //购物车商品列表
+    private List<Product> productList;
+}

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

+package cn.freemud.entities.coupon;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @Title: cn.freemud.entities.dto CouponAvailableRespDto
+ * @Description: TDO 描述....
+ * @author: family
+ * @date: 2020/6/30
+ * @Copyright: www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+ */
+@Data
+@NoArgsConstructor
+public class CouponAvailableRespDto {
+    private List<CouponStateVo> couponStateList;
+    private String result;
+}

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

+package cn.freemud.entities.coupon;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @Title: cn.freemud.entities.vo.coupon CouponStateVo
+ * @Description: TDO 描述....
+ * @author: family
+ * @date: 2020/6/30
+ * @Copyright: www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+ */
+@Data
+public class CouponStateVo {
+
+    /**
+     * 券号
+     */
+    private String couponCode;
+
+    private Integer type;
+    /**
+     * 状态
+     * 0 可用  1 不可用  2 限制可用
+     */
+    private Integer state;
+    /**
+     * 不可用原因
+     */
+    private String message;
+    /**
+     * 最小金额 分
+     */
+    private Integer minAmount;
+    /**
+     * 数量
+     */
+    private Integer amount;
+    /**
+     * 活动折扣价格 分
+     */
+    private Integer priceDiscount;
+    /**
+     * 原价 分
+     */
+    private Integer originalPrice;
+    /**
+     * 折扣百分比
+     */
+    private Integer discount;
+    /**
+     * 限制类型
+     * 0 白名单 1 黑名单
+     */
+    private String limitType;
+    /**
+     * 今日剩余可使用次数(频次券才包含)
+     */
+    private Integer dailyAvailableTimes;
+
+    /**
+     * 总可使用次数(频次券才包含)
+     */
+    private Integer availableTimes;
+
+    /**
+     * 可用商品
+     */
+    private List<Product> productList;
+
+}

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

+package cn.freemud.entities.coupon;
+
+import lombok.Data;
+
+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @Title: cn.freemud.entities.vo.coupon Product
+ * @Description: TDO 描述....
+ * @author: family
+ * @date: 2020/6/30
+ * @Copyright: www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+ */
+@Data
+public class Product {
+
+    /**
+     * 商品id
+     */
+    private String productId;
+    /**
+     * 商品单价
+     */
+    private Integer amount;
+    /**
+     * quantity
+     */
+    private Integer quantity;
+    /**
+     * categoryCode
+     */
+    private String categoryCode;
+}

order-application-service/src/main/java/cn/freemud/entities/vo/ReceiveMemberCouponRequestVo.java

 package cn.freemud.entities.vo;
 
-import com.freemud.card.sdk.vo.coupon.request.MemberAddCouponVo;
+//import com.freemud.card.sdk.vo.coupon.request.MemberAddCouponVo;
 import lombok.Data;
 
 import java.util.List;
@@ -12,7 +12,7 @@ public class ReceiveMemberCouponRequestVo {
     /**
      * 优惠券列表
      */
-    private List<MemberAddCouponVo.Coupons> receiveMemberCouponListList;
+    private List<ReceiveMemberCouponList> receiveMemberCouponListList;
     @Data
     public static  class ReceiveMemberCouponList{
         /**
@@ -35,5 +35,21 @@ public class ReceiveMemberCouponRequestVo {
          * 券使用说明
          */
         private String remark;
+
+//        private String couponCode;
+        private String encodeCouponCode;
+        private String couponChannel;
+//        private String activityCode;
+        private String promotionCode;
+        private Integer promotionType;
+        private String couponName;
+        private String couponType;
+        private String startTime;
+        private String endTime;
+        private String sourceCode;
+        private String sourceName;
+        private String cardId;
+        private Integer isSynWechat;
+
     }
 }

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.Finals.code}")
+    @Value("${mccafe.universal.coupon.code}")
     private String withOrderBuyCouponCode;
 
     private static Gson gson = new Gson();

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

@@ -16,7 +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.coupon.*;
 import cn.freemud.entities.dto.*;
 import cn.freemud.entities.dto.promotion.ShoppingCartGoodsResponse;
 import cn.freemud.entities.vo.*;
@@ -24,6 +24,7 @@ import cn.freemud.enums.*;
 import cn.freemud.redis.RedisCache;
 import cn.freemud.service.CouponService;
 import cn.freemud.service.thirdparty.CardBinClient;
+import cn.freemud.service.thirdparty.CouponAdapterClient;
 import cn.freemud.service.thirdparty.CouponOnlineClient;
 import cn.freemud.service.thirdparty.CustomerExtendClient;
 import cn.freemud.utils.BarcodeUtil;
@@ -33,7 +34,7 @@ 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.service.CouponAvailableService;
+//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;
@@ -58,7 +59,7 @@ public class CouponServiceImpl implements CouponService {
     @Autowired
     private CouponOnlineClient couponOnlineClient;
 
-    @Value("${Finals.app.id}")
+    @Value("${coupon.app.id}")
     private String appid;
     @Autowired
     private RedisCache redisCache;
@@ -255,13 +256,15 @@ public class CouponServiceImpl implements CouponService {
     }
 
     private List<CouponStateVo> buildAvailiableCoupons(List<ShoppingCartGoodsResponse.CartGoodsDetailDto> cartGoods, String partnerId, String storeId, List<String> couponCodes) {
-        String appSecret = getAppSecret(partnerId);
+//        String appSecret = getAppSecret(partnerId);
         // 最大15一提交
         int maxNum = 15;
         int count = couponCodes.size() / maxNum;
         // 计算可用不可用券
         CouponAvailableReqVo couponAvailableReqVo = new CouponAvailableReqVo();
-        couponAvailableReqVo.setPartnerId(partnerId);
+//        couponAvailableReqVo.setPartnerId(partnerId);
+        couponAvailableReqVo.setProviderId(partnerId);
+        couponAvailableReqVo.setMerchantId(partnerId);
         couponAvailableReqVo.setStoreId(storeId);
         List<Product> productList = Lists.newArrayList();
         // 优惠券优先级最高，根据商品原价做计算
@@ -281,8 +284,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));

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

@@ -116,7 +116,7 @@ public class SellCouponOrderServiceImpl {
     private CouponService couponService;
 
 
-    @Value("${Finals.app.id}")
+    @Value("${coupon.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:Finals:appKey:partner:";
+        String  key = "kgd:coupon: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

@@ -12,8 +12,8 @@
  */
 package cn.freemud.service.thirdparty;
 
-import cn.freemud.entities.dto.coupon.CouponAvailableRespDto;
-import cn.freemud.entities.vo.coupon.CouponAvailableReqVo;
+import cn.freemud.entities.coupon.CouponAvailableReqVo;
+import cn.freemud.entities.coupon.CouponAvailableRespDto;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;

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

@@ -25,32 +25,32 @@
 //    /**
 //     * 领取优惠券
 //     */
-//    @PostMapping("/Finals/create")
+//    @PostMapping("/coupon/create")
 //    CouponBaseResponseDto create(CouponCreateDto couponCreateDto);
 //
 //    /**
 //     * 查询用户优惠券列表
 //     */
-//    @PostMapping("/Finals/list")
+//    @PostMapping("/coupon/list")
 //    CouponListResponseDto list(CouponListDto couponListDto);
 //
 //    /**
 //     * 优惠券核销
 //     */
 //    @Deprecated
-//    @PostMapping("/Finals/verification")
+//    @PostMapping("/coupon/verification")
 //    CouponBaseResponseDto verification(CouponVerificationDto couponVerificationDto);
 //
 //    /**
 //     * 核销验证接口
 //     */
-//    @PostMapping("/check/user/Finals")
+//    @PostMapping("/check/user/coupon")
 //    CouponBaseResponseDto verifyCheck(VerifyCheckRequestDto verifyCheckRequestDto);
 //
 //    /**
 //     * 核销成功通知接口
 //     */
-//    @PostMapping("/Finals/verification/notice")
+//    @PostMapping("/coupon/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 = "/Finals/state/invalid/coupons")
+    @PostMapping(value = "/coupon/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/Finals/getCoupons")
+    @PostMapping(value = "/customerextendservice/coupon/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 = "Finals:app_secret_";
+    private final static String COUPON_APP_SECRET = "coupon:app_secret_";
 
     public static String getEnterShopKey(String userId) {
         return ENTER_SHOP_KEY + userId;

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

@@ -7,7 +7,8 @@ import cn.freemud.service.thirdparty.CardBinClient;
 import cn.freemud.service.thirdparty.CouponOnlineClient;
 import cn.freemud.utils.LogUtil;
 import com.alibaba.fastjson.JSON;
-import com.freemud.card.sdk.comm.SignUtil;
+//import com.freemud.card.sdk.comm.SignUtil;
+import com.freemud.application.sdk.api.util.SignUtil;
 import com.google.gson.Gson;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.Test;
@@ -45,7 +46,7 @@ public class CouoponOnlineTest {
         requestDto.put("partner_id","1864");
         requestDto.put("merchant_id","1864");
         requestDto.put("action","code.allDetails");
-        String sign=SignUtil.createMD5Sign(requestDto,appSecret);
+        String sign= SignUtil.createMD5Sign(requestDto,appSecret);
         requestDto.put("sign",sign);
         Object responseDto2 = couponOnlineClient.getCouponDetails(requestDto);
         log.info("requestDto"+requestDto);

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("/Finals/getCouponList").content(str).
+            mockMvc.perform(post("/coupon/getCouponList").content(str).
                     contentType(MediaType.APPLICATION_JSON_UTF8).accept(MediaType.APPLICATION_JSON_UTF8)).andDo(print()).
                     andExpect(jsonPath("$.code").value("100"));
         } catch (Exception e) {