Merge branch 'KA-消费黑名单订单限制-20220527' into qa

order-application-service/src/main/java/cn/freemud/handler/MemberBlacklistHandler.java

@@ -47,12 +47,12 @@ public class MemberBlacklistHandler {
         StringBuilder sb = new StringBuilder();
         // 消费黑名单用户 不可使用积分支付
         if (Objects.nonNull(blacklistDto.getUseCustomerScore()) && blacklistDto.getUseCustomerScore().compareTo(CustomerScoreConstant.SUBSTRACT.getValue()) == 0) {
-            sb.append("您已列如消费黑名单暂不可使用积分");
+            sb.append("您已列入消费黑名单暂不可使用积分");
             return sb.toString();
         }
         // 黑名单用户 不可使用优惠券
         if (blacklistDto.isUseCoupon()) {
-            sb.append("您已列如消费黑名单暂不可使用优惠券");
+            sb.append("您已列入消费黑名单暂不可使用优惠券");
             return sb.toString();
         }
 

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

@@ -175,7 +175,9 @@ public class MallOrderServiceImpl implements MallOrderService {
         checkMallOrder.checkOrderByDelivery(createOrderVo, userLoginInfoDto, storeResponseDto, shoppingCartGoodsDto.getTotalAmount(), trackingNo);
         OrderExtInfoDto extInfo = this.getExtInfo(userLoginInfoDto, storeResponseDto, createOrderVo);
         BaseResponse response = this.createOrderFlow(createOrderVo, storeResponseDto, shoppingCartGoodsDto, userLoginInfoDto, extInfo);
-
+        if (!Objects.equals(response.getCode(), ResponseResult.SUCCESS.getCode())) {
+            return response;
+        }
         //组装支付公共方法参数
         CreateOrderOperateDto createOrderOperateDto = (CreateOrderOperateDto) response.getResult();
         createOrderBO.setExtInfo(extInfo);