是否唤起支付判断和预支付订单过滤

order-application-service/src/main/java/cn/freemud/entities/vo/encircle/PreviewOrderInfoVo.java

@@ -36,6 +36,10 @@ public class PreviewOrderInfoVo {
      */
     private Integer payLicenceStatus;
     /**
+     * 支付是否唤起 1.已经唤起支付  0.未唤起支付
+     */
+    private Integer payIsArouseStatus;
+    /**
      * 订单金额
      */
     private Long amount;

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

@@ -377,12 +377,16 @@ public class EncircleOrderServiceImpl implements EncircleOrderService {
 
         // 如果已经调用了预支付则不再进行促销计算
         boolean prePayLock = mealCacheManager.getOrderCreatePreParmentLock(assortmentCustomerInfoVo.getPartnerId(),assortmentCustomerInfoVo.getStoreId(),assortmentCustomerInfoVo.getTableNumber());
+        Integer payIsArouseStatus = 1;
         if (!prePayLock) {
+            payIsArouseStatus = 0;
             OrderBeanRequest orderBeanRequest = orderAdapter.conventOrderBeanRequest(queryOrderByIdResponse.getData(), assortmentCustomerInfoVo);
             CouponPromotionDto couponPromotionDto = couponAdapter.getCouponPromotionDto(orderBeanRequest, createReserveOrderVo.getCouponCode(), createReserveOrderVo.getActivityCode(), CouponFlag.YES.getCode());
             ShoppingCartGoodsResponse shoppingCartGoodsResponse = calculationDiscountService.updateDiscountApportion(orderBeanRequest, couponPromotionDto);
             calculationDiscountService.updatePreviewOrderInfoVo(previewOrderInfoVo, shoppingCartGoodsResponse);
         }
+        //是否唤起支付
+        previewOrderInfoVo.setPayIsArouseStatus(payIsArouseStatus);
         //校验返回的订单信息，如包含称重菜单但未称重则不走后续流程直接返回当前订单详细信息，不计算金额
         Integer payLicenceStatus = 0;
         if(!orderCommonService.queryExistWeightNoNum(queryOrderByIdResponse.getData())){

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

@@ -657,14 +657,26 @@ public class OrderServiceImpl implements Orderservice {
             responseMap.put("list", new ArrayList<QueryOrderResponseVo>());
             return ResponseUtil.success(responseMap);
         }
-        List<QueryOrdersResponse.DataBean.OrderBean> orders = queryOrderResponse.getData().getOrders();
+        List<QueryOrdersResponse.DataBean.OrderBean> ordersOld = queryOrderResponse.getData().getOrders();
+        List<QueryOrdersResponse.DataBean.OrderBean> orders =new ArrayList<>();
         Set<String> shopIds = new HashSet<>();
         // 过滤待支付订单
-        if (CollectionUtils.isNotEmpty(orders)) {
-            for (QueryOrdersResponse.DataBean.OrderBean orderBean : orders) {
+        if (CollectionUtils.isNotEmpty(ordersOld)) {
+            for (QueryOrdersResponse.DataBean.OrderBean orderBean : ordersOld) {
                 if (!(OrderStatus.WAIT_PAY.getCode().equals(orderBean.getStatus()) || PayStatus.NOT_PAY.getCode().equals(orderBean.getPayStatus()))) {
                     shopIds.add(orderBean.getShopId());
                 }
+                //围餐过滤掉未唤起支付的订单
+                if (OrderChannelType.IWC.getCode().equals(channelType) && OrderStatus.WAIT_PAY.getCode().equals(orderBean.getStatus()) && PayStatus.NOT_PAY.getCode().equals(orderBean.getPayStatus())) {
+                    // 如果已经唤起了支付则不再进行促销计算
+                    boolean prePayLock = mealCacheManager.getOrderCreatePreParmentLock(userLoginInfoDto.getPartnerId(),userLoginInfoDto.getStoreId(),userLoginInfoDto.getTableNumber());
+                    if (prePayLock ){
+                        //已唤起支付
+                        orders.add(orderBean);
+                    }
+                }else {
+                    orders.add(orderBean);
+                }
             }
         }
         String storeCodes = "";