Merge branch 'feature/20210609-v2.0.34-下单锁定配送券ID1030707-周晓航-合并张悦33版本' into qa

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

@@ -77,8 +77,9 @@ public class PlatformCouponRelationServiceImpl implements CouponRelationService
     @Override
     public BaseResponse verificationCoupon(List<QueryOrdersResponseDto.DataBean.OrderBean.AccountBean> accountList, QueryOrdersResponseDto.DataBean.OrderBean orderBean, CouponReqType couponReqType) {
         if (accountList.size() > 1) {
+            Integer code = OrderAccountType.FREIGHT_COUPON.getCode();
             // 运费券 塞进 核销接口里面,  这里真的是贼恶心 逻辑不敢动
-            QueryOrdersResponseDto.DataBean.OrderBean.AccountBean freightCouponAccountBean = accountList.stream().filter(accountBean -> OrderAccountType.DISCOUNT_COUPON.getCode().equals(accountBean.getType())).findFirst().orElse(null);
+            QueryOrdersResponseDto.DataBean.OrderBean.AccountBean freightCouponAccountBean = accountList.stream().filter(accountBean -> code.equals(accountBean.getType())).findFirst().orElse(null);
             CouponCodeVerificationTransDto couponCodeVerificationTransDto = null;
             if (!Objects.isNull(freightCouponAccountBean)) {
                 couponCodeVerificationTransDto = new CouponCodeVerificationTransDto();
@@ -86,7 +87,7 @@ public class PlatformCouponRelationServiceImpl implements CouponRelationService
                 couponCodeVerificationTransDto.setTotalAmount(freightCouponAccountBean.getPrice().intValue());
             }
             // 过滤出配送券
-            List<QueryOrdersResponseDto.DataBean.OrderBean.AccountBean> collect = accountList.stream().filter(accountBean -> !OrderAccountType.DISCOUNT_COUPON.getCode().equals(accountBean.getType())).collect(Collectors.toList());
+            List<QueryOrdersResponseDto.DataBean.OrderBean.AccountBean> collect = accountList.stream().filter(accountBean -> !code.equals(accountBean.getType())).collect(Collectors.toList());
             return commonMethodVerification(couponCodeVerificationTransDto, collect, orderBean, couponReqType);
         } else {
             return commonMethodVerification(null, accountList, orderBean, couponReqType);