From a27a4871c8b214e2ba3e5f1e557ae53e683206a4 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 25 Jun 2021 16:40:18 +0800
Subject: [PATCH] 20210625 商品分类
---
gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml | 45 +++++++++++++++
gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java | 24 +++++++
gc-shop/src/main/java/com/xzx/gc/shop/mapper/JhyOrderMapper.java | 15 +++++
gc-shop/src/main/resources/mapper/shop/ScoreDetailsMapper.xml | 2
gc-shop/src/main/resources/mapper/shop/ScoreGoodsCategoryMapper.xml | 2
gc-shop/src/main/resources/mapper/shop/ScoreOrderMapper.xml | 2
gc-shop/src/main/java/com/xzx/gc/shop/dto/QueryJhyOrderListDto.java | 8 ++
gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryJhyOrderListVo.java | 26 ++++++++
8 files changed, 119 insertions(+), 5 deletions(-)
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/dto/QueryJhyOrderListDto.java b/gc-shop/src/main/java/com/xzx/gc/shop/dto/QueryJhyOrderListDto.java
index de124f0..1023b43 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/dto/QueryJhyOrderListDto.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/dto/QueryJhyOrderListDto.java
@@ -16,7 +16,7 @@
private String account;
@ApiModelProperty(value="状态 1-待接单2-服务中3-已收款4-待入库5-已完成6-已取消")
- private String status;
+ private Integer status;
@JsonFormat(shape=JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty(value="预约开始时间")
@@ -25,4 +25,10 @@
@JsonFormat(shape=JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty(value="预约结束时间")
private Date reserveTimeEnd;
+
+ @ApiModelProperty(value="第几页",required=true)
+ private int page;
+
+ @ApiModelProperty(value="每一页数量",required=true)
+ private int limit;
}
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/mapper/JhyOrderMapper.java b/gc-shop/src/main/java/com/xzx/gc/shop/mapper/JhyOrderMapper.java
new file mode 100644
index 0000000..583c091
--- /dev/null
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/mapper/JhyOrderMapper.java
@@ -0,0 +1,15 @@
+package com.xzx.gc.shop.mapper;
+
+import com.xzx.gc.entity.JhyOrder;
+import com.xzx.gc.shop.dto.QueryJhyOrderListDto;
+import com.xzx.gc.shop.vo.QueryJhyOrderListVo;
+import com.xzx.gc.util.GcMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface JhyOrderMapper extends GcMapper<JhyOrder> {
+
+ List<QueryJhyOrderListVo> queryOrderList(@Param("record") QueryJhyOrderListDto model);
+
+}
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java b/gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java
index 9ce3f6d..e0f39e4 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java
@@ -1,17 +1,39 @@
package com.xzx.gc.shop.service;
+import cn.hutool.core.convert.Convert;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
import com.xzx.gc.shop.dto.QueryJhyOrderListDto;
+import com.xzx.gc.shop.mapper.JhyOrderMapper;
+import com.xzx.gc.shop.vo.QueryGoodsListVo;
+import com.xzx.gc.shop.vo.QueryJhyOrderListVo;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.List;
import java.util.Map;
@Service
@Transactional
@Slf4j
public class JhyService {
+
+ @Resource
+ JhyOrderMapper jhyOrderMapper;
+
public Map<String, Object> queryOrderList(QueryJhyOrderListDto model) {
- return null;
+ PageHelper.startPage(model.getPage(), model.getLimit());
+ List<QueryJhyOrderListVo> maps = jhyOrderMapper.queryOrderList(model);
+ PageInfo pageInfo = new PageInfo(maps);
+ int count = Convert.toInt(pageInfo.getTotal());
+ Map<String, Object> map = new HashMap<>();
+ map.put("data", maps);
+ map.put("count", count);
+ map.put("code", 0);
+ return map;
}
+
}
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryJhyOrderListVo.java b/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryJhyOrderListVo.java
index ffc5ad3..ae1f281 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryJhyOrderListVo.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryJhyOrderListVo.java
@@ -1,9 +1,35 @@
package com.xzx.gc.shop.vo;
import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+
+import java.math.BigDecimal;
@Data
@ApiModel(value = "QueryJhyOrderListVo", description = "返回")
public class QueryJhyOrderListVo {
+
+ private Long id;
+ @ApiModelProperty(value="订单号")
+ private String orderNo;
+ @ApiModelProperty(value="联系人")
+ private String name;
+ @ApiModelProperty(value="手机号")
+ private String mobilePhone;
+ @ApiModelProperty(value="区域地址")
+ private String area;
+ @ApiModelProperty(value="详细地址")
+ private String address;
+ @ApiModelProperty(value="预约时间")
+ private String reserveTime;
+ @ApiModelProperty(value="订单总金额")
+ private BigDecimal totalPrice;
+ @ApiModelProperty(value="状态 1-待接单2-服务中3-已收款4-待入库5-已完成6-已取消")
+ private Integer status;
+ @ApiModelProperty(value="集物员")
+ private String username;
+ @ApiModelProperty(value="备注")
+ private String remark;
+
}
diff --git a/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml b/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
new file mode 100644
index 0000000..afa46fe
--- /dev/null
+++ b/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xzx.gc.shop.mapper.JhyOrderMapper">
+
+ <select id="queryOrderList" resultType="com.xzx.gc.shop.vo.QueryJhyOrderListVo">
+ SELECT
+ a.id id,
+ a.order_no orderNo,
+ a.area area,
+ a.address address,
+ a.reserve_time reserveTime,
+ a.status status,
+ a.remark remark,
+ b.name name,
+ b.mobile_phone mobilePhone,
+ (select ifnull(sum(price),0) from xzx_jhy_order_items where order_id = a.id) totalPrice,
+ d.username username
+ FROM
+ xzx_jhy_order a
+ left join xzx_user_info b on b.user_id = a.user_id
+ left join xzx_jhy_info d on d.id = a.jhy_id
+ WHERE 1 = 1
+ <if test="record.orderNo != null and record.orderNo != ''">
+ and a.order_no like concat('%',#{record.orderNo},'%')
+ </if>
+ <if test="record.status != null and record.status != ''">
+ and a.status = #{record.status}
+ </if>
+ <if test="record.account != null and record.account != ''">
+ and ( b.name like concat('%',#{record.account},'%')
+ or b.mobile_phone like concat('%',#{record.account},'%') )
+ </if>
+ <if test="record.reserveTimeStart != null">
+ and a.reserve_time >= #{record.reserveTimeStart}
+ </if>
+
+ <if test="record.reserveTimeEnd != null">
+ and a.reserve_time <= #{record.reserveTimeEnd}
+ </if>
+ order by a.CREATED_TIME desc
+ </select>
+
+
+
+</mapper>
diff --git a/gc-shop/src/main/resources/mapper/shop/ScoreDetailsMapper.xml b/gc-shop/src/main/resources/mapper/shop/ScoreDetailsMapper.xml
index 090de52..cbe17ef 100644
--- a/gc-shop/src/main/resources/mapper/shop/ScoreDetailsMapper.xml
+++ b/gc-shop/src/main/resources/mapper/shop/ScoreDetailsMapper.xml
@@ -21,7 +21,7 @@
</if>
<if test="record.createTimeEnd != null">
- and a.CREATED_TIME >= #{record.createTimeEnd}
+ and a.CREATED_TIME <= #{record.createTimeEnd}
</if>
order by a.CREATED_TIME desc
</select>
diff --git a/gc-shop/src/main/resources/mapper/shop/ScoreGoodsCategoryMapper.xml b/gc-shop/src/main/resources/mapper/shop/ScoreGoodsCategoryMapper.xml
index 690fb84..9ee661b 100644
--- a/gc-shop/src/main/resources/mapper/shop/ScoreGoodsCategoryMapper.xml
+++ b/gc-shop/src/main/resources/mapper/shop/ScoreGoodsCategoryMapper.xml
@@ -25,7 +25,7 @@
xzx_score_goods_category a
WHERE 1 = 1
<if test="record.name != null and record.name != ''">
- and a.name=#{record.name}
+ and a.name like concat('%',#{record.name},'%')
</if>
<if test="record.categoryIden != null and record.categoryIden != ''">
and a.category_iden=#{record.categoryIden}
diff --git a/gc-shop/src/main/resources/mapper/shop/ScoreOrderMapper.xml b/gc-shop/src/main/resources/mapper/shop/ScoreOrderMapper.xml
index b5d4a59..6a8941d 100644
--- a/gc-shop/src/main/resources/mapper/shop/ScoreOrderMapper.xml
+++ b/gc-shop/src/main/resources/mapper/shop/ScoreOrderMapper.xml
@@ -30,7 +30,7 @@
</if>
<if test="createdTimeEnd != null">
- and a.CREATED_TIME >= #{createdTimeEnd}
+ and a.CREATED_TIME <= #{createdTimeEnd}
</if>
order by a.CREATED_TIME desc
</select>
--
Gitblit v1.9.1