Merge remote-tracking branch 'origin/master'

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

@@ -484,14 +484,14 @@ public class CheckMCCafeOrder {
         if (StringUtils.isNotBlank(createOrderVo.getCouponCode())) {
             couponCodeList.add(new MCCafeCouponVo(createOrderVo.getCouponCode()));
         }
-        if (StringUtils.isNotBlank(createOrderVo.getCouponCode())) {
+        if (StringUtils.isNotBlank(createOrderVo.getFreightCouponCode())) {
             couponCodeList.add(new MCCafeCouponVo(createOrderVo.getFreightCouponCode()));
         }
         if (CollectionUtils.isNotEmpty(couponCodeList)) {
             // 校验couponCode
             MCCafeCouponRequest mcCafeCouponRequest = MCCafeCouponRequest.builder()
-                    .ver(Integer.valueOf(Version.VERSION_1))
-                    .reqtype(CouponReqTypeEnum.QUERY.getCode())
+                    .ver(88)
+                    .reqtype(CouponReqTypeEnum.BATCH_QUERY.getCode())
                     .partnerId(Integer.parseInt(createOrderVo.getPartnerId()))
                     .store_id(createOrderVo.getShopId())
                     .station_id("1")