对接会员优惠券与券码可用优惠券

shopping-cart-application-service/src/main/java/cn/freemud/aop/WebAspect.java

@@ -98,7 +98,7 @@ public class WebAspect {
                         throw new CommonServiceException(CommonResponseResult.USER_UNAUTHORIZED);
                     }
                     List<String> unauthorizedUrls = Arrays.asList(getNotFilterUrl(CommonRedisKeyConstant.SAAS_NOT_AUTHORIZED_URL, NOT_AUTHORIZED_KEY).split(","));
-                    if (!unauthorizedUrls.contains(requestUrl) && StringUtils.isEmpty(userInfo.getUnionId())) {
+                    if (!unauthorizedUrls.contains(requestUrl) && StringUtils.isEmpty(userInfo.getUnionId()) && !requestUrl.contains("MCoffee")) {
                         throw new CommonServiceException(CommonResponseResult.USER_UNAUTHORIZED);
                     }
                 } else {

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CalculationServiceImpl.java

@@ -11,6 +11,7 @@ import cn.freemud.enums.ResponseResult;
 import cn.freemud.interceptor.ServiceException;
 import cn.freemud.service.CommonService;
 import cn.freemud.service.thirdparty.ActivityClient;
+import cn.freemud.utils.LogUtil;
 import cn.freemud.utils.PropertyConvertUtil;
 import com.freemud.application.sdk.api.log.ErrorLog;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
@@ -42,7 +43,6 @@ import java.util.*;
  * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
  */
 
-@Slf4j
 @Service
 public class CalculationServiceImpl {
 
@@ -162,8 +162,6 @@ public class CalculationServiceImpl {
         if (StringUtils.isBlank(receiveId)) {
             return deliveryAmount;
         }
-        log.info("获取配送配逻辑 tackingNo:{},receiveId:{},partnerId:{},storeId:{}", LogThreadLocal.getTrackingNo(), receiveId, partnerId, storeId);
-
         String trackingNo = LogThreadLocal.getTrackingNo();
 
         QueryReceiveAddressRequest queryReceive = new QueryReceiveAddressRequest(receiveId, partnerId);

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/entity/CouponAvailableReq.java

+package cn.freemud.service.impl.mcoffee.entity;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @version V1.0
+ * @Title: CouponAvailableReq
+ * @Package cn.freemud.service.impl.mcoffee
+ * @Description:
+ * @author: ping1.wu
+ * @date: 2020/8/4 16:10
+ * @Copyright: 2020 www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+ */
+@Data
+public class CouponAvailableReq {
+
+    //渠道id
+    private String providerId;
+    //商户号
+    private String merchantId;
+    private String city;
+    private String storeId;
+
+    //组织机构id列表（校验渠道限制）
+    private List<String> channelIdList;
+
+    //组织机构code列表（校验渠道限制）
+    private List<String> channelCodeList;
+
+    //券码列表
+    private List<String> couponCodes;
+    private Integer totalAmount;
+
+    //核销渠道 枚举: mocoffee_wx : 麦咖啡微信小程序 mocoffee_zfb : 麦咖啡支付宝小程序
+    private String redeemChannel;
+
+    //购物车商品列表
+    private List<CouponProductVo> productList;
+
+}

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/entity/CouponAvailableResp.java

+package cn.freemud.service.impl.mcoffee.entity;
+
+import com.freemud.card.sdk.vo.coupon.CouponStateVo;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @version V1.0
+ * @Title: CouponAvailableResp
+ * @Package cn.freemud.service.impl.mcoffee
+ * @Description:
+ * @author: ping1.wu
+ * @date: 2020/8/4 16:10
+ * @Copyright: 2020 www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+ */
+@Data
+public class CouponAvailableResp {
+
+    private Integer result;
+    private String msg;
+
+    private List<CouponStateVo> couponStateList;
+
+}

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/entity/CouponProductVo.java

+package cn.freemud.service.impl.mcoffee.entity;
+
+import lombok.Data;
+
+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @version V1.0
+ * @Title: CouponProductVo
+ * @Package cn.freemud.service.impl.mcoffee
+ * @Description:
+ * @author: ping1.wu
+ * @date: 2020/8/4 16:14
+ * @Copyright: 2020 www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+ */
+@Data
+public class CouponProductVo {
+
+    private String keyProductCode;
+
+    private String productId;
+    private Integer amount;
+    private Integer quantity;
+
+    private String categoryCode;
+}

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

@@ -13,6 +13,8 @@
 package cn.freemud.service.thirdparty;
 
 import cn.freemud.entities.dto.*;
+import cn.freemud.service.impl.mcoffee.entity.CouponAvailableReq;
+import cn.freemud.service.impl.mcoffee.entity.CouponAvailableResp;
 import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -53,5 +55,11 @@ public interface CouponClient {
     @PostMapping("/coupon/verification/notice")
     CouponBaseResponseDto verifyNotice(VerifyNoticeRequestDto verifyNoticeRequestDto);
 
+    /**
+     * 麦咖啡校验券是否可用
+     */
+    @PostMapping("/mccafe/getCouponsAvailable")
+    CouponAvailableResp getCouponsAvailable(CouponAvailableReq req);
+
 
 }