对接运费券

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

@@ -152,6 +152,11 @@ public class CreateOrderVo {
      * 券码
      */
     private String couponCode;
+
+    /**
+     * 运费券code
+     */
+    private String freightCouponCode;
     /**
      * 版本号
      */

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

@@ -54,6 +54,10 @@ public class ShoppingCartInfoRequestVo {
      */
     private String couponCode;
     /**
+     * 运费券code
+     */
+    private String freightCouponCode;
+    /**
      * 优惠券对应的活动号
      */
     private String activityCode;

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

@@ -480,7 +480,14 @@ public class CheckMCCafeOrder {
                 .buyMemberCard(null)
                 .menuType(createOrderVo.getMenuType())
                 .build();
+        List<MCCafeCouponVo> couponCodeList = new ArrayList<>();
         if (StringUtils.isNotBlank(createOrderVo.getCouponCode())) {
+            couponCodeList.add(new MCCafeCouponVo(createOrderVo.getCouponCode()));
+        }
+        if (StringUtils.isNotBlank(createOrderVo.getCouponCode())) {
+            couponCodeList.add(new MCCafeCouponVo(createOrderVo.getFreightCouponCode()));
+        }
+        if (CollectionUtils.isNotEmpty(couponCodeList)) {
             // 校验couponCode
             MCCafeCouponRequest mcCafeCouponRequest = MCCafeCouponRequest.builder()
                     .ver(Integer.valueOf(Version.VERSION_1))
@@ -490,26 +497,27 @@ public class CheckMCCafeOrder {
                     .station_id("1")
                     .operator_id(createOrderVo.getUserId())
                     .channel(UserLoginChannelEnum.ALIPAY.getCode().equals(userLoginInfoDto.getChannel())?MCCafeChannelEnum.MOCOFFEE_ZFB.getName():MCCafeChannelEnum.MOCOFFEE_WX.getName())
-                    .couponlist(Arrays.asList(new MCCafeCouponVo(createOrderVo.getCouponCode())))
+                    .couponlist(couponCodeList)
                     .sign("skip")
                     .build();
             McdNetBatchQueryResponse mcdNetBatchQueryResponse = couponClientService.batchQuery(mcCafeCouponRequest);
             if (mcdNetBatchQueryResponse == null || !ResponseCodeConstant.RESPONSE_SUCCESS.equals(mcdNetBatchQueryResponse.getStatusCode())
                     || CollectionUtils.isEmpty(mcdNetBatchQueryResponse.getCouponlist())) {
-                LogUtil.error("该代金券当前不可用", mcCafeCouponRequest, mcdNetBatchQueryResponse);
-                throw new ServiceException(ResponseResult.COUPON_SHOP_NOTSUPPORT, "该代金券当前不可用");
+                LogUtil.error("部分优惠券当前不可用", mcCafeCouponRequest, mcdNetBatchQueryResponse);
+                throw new ServiceException(ResponseResult.COUPON_SHOP_NOTSUPPORT, "部分优惠券当前不可用");
             } else if(!ResponseCodeConstant.RESPONSE_SUCCESS.equals(mcdNetBatchQueryResponse.getCouponlist().get(0).getStatusCode())) {
                 if(mcdNetBatchQueryResponse.getCouponlist().get(0).getCodeInfo() != null) {
                     LogUtil.error(mcdNetBatchQueryResponse.getCouponlist().get(0).getCodeInfo().getAct_name()+"当前不可用", mcCafeCouponRequest, mcdNetBatchQueryResponse);
                     throw new ServiceException(ResponseResult.COUPON_SHOP_NOTSUPPORT, mcdNetBatchQueryResponse.getCouponlist().get(0).getCodeInfo().getAct_name()+"当前不可用");
                 } else {
-                    LogUtil.error("该代金券暂不可用", mcCafeCouponRequest, mcdNetBatchQueryResponse);
-                    throw new ServiceException(ResponseResult.COUPON_SHOP_NOTSUPPORT, "该代金券暂不可用");
+                    LogUtil.error("部分优惠券暂时不可用", mcCafeCouponRequest, mcdNetBatchQueryResponse);
+                    throw new ServiceException(ResponseResult.COUPON_SHOP_NOTSUPPORT, "部分优惠券暂时不可用");
                 }
             }
             String activeCode = mcdNetBatchQueryResponse.getCouponlist().get(0).getCodeInfo().getAct_id();
             // 校验点餐方式,查询购物车接口内部已校验
             shoppingCartInfoRequestVo.setCouponCode(createOrderVo.getCouponCode());
+            shoppingCartInfoRequestVo.setFreightCouponCode(createOrderVo.getFreightCouponCode());
             // 活动code
             shoppingCartInfoRequestVo.setActivityCode(activeCode);
             shoppingCartInfoRequestVo.setCardCode(createOrderVo.getCardCode());