Merge branch 'feature-2020/6/29-1.9.29-围餐-会阳' into qa

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

@@ -171,7 +171,7 @@ public class OrderCommonService {
         if (!ObjectUtils.equals(ResponseCodeConstant.RESPONSE_SUCCESS, baseOrderResponse.getErrcode())) {
             throw new ServiceException(ResponseResult.ORDER_EDIT_ERROR,baseOrderResponse.getErrmsg());
         }
-        if (orderBean.getAmount() > 0) {
+        if (orderBean.getAmount() > 0 && StringUtils.isBlank(cardCode)) {
             createOrderResponseVo.setPaySuccess(false);
         } else {
             createOrderResponseVo.setPaySuccess(true);