Merge remote-tracking branch 'origin/qa' into qa

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

@@ -577,7 +577,7 @@ public class EncircleOrderServiceImpl implements EncircleOrderService {
         }finally {
             //释放锁
             RedisLock.getInstance(redisTemplate).unlock(orderCommonService.redisLockInfo(assortmentCustomerInfoVo,RedisCacheEnum.CREATE_PRE_PAYMENTORDER_LOCKKEY_PREFIX));
-            if((orderResponseVo != null && Objects.equals(orderResponseVo.getPaySuccess(), false)) || updateDiscountApportion) {
+            if(orderResponseVo != null && Objects.equals(orderResponseVo.getPaySuccess(), false) && updateDiscountApportion) {
                 //记录订单支付状态，防止用户在唤起支付后继续下单,同时也防止重复进行促销计算
                 mealCacheManager.setOrderCreatePreParmentLock(assortmentCustomerInfoVo.getPartnerId(),assortmentCustomerInfoVo.getStoreId(),assortmentCustomerInfoVo.getTableNumber());
             }

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);