Skip to content

Q
qianhe-slsy
Commit 1d3caa6a by yuanchao
Options

20240401

parent 905f779b
Showing with 57 additions and 9 deletions
qianhe-admin/src/main/java/com/qianhe/system/controller/WaterOrderController.java
...@@ -108,6 +108,8 @@ public class WaterOrderController extends BaseController ...@@ -108,6 +108,8 @@ public class WaterOrderController extends BaseController
//返回的订单列表 //返回的订单列表
List<WaterOrderVo> waterOrderVoList = new ArrayList<>(); List<WaterOrderVo> waterOrderVoList = new ArrayList<>();
List<WaterOrder> list = waterOrderService.selectWaterOrderList(waterOrderVo); List<WaterOrder> list = waterOrderService.selectWaterOrderList(waterOrderVo);
waterOrderVo.setPageNum(null);
List<WaterOrder> list1 = waterOrderService.selectWaterOrderList(waterOrderVo);
//查询所有订单商品 //查询所有订单商品
List<WaterOrderGoods> waterOrderGoods = waterOrderGoodsService.selectWaterOrderGoodsList(new WaterOrderGoods()); List<WaterOrderGoods> waterOrderGoods = waterOrderGoodsService.selectWaterOrderGoodsList(new WaterOrderGoods());
//查询所有商品图片 //查询所有商品图片
...@@ -149,7 +151,12 @@ public class WaterOrderController extends BaseController ...@@ -149,7 +151,12 @@ public class WaterOrderController extends BaseController
waterOrderVoList.add(waterOrderVo1); waterOrderVoList.add(waterOrderVo1);
} }
} }
return getDataTable(waterOrderVoList); TableDataInfo dataInfo = new TableDataInfo();
dataInfo.setRows(waterOrderVoList);
dataInfo.setCode(HttpStatus.SUCCESS);
dataInfo.setMsg("查询成果");
dataInfo.setTotal(list1.size());
return dataInfo;
} }
/** /**
......
qianhe-admin/src/main/java/com/qianhe/system/mapper/WaterOrderMapper.java
...@@ -102,6 +102,8 @@ public interface WaterOrderMapper ...@@ -102,6 +102,8 @@ public interface WaterOrderMapper
* @return * @return
*/ */
Map<String, Integer> getOrderNumByStation(WaterOrderVo waterOrderVo); Map<String, Integer> getOrderNumByStation(WaterOrderVo waterOrderVo);
Map<String, Integer> getOrderNumByStation1(WaterOrderVo waterOrderVo);
Map<String, Integer> getOrderNumByStation2(WaterOrderVo waterOrderVo);
/** /**
* 根据站点查询订单 * 根据站点查询订单
......
qianhe-admin/src/main/java/com/qianhe/system/service/IWaterOrderService.java
...@@ -118,7 +118,7 @@ public interface IWaterOrderService ...@@ -118,7 +118,7 @@ public interface IWaterOrderService
* PC端首页统计 * PC端首页统计
* @return * @return
*/ */
List<Map<String,Integer>> countOrderNum(); Map<String, Integer> countOrderNum();
/** /**
* 新增退款订单 * 新增退款订单
......
qianhe-admin/src/main/java/com/qianhe/system/service/impl/WaterOrderServiceImpl.java
...@@ -358,7 +358,7 @@ public class WaterOrderServiceImpl implements IWaterOrderService ...@@ -358,7 +358,7 @@ public class WaterOrderServiceImpl implements IWaterOrderService
WaterOrderVo waterOrderVo = new WaterOrderVo(); WaterOrderVo waterOrderVo = new WaterOrderVo();
waterOrderVo.setStationId(stationId); waterOrderVo.setStationId(stationId);
waterOrderVo.setCreateTime(DateUtils.getNowDate()); waterOrderVo.setCreateTime(DateUtils.getNowDate());
return waterOrderMapper.getOrderNumByStation(waterOrderVo); return waterOrderMapper.getOrderNumByStation1(waterOrderVo);
} }
/** /**
...@@ -450,8 +450,8 @@ public class WaterOrderServiceImpl implements IWaterOrderService ...@@ -450,8 +450,8 @@ public class WaterOrderServiceImpl implements IWaterOrderService
* @return * @return
*/ */
@Override @Override
public List<Map<String, Integer>> countOrderNum() { public Map<String, Integer> countOrderNum() {
//获取当前年份 /* //获取当前年份
Calendar calendar = Calendar.getInstance(); Calendar calendar = Calendar.getInstance();
calendar.setTime(DateUtils.getNowDate()); calendar.setTime(DateUtils.getNowDate());
int year = calendar.get(Calendar.YEAR); int year = calendar.get(Calendar.YEAR);
...@@ -471,8 +471,11 @@ public class WaterOrderServiceImpl implements IWaterOrderService ...@@ -471,8 +471,11 @@ public class WaterOrderServiceImpl implements IWaterOrderService
tjList.add(tj); tjList.add(tj);
} }
} }
} }*/
return tjList;
WaterOrderVo orderVo = new WaterOrderVo();
orderVo.setCreateTime(DateUtils.getNowDate());
return waterOrderMapper.getOrderNumByStation2(orderVo);
} }
/** /**
......
qianhe-admin/src/main/java/com/qianhe/system/task/WaterTask.java
...@@ -29,7 +29,7 @@ public class WaterTask { ...@@ -29,7 +29,7 @@ public class WaterTask {
// 计算差值并转换为小时数 // 计算差值并转换为小时数
long difference = waterOrder.getCreateTime().getTime() - DateUtils.getNowDate().getTime(); long difference = waterOrder.getCreateTime().getTime() - DateUtils.getNowDate().getTime();
long hours = difference / (60 * 60 * 1000); long hours = difference / (60 * 60 * 1000);
//判断该订单是否已超过十二小时 //判断该订单是否已超过二十四小时
if (hours > 24){ if (hours > 24){
//普通订单，修改订单状态为已完成 //普通订单，修改订单状态为已完成
//判断送水工是否点击已送达 //判断送水工是否点击已送达
......
qianhe-admin/src/main/resources/mapper/WaterOrderMapper.xml
...@@ -81,7 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -81,7 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="confirmState != null "> and confirm_state = #{confirmState}</if> <if test="confirmState != null "> and confirm_state = #{confirmState}</if>
<if test="payState != null "> and pay_state = #{payState}</if> <if test="payState != null "> and pay_state = #{payState}</if>
<if test="payType != null "> and pay_type = #{payType}</if> <if test="payType != null "> and pay_type = #{payType}</if>
<if test="payNum != null and payNum != ''"> and pay_num = #{payNum}</if> <!-- <if test="payNum != null and payNum != ''"> and pay_num = #{payNum}</if>-->
<if test="cancelResult != null and cancelResult != ''"> and cancel_result = #{cancelResult}</if> <if test="cancelResult != null and cancelResult != ''"> and cancel_result = #{cancelResult}</if>
<if test="userAddressId != null"> and user_address_id = #{userAddressId}</if> <if test="userAddressId != null"> and user_address_id = #{userAddressId}</if>
<if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if> <if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
...@@ -103,6 +103,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -103,6 +103,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="startTime != null and startTime != '' and endTime != null and endTime != '' "> and create_time BETWEEN #{startTime} AND #{endTime}</if> <if test="startTime != null and startTime != '' and endTime != null and endTime != '' "> and create_time BETWEEN #{startTime} AND #{endTime}</if>
</where> </where>
order by create_time DESC order by create_time DESC
<if test="pageNum != null"> limit #{pageNum}</if>
</select> </select>
<select id="getWaterOrderListByStationId" parameterType="com.qianhe.system.vo.WaterOrderVo" resultType="com.qianhe.system.vo.WaterOrderVo"> <select id="getWaterOrderListByStationId" parameterType="com.qianhe.system.vo.WaterOrderVo" resultType="com.qianhe.system.vo.WaterOrderVo">
...@@ -310,6 +311,41 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -310,6 +311,41 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
WHERE del_flag = '0' and station_id = #{stationId} and order_state != 1 and DATE_FORMAT(create_time, '%Y-%m-%d') = DATE_FORMAT(#{createTime}, '%Y-%m-%d'); WHERE del_flag = '0' and station_id = #{stationId} and order_state != 1 and DATE_FORMAT(create_time, '%Y-%m-%d') = DATE_FORMAT(#{createTime}, '%Y-%m-%d');
</select> </select>
<select id="getOrderNumByStation1" parameterType="com.qianhe.system.vo.WaterOrderVo" resultType="Map">
SELECT
COUNT(id) as todayOrderNum,
(SELECT COUNT(id) as totalOrderNum FROM `water_order` WHERE del_flag = '0' and station_id = '17') as totalOrderNum,
(SELECT COUNT(id) as inComOrderNum FROM `water_order` WHERE del_flag = '0' and station_id = '17' and order_state in (2,3)) as inComOrderNum,
(select sum(goods_total) totalPrice from water_order_goods where order_id in
(select id FROM `water_order` WHERE del_flag = '0' and station_id = '17' and order_state = 4)) totalPrice
FROM `water_order`
WHERE del_flag = '0' and station_id = #{stationId} and order_state != 1 and DATE_FORMAT(create_time, '%Y-%m-%d') = DATE_FORMAT(#{createTime}, '%Y-%m-%d');
</select>
<select id="getOrderNumByStation2" parameterType="com.qianhe.system.vo.WaterOrderVo" resultType="Map">
select
(select count(*) userTotal from water_user where del_flag = '0') userTotal,
(select count(*) todayUserTotal from water_user where del_flag = '0' and DATE_FORMAT(create_time, '%Y-%m-%d') = DATE_FORMAT('2024-04-01', '%Y-%m-%d') )todayUserTotal,
(select count(*) monUserTotal from water_user where del_flag = '0' and DATE_FORMAT(create_time, '%Y-%m') = DATE_FORMAT('2024-04-01', '%Y-%m') )monUserTotal,
(select count(*) yearlUserTotal from water_user where del_flag = '0' and DATE_FORMAT(create_time, '%Y') = DATE_FORMAT('2024-04-01', '%Y') )yearlUserTotal,
COUNT(id) as todayOrderNum,
(SELECT COUNT(id) as inComOrderNum FROM `water_order` WHERE del_flag = '0' and order_state = 1) as comOrderNum,
(SELECT COUNT(id) as inComOrderNum FROM `water_order` WHERE del_flag = '0' and order_state = 3) as proOrderNum,
/*(SELECT COUNT(id) as totalOrderNum FROM `water_order` WHERE del_flag = '0' ) as totalOrderNum,*/
(SELECT COUNT(id) as inComOrderNum FROM `water_order` WHERE del_flag = '0' and order_state in (2,3)) as inComOrderNum,
(select sum(goods_total) totalPrice from water_order_goods where order_id in
(select id FROM `water_order` WHERE del_flag = '0')) totalPrice,
ifnull((select sum(goods_total) totalPrice from water_order_goods where order_id in
(select id FROM `water_order` WHERE del_flag = '0' and order_state = 4)),0) comPrice,
ifnull((select sum(goods_total) totalPrice from water_order_goods where order_id in
(select id FROM `water_order` WHERE del_flag = '0' and order_state = 3)),0) proPrice,
ifnull((select sum(goods_total) totalPrice from water_order_goods where order_id in
(select id FROM `water_order` WHERE del_flag = '0' and order_state = 3)),0) unPaidPrice
FROM `water_order`
WHERE del_flag = '0' and order_state != 1 and DATE_FORMAT(create_time, '%Y-%m-%d') = DATE_FORMAT(#{createTime}, '%Y-%m-%d');
</select>
<select id="getOrderNumByUser" parameterType="com.qianhe.system.vo.WaterOrderVo" resultType="Map"> <select id="getOrderNumByUser" parameterType="com.qianhe.system.vo.WaterOrderVo" resultType="Map">
SELECT COUNT(id) as orderNum FROM `water_order` WHERE del_flag = '0' AND user_id = #{userId} AND order_state = #{orderState}; SELECT COUNT(id) as orderNum FROM `water_order` WHERE del_flag = '0' AND user_id = #{userId} AND order_state = #{orderState};
</select> </select>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment