围餐预支付锁

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