Skip to content

F
farming
Commit c58dbf9f by 郑云飞
Options

后管团购订单功能完成

parent 697f0488
Showing with 199 additions and 37 deletions
src/main/java/com/yunniu/farming/webadmin/controller/GroupOrderController.java
...@@ -4,6 +4,8 @@ import com.yunniu.farming.common.plugin.PageInfo; ...@@ -4,6 +4,8 @@ import com.yunniu.farming.common.plugin.PageInfo;
import com.yunniu.farming.result.Result; import com.yunniu.farming.result.Result;
import com.yunniu.farming.webadmin.model.GroupBuy; import com.yunniu.farming.webadmin.model.GroupBuy;
import com.yunniu.farming.webadmin.model.GroupOrder; import com.yunniu.farming.webadmin.model.GroupOrder;
import com.yunniu.farming.webadmin.model.OrderMain;
import com.yunniu.farming.webadmin.model.OrderSub;
import com.yunniu.farming.webadmin.service.GroupOrderService; import com.yunniu.farming.webadmin.service.GroupOrderService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
...@@ -33,6 +35,12 @@ public class GroupOrderController { ...@@ -33,6 +35,12 @@ public class GroupOrderController {
return "groupOrder/list"; return "groupOrder/list";
} }
@RequestMapping("/detailList")
public String detailList(Model model, Long id) {
model.addAttribute("orderId", id);
return "groupOrder/detailList";
}
@RequestMapping(value = "/orderDetail") @RequestMapping(value = "/orderDetail")
public String addOrEdit(Model model, Long id) { public String addOrEdit(Model model, Long id) {
model.addAttribute("id", id); model.addAttribute("id", id);
...@@ -92,4 +100,108 @@ public class GroupOrderController { ...@@ -92,4 +100,108 @@ public class GroupOrderController {
rmap.put("items", list); rmap.put("items", list);
return Result.success(rmap); return Result.success(rmap);
} }
/**
* 团购订单用户列表
* @param item 团购订单id
* @return
*/
@RequestMapping(value = "/userList",method = RequestMethod.POST)
@ResponseBody
public Result userList(@RequestBody OrderMain item){
//这里对返回对象用Map处理，map.pageinfo=>分页信息；map.items=>结果数据集；
Map<String,Object> rmap = new HashMap<String,Object>(2);
//传入当前页数，适配PC端Layui分页
if (item.getCurpage() != null || item.getPagesize() != null) {
PageInfo pinfo = new PageInfo();
if (item.getCurpage() != null) {
pinfo.setCurPage(item.getCurpage());
}
if (item.getPagesize() != null) {
pinfo.setPageSize(item.getPagesize());
}
item.setPageinfo(pinfo);
}
// 1.查询前 需要对分页对象 做处理，主要是 分页 开始记录数 limit arg0开始记录，arg1每页几条记录
PageInfo pinfo = item.getPageinfo();
if (pinfo == null) {
pinfo = new PageInfo();
item.setPageinfo(pinfo);
} else {
// 分页开始记录数
int curRecord = (pinfo.getCurPage() - 1) * pinfo.getPageSize();
pinfo.setCurRecord(curRecord);
item.setPageinfo(pinfo);
}
List<OrderMain> list = groupOrderService.userList(item);
// 3.将查询结果的 分页数据封装后返回
int totalRs = pinfo.getTotalRecords(); //总记录数
int totalPs = 0; //总页数
if (totalRs % pinfo.getPageSize() == 0) { //总页数计算
totalPs = totalRs / pinfo.getPageSize();
} else {
totalPs = 1 + totalRs / pinfo.getPageSize();
}
pinfo.setTotalPages(totalPs);
// 4.将分页对象、结果集合 封装后返回前台
rmap.put("pageinfo", pinfo);
rmap.put("items", list);
return Result.success(rmap);
}
/**
* 购买商品列表
* @param item 用户列表id
* @return
*/
@RequestMapping(value = "/productList",method = RequestMethod.POST)
@ResponseBody
public Result productList(@RequestBody OrderSub item){
//这里对返回对象用Map处理，map.pageinfo=>分页信息；map.items=>结果数据集；
Map<String,Object> rmap = new HashMap<String,Object>(2);
//传入当前页数，适配PC端Layui分页
if (item.getCurpage() != null || item.getPagesize() != null) {
PageInfo pinfo = new PageInfo();
if (item.getCurpage() != null) {
pinfo.setCurPage(item.getCurpage());
}
if (item.getPagesize() != null) {
pinfo.setPageSize(item.getPagesize());
}
item.setPageinfo(pinfo);
}
// 1.查询前 需要对分页对象 做处理，主要是 分页 开始记录数 limit arg0开始记录，arg1每页几条记录
PageInfo pinfo = item.getPageinfo();
if (pinfo == null) {
pinfo = new PageInfo();
item.setPageinfo(pinfo);
} else {
// 分页开始记录数
int curRecord = (pinfo.getCurPage() - 1) * pinfo.getPageSize();
pinfo.setCurRecord(curRecord);
item.setPageinfo(pinfo);
}
List<OrderSub> list = groupOrderService.productList(item);
// 3.将查询结果的 分页数据封装后返回
int totalRs = pinfo.getTotalRecords(); //总记录数
int totalPs = 0; //总页数
if (totalRs % pinfo.getPageSize() == 0) { //总页数计算
totalPs = totalRs / pinfo.getPageSize();
} else {
totalPs = 1 + totalRs / pinfo.getPageSize();
}
pinfo.setTotalPages(totalPs);
// 4.将分页对象、结果集合 封装后返回前台
rmap.put("pageinfo", pinfo);
rmap.put("items", list);
return Result.success(rmap);
}
} }
src/main/java/com/yunniu/farming/webadmin/controller/OrderMainController.java
...@@ -135,7 +135,7 @@ public class OrderMainController { ...@@ -135,7 +135,7 @@ public class OrderMainController {
item.setPageinfo(pinfo); item.setPageinfo(pinfo);
} }
// 2.1 执行主表 查询 // 2.1 执行主表 查询
List<OrderMain> items=this.subService.selectSubByParamPageList(item); List<OrderSub> items=this.subService.selectSubByParamPageList(item);
// 3.将查询结果的 分页数据封装后返回 // 3.将查询结果的 分页数据封装后返回
int totalRs = pinfo.getTotalRecords(); //总记录数 int totalRs = pinfo.getTotalRecords(); //总记录数
......
src/main/java/com/yunniu/farming/webadmin/dao/OrderMainDao.java
...@@ -17,5 +17,5 @@ public interface OrderMainDao extends BaseMapper<OrderMain> { ...@@ -17,5 +17,5 @@ public interface OrderMainDao extends BaseMapper<OrderMain> {
Double countOrderMoney(OrderMain orderMain); Double countOrderMoney(OrderMain orderMain);
List<OrderMain> getPageListByGroupOrderId(OrderMain item);
} }
src/main/java/com/yunniu/farming/webadmin/dao/OrderSubDao.java
...@@ -17,7 +17,8 @@ public interface OrderSubDao extends BaseMapper<OrderSub> { ...@@ -17,7 +17,8 @@ public interface OrderSubDao extends BaseMapper<OrderSub> {
int insertBatch(List<OrderSub> sub); int insertBatch(List<OrderSub> sub);
List<OrderMain> selectByPageList(OrderSub sub); List<OrderSub> selectByPageList(OrderSub sub);
List<OrderSub> getPageListByOrderMianId(OrderSub item);
} }
\ No newline at end of file
src/main/java/com/yunniu/farming/webadmin/model/OrderMain.java
...@@ -131,4 +131,7 @@ public class OrderMain { ...@@ -131,4 +131,7 @@ public class OrderMain {
@TableField(exist = false) @TableField(exist = false)
private Integer appflag; private Integer appflag;
@TableField(exist = false)
private String swxnick;
} }
src/main/java/com/yunniu/farming/webadmin/service/GroupOrderService.java
package com.yunniu.farming.webadmin.service; package com.yunniu.farming.webadmin.service;
import com.yunniu.farming.webadmin.model.GroupBuy;
import com.yunniu.farming.webadmin.model.GroupOrder; import com.yunniu.farming.webadmin.model.GroupOrder;
import com.yunniu.farming.webadmin.model.OrderMain; import com.yunniu.farming.webadmin.model.OrderMain;
import com.yunniu.farming.webadmin.model.OrderSub;
import java.util.List; import java.util.List;
...@@ -18,4 +18,12 @@ public interface GroupOrderService { ...@@ -18,4 +18,12 @@ public interface GroupOrderService {
List<GroupOrder> findPageList(GroupOrder item); List<GroupOrder> findPageList(GroupOrder item);
GroupOrder findById(Long id); GroupOrder findById(Long id);
List<OrderMain> userList(OrderMain item);
/**
* 购买商品列表
* @param item 用户列表id
* @return
*/
List<OrderSub> productList(OrderSub item);
} }
src/main/java/com/yunniu/farming/webadmin/service/impl/GroupOrderServiceImpl.java
...@@ -4,16 +4,13 @@ import com.alibaba.fastjson.JSON; ...@@ -4,16 +4,13 @@ import com.alibaba.fastjson.JSON;
import com.aliyun.oss.ServiceException; import com.aliyun.oss.ServiceException;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.mysql.cj.xdevapi.Warning;
import com.yunniu.farming.util.StringHelper; import com.yunniu.farming.util.StringHelper;
import com.yunniu.farming.webadmin.dao.GroupAreaDao; import com.yunniu.farming.webadmin.dao.*;
import com.yunniu.farming.webadmin.dao.GroupBuyDao;
import com.yunniu.farming.webadmin.dao.GroupOrderDao;
import com.yunniu.farming.webadmin.model.GroupBuy; import com.yunniu.farming.webadmin.model.GroupBuy;
import com.yunniu.farming.webadmin.model.GroupOrder; import com.yunniu.farming.webadmin.model.GroupOrder;
import com.yunniu.farming.webadmin.model.OrderMain; import com.yunniu.farming.webadmin.model.OrderMain;
import com.yunniu.farming.webadmin.model.OrderSub;
import com.yunniu.farming.webadmin.service.GroupOrderService; import com.yunniu.farming.webadmin.service.GroupOrderService;
import lombok.Data;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -36,7 +33,9 @@ public class GroupOrderServiceImpl implements GroupOrderService { ...@@ -36,7 +33,9 @@ public class GroupOrderServiceImpl implements GroupOrderService {
@Autowired @Autowired
private GroupBuyDao groupBuyDao; private GroupBuyDao groupBuyDao;
@Autowired @Autowired
private GroupAreaDao groupAreaDao; private OrderMainDao orderMainDao;
@Autowired
private OrderSubDao orderSubDao;
/** /**
* 保存团购订单 * 保存团购订单
...@@ -97,9 +96,35 @@ public class GroupOrderServiceImpl implements GroupOrderService { ...@@ -97,9 +96,35 @@ public class GroupOrderServiceImpl implements GroupOrderService {
return orderDao.findPageList(item); return orderDao.findPageList(item);
} }
/**
* 团购订单详情
* @param id
* @return
*/
@Override @Override
public GroupOrder findById(Long id) { public GroupOrder findById(Long id) {
GroupOrder order = orderDao.detailById(id); GroupOrder order = orderDao.detailById(id);
return order; return order;
} }
/**
* 团购订单用户信息列表
* @param item
* @return
*/
@Override
public List<OrderMain> userList(OrderMain item) {
List<OrderMain> list = orderMainDao.getPageListByGroupOrderId(item);
return list;
}
/**
* 购买商品列表
* @param item 用户列表id
* @return
*/
@Override
public List<OrderSub> productList(OrderSub item) {
return orderSubDao.getPageListByOrderMianId(item);
}
} }
src/main/java/com/yunniu/farming/webadmin/service/impl/OrderSubServiceImpl.java
...@@ -73,7 +73,7 @@ public class OrderSubServiceImpl { ...@@ -73,7 +73,7 @@ public class OrderSubServiceImpl {
* 分页查询所有数据 * 分页查询所有数据
* @return * @return
*/ */
public List<OrderMain> selectSubByParamPageList(OrderSub sub) { public List<OrderSub> selectSubByParamPageList(OrderSub sub) {
return this.orderSubDao.selectByPageList(sub); return this.orderSubDao.selectByPageList(sub);
......
src/main/resources/mappings/GroupOrderMapper.xml
...@@ -2,23 +2,23 @@ ...@@ -2,23 +2,23 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.yunniu.farming.webadmin.dao.GroupOrderDao"> <mapper namespace="com.yunniu.farming.webadmin.dao.GroupOrderDao">
<select id="findPageList" resultType="com.yunniu.farming.webadmin.model.GroupOrder"> <select id="findPageList" resultType="com.yunniu.farming.webadmin.model.GroupOrder">
select select go.*,
go.*, gb.group_buy_title as groupBuyTitle,
gb.group_buy_title as groupBuyTitle, ga.area_name as areaName,
ga.area_name as areaName, sum(om.dactmoney) as sumDactmoney,
sum(om.dactmoney) as sumDactmoney count(om.id) as groupSize
from group_order go from group_order go
left join group_buy gb on go.group_buy_id = gb.id left join group_buy gb on go.group_buy_id = gb.id
left join group_area ga on go.area_id = ga.id left join group_area ga on go.area_id = ga.id
left join order_main om on go.id = om.group_order_id left join order_main om on go.id = om.group_order_id and om.ipaystatus = 1
<where> <where>
<if test="orderCode != null and orderCode != ''"> <if test="orderCode != null and orderCode != ''">
and go.order_code like concat('%', #{orderCode,jdbcType=VARCHAR},'%') and go.order_code like concat('%', #{orderCode,jdbcType=VARCHAR}, '%')
</if> </if>
<if test="groupBuyTitle != null and groupBuyTitle != ''"> <if test="groupBuyTitle != null and groupBuyTitle != ''">
and gb.group_buy_title like concat('%', #{groupBuyTitle,jdbcType=VARCHAR},'%') and gb.group_buy_title like concat('%', #{groupBuyTitle,jdbcType=VARCHAR}, '%')
</if> </if>
<if test="groupStatus != null"> <if test="groupStatus != null and groupStatus != ''">
and go.group_status = #{groupStatus,jdbcType=INTEGER} and go.group_status = #{groupStatus,jdbcType=INTEGER}
</if> </if>
</where> </where>
...@@ -27,16 +27,21 @@ ...@@ -27,16 +27,21 @@
</select> </select>
<select id="detailById" resultType="com.yunniu.farming.webadmin.model.GroupOrder"> <select id="detailById" resultType="com.yunniu.farming.webadmin.model.GroupOrder">
select select go.*,
go.*, (case go.group_status
(case go.group_status when 0 then '待成团' when 1 then '待发货' when 2 then '已发货' when 3 then '已完成' else '已取消' end) as groupStatus, when 0 then '待成团'
gb.group_buy_title as groupBuyTitle, when 1 then '待发货'
ga.area_name as areaName, when 2 then '已发货'
sum(om.dactmoney) as sumDactmoney when 3 then '已完成'
when 4 then '已取消' end) as groupStatus,
gb.group_buy_title as groupBuyTitle,
ga.area_name as areaName,
sum(om.dactmoney) as sumDactmoney,
count(om.id) as groupSize
from group_order go from group_order go
left join group_buy gb on go.group_buy_id = gb.id left join group_buy gb on go.group_buy_id = gb.id
left join group_area ga on go.area_id = ga.id left join group_area ga on go.area_id = ga.id
left join order_main om on go.id = om.group_order_id left join order_main om on go.id = om.group_order_id and om.ipaystatus = 1
where go.id = #{id,jdbcType=BIGINT} where go.id = #{id,jdbcType=BIGINT}
</select> </select>
</mapper> </mapper>
\ No newline at end of file
src/main/resources/mappings/OrderSubMapper.xml
...@@ -69,5 +69,9 @@ ...@@ -69,5 +69,9 @@
#{item.ddef8,jdbcType=DECIMAL}, #{item.ddef9,jdbcType=DECIMAL}, #{item.ddef10,jdbcType=TIMESTAMP}) #{item.ddef8,jdbcType=DECIMAL}, #{item.ddef9,jdbcType=DECIMAL}, #{item.ddef10,jdbcType=TIMESTAMP})
</foreach> </foreach>
</insert> </insert>
<!-- 批量插入e -->
<select id="getPageListByOrderMianId" resultMap="BaseResultMap">
select sproductname, ipronum, spshortpic, sgoodprice, dprosum from order_sub where mainid = #{id,jdbcType=BIGINT}
</select>
<!-- 批量插入e -->
</mapper> </mapper>
\ No newline at end of file
src/main/resources/templates/groupArea/list.html
...@@ -213,7 +213,6 @@ ...@@ -213,7 +213,6 @@
}); });
}); });
} else if (obj.event === 'edit') { } else if (obj.event === 'edit') {
console.log("1111111111111111111 =", obj.data.id);
var id = obj.data.id; var id = obj.data.id;
var w = ($(window).width() * 0.9); var w = ($(window).width() * 0.9);
var h = ($(window).height() * 0.9); var h = ($(window).height() * 0.9);
......
src/main/resources/templates/groupOrder/detailList.html
...@@ -43,8 +43,10 @@ ...@@ -43,8 +43,10 @@
table.render({ table.render({
elem: '#tableId' elem: '#tableId'
, url: 'findSubPageList' , url: 'productList'
, where: field , where: {
id: id
}
, method: 'post' , method: 'post'
,contentType: "application/json" // 内容编码， json格式 ,contentType: "application/json" // 内容编码， json格式
, height: 500 , height: 500
...@@ -61,7 +63,7 @@ ...@@ -61,7 +63,7 @@
} }
,response: { ,response: {
statusName: "code", // 规定数据状态的字段名称，默认：code statusName: "code", // 规定数据状态的字段名称，默认：code
statusCode: 0, // 规定成功的状态码，默认：0 statusCode: 100, // 规定成功的状态码，默认：0
msgName: "msg", // 规定状态信息的字段名称，默认：msg msgName: "msg", // 规定状态信息的字段名称，默认：msg
countName: "count", // 规定数据总数的字段名称，默认：count countName: "count", // 规定数据总数的字段名称，默认：count
dataName: "data" // 规定数据列表的字段名称，默认：data dataName: "data" // 规定数据列表的字段名称，默认：data
...@@ -81,7 +83,7 @@ ...@@ -81,7 +83,7 @@
, cols: [ , cols: [
[ [
{type: 'checkbox', fixed: "left"} {type: 'checkbox', fixed: "left"}
, {field: 'sproductname',width: 100,title: '商品名称'} , {field: 'sproductname',width: 200,title: '商品名称'}
,{ ,{
title: "商品图片", title: "商品图片",
align: "center", align: "center",
...@@ -91,8 +93,9 @@ ...@@ -91,8 +93,9 @@
''; '';
} }
} }
, {field: 'ipronum', width: 100, title: '购买数量'} , {field: 'ipronum', width: 150, title: '购买数量'}
, {field: 'dprosum', width: 100, title: '金额小计'} , {field: 'sgoodprice', width: 150, title: '商品售价'}
, {field: 'dprosum', width: 150, title: '金额小计'}
......
src/main/resources/templates/groupOrder/list.html
...@@ -155,7 +155,6 @@ ...@@ -155,7 +155,6 @@
, {field: 'areaName', title: '小区名称'} , {field: 'areaName', title: '小区名称'}
, {field: 'orderCode', title: '订单编号'} , {field: 'orderCode', title: '订单编号'}
, {field: 'sumDactmoney', title: '订单实付金额'} , {field: 'sumDactmoney', title: '订单实付金额'}
, {field: 'sumDactmoney', title: '订单实付金额'}
,{ ,{
title: "订单状态", title: "订单状态",
templet: function(d) { templet: function(d) {
......
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