From 2951172df3fd155d9a862260a746032eb2dddf4f Mon Sep 17 00:00:00 2001
From: hurui <177768073@qq.com>
Date: Wed, 22 Nov 2023 11:18:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bweb/controller/HighGasController.java    | 10 +++++----
 .../java/com/hai/dao/HighOrderMapperExt.java  | 22 +++++++++----------
 .../service/impl/HighGasOrderServiceImpl.java | 13 ++++++-----
 3 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/hai-bweb/src/main/java/com/bweb/controller/HighGasController.java b/hai-bweb/src/main/java/com/bweb/controller/HighGasController.java
index a3e0dc5f..dc4e0c4f 100644
--- a/hai-bweb/src/main/java/com/bweb/controller/HighGasController.java
+++ b/hai-bweb/src/main/java/com/bweb/controller/HighGasController.java
@@ -74,6 +74,9 @@ public class HighGasController {
     @Resource
     private ShellGroupService shellGroupService;
 
+    @Resource
+    private HighGasOrderService gasOrderService;
+
     @RequestMapping(value="/getMerGasStatistical",method = RequestMethod.POST)
     @ResponseBody
     @ApiOperation(value = "查询商户油站统计")
@@ -271,8 +274,7 @@ public class HighGasController {
             }
 
             PageHelper.startPage(pageNum, pageSize);
-            // return ResponseMsgUtil.success(new PageInfo<>(highOrderService.getGasOrderList(param)));
-            return ResponseMsgUtil.success(null);
+            return ResponseMsgUtil.success(new PageInfo<>(gasOrderService.getGasOrderList(param)));
 
         } catch (Exception e) {
             log.error("HighGasController -> getGasOrderList() error!",e);
@@ -418,7 +420,7 @@ public class HighGasController {
             param.put("createTimeE", createTimeE);
 
             if (status == null) {
-                param.put("status", "2,3,4,6,7");
+                param.put("status", "2,4,5,6");
             } else {
                 param.put("status", status);
             }
@@ -590,7 +592,7 @@ public class HighGasController {
     public ResponseData getGasOrderDetail(@RequestParam(name = "orderNo", required = true) String orderNo) {
         try {
 
-            return ResponseMsgUtil.success(highOrderService.getGasOrderDetail(orderNo));
+            return ResponseMsgUtil.success(gasOrderService.getDetailByOrderNo(orderNo));
 
         } catch (Exception e) {
             log.error("HighGasController -> getGasOrderDetail() error!",e);
diff --git a/hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java b/hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java
index b9f1e5b6..9d39def0 100644
--- a/hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java
+++ b/hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java
@@ -1094,20 +1094,20 @@ public interface HighOrderMapperExt {
     @Select({
             "<script> " +
             " select" +
-            " case when sum(b.gas_refuel_price) is not null then sum(b.gas_refuel_price) else 0 end refuelPrice," +
+            " case when sum(a.gas_refuel_price) is not null then sum(a.gas_refuel_price) else 0 end refuelPrice," +
             " count(1) refuelNum," +
             " case when sum(a.gas_oil_liters) is not null then sum(a.gas_oil_liters) else 0 end refuelLiters" +
             " from high_gas_order a" +
-            " where " +
-            " <if test='param.storeId != null'> and goods_id in (${param.storeId})  </if>" +
-            " <if test='param.gasStaffId != null'> and a.gas_staff_id = #{param.gasStaffId}</if>" +
-            " <if test='param.gasOilNo != null'> and a.gas_oil_no = #{param.gasOilNo}</if>" +
-            " <if test='param.status != null'> and b.order_status in (${param.status} )</if>" +
-            " <if test='param.createTimeS != null'> <![CDATA[ and b.create_time >= #{param.createTimeS} ]]> </if>",
-            " <if test='param.createTimeE != null'> <![CDATA[ and b.create_time <= #{param.createTimeE} ]]> </if>",
-            " <if test='param.payTimeS != null'> <![CDATA[ and b.pay_time >= #{param.payTimeS} ]]> </if>",
-            " <if test='param.payTimeE != null'> <![CDATA[ and b.pay_time <= #{param.payTimeE} ]]> </if>",
-            " <if test='param.orderNo != null'> and b.order_no LIKE concat('%', #{param.orderNo}, '%')</if>" +
+            " where 1 = 1" +
+            " <if test='param.storeId != null'> and store_id in (${param.storeId})  </if>" +
+            " <if test='param.gasStaffId != null'> and gas_staff_id = #{param.gasStaffId}</if>" +
+            " <if test='param.gasOilNo != null'> and gas_oil_no = #{param.gasOilNo}</if>" +
+            " <if test='param.status != null'> and status in (${param.status} )</if>" +
+            " <if test='param.createTimeS != null'> <![CDATA[ and create_time >= #{param.createTimeS} ]]> </if>",
+            " <if test='param.createTimeE != null'> <![CDATA[ and create_time <= #{param.createTimeE} ]]> </if>",
+            " <if test='param.payTimeS != null'> <![CDATA[ and pay_time >= #{param.payTimeS} ]]> </if>",
+            " <if test='param.payTimeE != null'> <![CDATA[ and pay_time <= #{param.payTimeE} ]]> </if>",
+            " <if test='param.orderNo != null'> and order_no LIKE concat('%', #{param.orderNo}, '%')</if>" +
             " ORDER BY create_time desc" +
             "</script>"
     })
diff --git a/hai-service/src/main/java/com/hai/service/impl/HighGasOrderServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/HighGasOrderServiceImpl.java
index 8c36c769..8f400a24 100644
--- a/hai-service/src/main/java/com/hai/service/impl/HighGasOrderServiceImpl.java
+++ b/hai-service/src/main/java/com/hai/service/impl/HighGasOrderServiceImpl.java
@@ -9,9 +9,9 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
 /**
  * @className: HighGasOrderServiceImpl
@@ -126,8 +126,11 @@ public class HighGasOrderServiceImpl implements HighGasOrderService {
             criteria.andPayTypeEqualTo(MapUtils.getInteger(param, "payType"));
         }
 
-        if (MapUtils.getInteger(param, "status") != null) {
-            criteria.andStatusEqualTo(MapUtils.getInteger(param, "status"));
+        if (StringUtils.isNotBlank(MapUtils.getString(param, "status"))) {
+            List<Integer> status = Arrays.stream(MapUtils.getString(param, "status").split(","))
+                    .flatMapToInt(num -> IntStream.of(Integer.parseInt(num))).boxed()
+                    .collect(Collectors.toList());
+            criteria.andStatusIn(status);
         }
 
         if (MapUtils.getLong(param, "createTimeS") != null) {