update 查询订单sql

jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/TempController.java

@@ -41,11 +41,8 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.math.BigDecimal;
-import java.text.ParseException;
 import java.time.LocalDateTime;
-import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -1114,7 +1111,7 @@ public class TempController extends BaseController {
                 // 将startTime、endTime转换成localDateTime
                 LocalDateTime localStartTime = LocalDateTime.parse(date + "T00:00:00", DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss"));;
                 LocalDateTime localEndTime = LocalDateTime.parse(date + "T23:59:59", DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss"));;
-                int i = orderBasicInfoService.updateOrderReviewFlagTemp(localStartTime, localEndTime, null);
+                int i = orderBasicInfoService.updateOrderReviewFlagTemp(localStartTime, localEndTime, dto.getStationId());
             }
             response = new RestApiResponse<>();
         } catch (Exception e) {

jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryOrderDTO.java

@@ -83,6 +83,8 @@ public class QueryOrderDTO extends BaseEntity {
 	 */
 	private String payMode;
 
+	private List<String> payModeList;
+
 	/**
 	 * 订单编号列表
 	 */

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java

@@ -1066,7 +1066,8 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
         QueryOrderDTO dto = QueryOrderDTO.builder()
                 .startTime(DateUtils.formatDateTime(start))
                 .endTime(DateUtils.formatDateTime(end))
-                .payMode(OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getValue())
+                // .payMode(OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getValue())
+                .payModeList(Lists.newArrayList(OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getValue(), OrderPayModeEnum.PAYMENT_OF_ALIPAY.getValue()))
                 .stationId(stationId)
                 .orderStatus(OrderStatusEnum.ORDER_COMPLETE.getValue())
                 .build();

jsowell-pile/src/main/java/com/jsowell/pile/util/MerchantUtils.java

@@ -1,10 +1,12 @@
 package com.jsowell.pile.util;
 
 import com.jsowell.common.util.StringUtils;
+import com.jsowell.pile.vo.web.OrderListVO;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 运营商工具类
@@ -73,4 +75,19 @@ public class MerchantUtils {
         return new ArrayList<>(shuffled.subList(0, keepCount));
     }
 
+    public static List<String> getRandomNinetyPercentV2(List<OrderListVO> list) {
+        if (list == null || list.isEmpty()) {
+            return new ArrayList<>();
+        }
+        int total = list.size();
+        int removeCount = (int) Math.ceil(total * 0.1);
+        int keepCount = Math.max(1, total - removeCount);
+        List<OrderListVO> shuffled = new ArrayList<>(list);
+        Collections.shuffle(shuffled);
+        List<OrderListVO> orderListVOS = new ArrayList<>(shuffled.subList(0, keepCount));
+        // 提取orderCode
+        List<String> codeList = orderListVOS.stream().map(OrderListVO::getOrderCode).collect(Collectors.toList());
+        return codeList;
+    }
+
 }

jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml

@@ -2014,6 +2014,12 @@
         <if test="payMode != null and payMode != ''">
             and t1.pay_mode = #{payMode,jdbcType=VARCHAR}
         </if>
+        <if test="payModeList != null and payModeList.size() != 0">
+            and t1.pay_mode in
+            <foreach close=")" collection="payModeList" item="payMode" open="(" separator=",">
+                #{payMode}
+            </foreach>
+        </if>
         order by t1.create_time desc
     </select>