wang-hao-jie
2021-11-08 433ba5ddafd57d6ce6173a6ba7d2d97851c5a4c6
订单
2个文件已修改
18个文件已添加
803 ■■■■■ 已修改文件
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/DrivingRecordController.java 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderDetailController.java 77 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTaskController.java 173 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/UserStatisticController.java 89 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/DrivingRecord.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/OrderDetail.java 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/OrderTask.java 108 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/UserStatistic.java 75 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/OrderDetailMapper.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/OrderTaskMapper.java 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/UserStatisticMapper.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IOrderDetailService.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IOrderTaskService.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IUserStatisticService.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IOrderDetailServiceImpl.java 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IOrderTaskServiceImpl.java 41 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IUserStatisticServiceImpl.java 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
xboot-modules/xboot-your/src/main/resources/mapper/OrderDetailMapper.xml 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
xboot-modules/xboot-your/src/main/resources/mapper/OrderTaskMapper.xml 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
xboot-modules/xboot-your/src/main/resources/mapper/UserStatisticMapper.xml 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/DrivingRecordController.java
@@ -5,7 +5,9 @@
import cn.exrick.xboot.core.common.vo.PageVo;
import cn.exrick.xboot.core.common.vo.Result;
import cn.exrick.xboot.your.entity.DrivingRecord;
import cn.exrick.xboot.your.entity.OrderTask;
import cn.exrick.xboot.your.service.IDrivingRecordService;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -16,6 +18,7 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
import java.util.List;
/**
@@ -31,6 +34,27 @@
    @Autowired
    private IDrivingRecordService iDrivingRecordService;
    @RequestMapping(value = "/orderConfirm", method = RequestMethod.POST)
    @ApiOperation(value = "订单确认")
    public Result<DrivingRecord> orderConfirm(DrivingRecord record) {
        if(StrUtil.isEmpty(record.getCarId())){
            return ResultUtil.error("车辆id不能为空");
        }
        String format = DateUtil.format(new Date(), "yyyy-MM-dd");
        QueryWrapper<DrivingRecord> wrapper = new QueryWrapper<>();
        wrapper.eq("driving_date",format);
        wrapper.eq("car_id",record.getCarId());
        int count = iDrivingRecordService.count(wrapper);
        if(count>0){
            return ResultUtil.error("今日已核对,请勿重复提交");
        }
        record.setDrivingDate(DateUtil.parse(format));
        iDrivingRecordService.saveOrUpdate(record);
        return ResultUtil.success("操作成功");
    }
    @RequestMapping(value = "/get/{id}", method = RequestMethod.GET)
    @ApiOperation(value = "通过id获取")
    public Result<DrivingRecord> get(@PathVariable String id) {
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderDetailController.java
New file
@@ -0,0 +1,77 @@
package cn.exrick.xboot.your.controller;
import cn.exrick.xboot.core.common.utils.PageUtil;
import cn.exrick.xboot.core.common.utils.ResultUtil;
import cn.exrick.xboot.core.common.vo.PageVo;
import cn.exrick.xboot.core.common.vo.Result;
import cn.exrick.xboot.your.entity.OrderDetail;
import cn.exrick.xboot.your.service.IOrderDetailService;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
/**
 * @author whj
 */
@Slf4j
@RestController
@Api(tags = "订单详情表管理接口")
@RequestMapping("/xboot/orderDetail")
@Transactional
public class OrderDetailController {
    @Autowired
    private IOrderDetailService iOrderDetailService;
    @RequestMapping(value = "/get/{id}", method = RequestMethod.GET)
    @ApiOperation(value = "通过id获取")
    public Result<OrderDetail> get(@PathVariable String id) {
        OrderDetail orderDetail = iOrderDetailService.getById(id);
        return new ResultUtil<OrderDetail>().setData(orderDetail);
    }
    @RequestMapping(value = "/getAll", method = RequestMethod.GET)
    @ApiOperation(value = "获取全部数据")
    public Result<List<OrderDetail>> getAll() {
        List<OrderDetail> list = iOrderDetailService.list();
        return new ResultUtil<List<OrderDetail>>().setData(list);
    }
    @RequestMapping(value = "/getByPage", method = RequestMethod.GET)
    @ApiOperation(value = "分页获取")
    public Result<IPage<OrderDetail>> getByPage(PageVo page) {
        IPage<OrderDetail> data = iOrderDetailService.page(PageUtil.initMpPage(page));
        return new ResultUtil<IPage<OrderDetail>>().setData(data);
    }
    @RequestMapping(value = "/insertOrUpdate", method = RequestMethod.POST)
    @ApiOperation(value = "编辑或更新数据")
    public Result<OrderDetail> saveOrUpdate(OrderDetail orderDetail) {
        if (iOrderDetailService.saveOrUpdate(orderDetail)) {
            return new ResultUtil<OrderDetail>().setData(orderDetail);
        }
        return new ResultUtil<OrderDetail>().setErrorMsg("操作失败");
    }
    @RequestMapping(value = "/delByIds", method = RequestMethod.POST)
    @ApiOperation(value = "批量通过id删除")
    public Result<Object> delAllByIds(@RequestParam String[] ids) {
        for (String id : ids) {
            iOrderDetailService.removeById(id);
        }
        return ResultUtil.success("批量通过id删除数据成功");
    }
}
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTaskController.java
New file
@@ -0,0 +1,173 @@
package cn.exrick.xboot.your.controller;
import cn.exrick.xboot.core.common.utils.PageUtil;
import cn.exrick.xboot.core.common.utils.ResultUtil;
import cn.exrick.xboot.core.common.utils.SecurityUtil;
import cn.exrick.xboot.core.common.vo.PageVo;
import cn.exrick.xboot.core.common.vo.Result;
import cn.exrick.xboot.your.entity.Area;
import cn.exrick.xboot.your.entity.OrderDetail;
import cn.exrick.xboot.your.entity.OrderTask;
import cn.exrick.xboot.your.service.IAreaService;
import cn.exrick.xboot.your.service.ICustomerService;
import cn.exrick.xboot.your.service.IOrderDetailService;
import cn.exrick.xboot.your.service.IOrderTaskService;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
 * @author whj
 */
@Slf4j
@RestController
@Api(tags = "订单接口")
@RequestMapping("/xboot/orderTask")
@Transactional
public class OrderTaskController {
    @Autowired
    private IOrderTaskService iOrderTaskService;
    @Autowired
    private IAreaService iAreaService;
    @Autowired
    private ICustomerService iCustomerService;
    @Autowired
    private IOrderDetailService iOrderDetailService;
    @Autowired
    private SecurityUtil securityUtil;
    @RequestMapping(value = "/get/{id}", method = RequestMethod.GET)
    @ApiOperation(value = "通过id获取")
    public Result<OrderTask> get(@PathVariable String id) {
        OrderTask orderTask = iOrderTaskService.getById(id);
        return new ResultUtil<OrderTask>().setData(orderTask);
    }
    @RequestMapping(value = "/getByUserId", method = RequestMethod.GET)
    @ApiOperation(value = "获取今日任务统计信息")
    public Result<Object> getAll() {
        QueryWrapper<Area> wrapper = new QueryWrapper<Area>();
        wrapper.eq("user_id",securityUtil.getCurrUser().getId());
        Area area = iAreaService.getOne(wrapper);
        if(area==null){
            return ResultUtil.error("请联系管理员绑定片区配送员");
        }
        QueryWrapper<OrderTask> wrapper2 = new QueryWrapper<OrderTask>();
        String format = DateUtil.format(new Date(), "yyyy-MM-dd");
        wrapper2.eq("area_id",area.getId());
        wrapper2.eq("send_date",format);
        int count = iOrderTaskService.count(wrapper2);
        int sum = iOrderTaskService.sum(area.getId(),format);
        Map<String,Object> map = new HashMap<String,Object>();
        map.put("count",count);
        map.put("sum",sum);
        return new ResultUtil<Object>().setData(map);
    }
    @RequestMapping(value = "/getTodayOrder", method = RequestMethod.GET)
    @ApiOperation(value = "获取今日任务详情")
    public Result<List<OrderTask>> getTodayOrder() {
        QueryWrapper<Area> wrapper = new QueryWrapper<Area>();
        wrapper.eq("user_id",securityUtil.getCurrUser().getId());
        Area area = iAreaService.getOne(wrapper);
        if(area==null){
            return ResultUtil.error("请联系管理员绑定片区配送员");
        }
        QueryWrapper<OrderTask> wrapper2 = new QueryWrapper<OrderTask>();
        String format = DateUtil.format(new Date(), "yyyy-MM-dd");
        wrapper2.eq("a.area_id",area.getId());
        wrapper2.eq("a.send_date",format);
        wrapper2.orderByAsc("a.seq");
        List<OrderTask> list = iOrderTaskService.list2(wrapper2);
        return new ResultUtil<List<OrderTask>>().setData(list);
    }
    @RequestMapping(value = "/getTodayOrderDetail", method = RequestMethod.GET)
    @ApiOperation(value = "获取当前配送商户详情")
    public Result<OrderTask> getTodayOrderDetail(String orderId) {
        OrderTask orderTask = new OrderTask();
        if(!StrUtil.isEmpty(orderId)){
            orderTask = iOrderTaskService.getById(orderId);
            if(orderTask.getStatus()!=0){
                return ResultUtil.error("此商户已配送");
            }
        }else{
            QueryWrapper<Area> wrapper = new QueryWrapper<Area>();
            wrapper.eq("user_id",securityUtil.getCurrUser().getId());
            Area area = iAreaService.getOne(wrapper);
            if(area==null){
                return ResultUtil.error("请联系管理员绑定片区配送员");
            }
            QueryWrapper<OrderTask> wrapper2 = new QueryWrapper<OrderTask>();
            String format = DateUtil.format(new Date(), "yyyy-MM-dd");
            wrapper2.eq("area_id",area.getId());
            wrapper2.eq("send_date",format);
            wrapper2.ne("status",0);
            wrapper2.orderByAsc("seq");
            List<OrderTask> list = iOrderTaskService.list(wrapper2);
            if(list.size()>0){
                orderTask = list.get(0);
            }else{
                return new ResultUtil<OrderTask>().setData(null);
            }
        }
        orderTask.setCustomer(iCustomerService.getById(orderTask.getCustomerId()));
        QueryWrapper<OrderDetail> wrapper3 = new QueryWrapper<OrderDetail>();
        wrapper3.eq("order_id",orderTask.getId());
        orderTask.setOrderDetails(iOrderDetailService.list(wrapper3));
        return new ResultUtil<OrderTask>().setData(orderTask);
    }
    @RequestMapping(value = "/getByPage", method = RequestMethod.GET)
    @ApiOperation(value = "分页获取")
    public Result<IPage<OrderTask>> getByPage(PageVo page) {
        IPage<OrderTask> data = iOrderTaskService.page(PageUtil.initMpPage(page));
        return new ResultUtil<IPage<OrderTask>>().setData(data);
    }
    @RequestMapping(value = "/insertOrUpdate", method = RequestMethod.POST)
    @ApiOperation(value = "编辑或更新数据")
    public Result<OrderTask> saveOrUpdate(OrderTask orderTask) {
        if (iOrderTaskService.saveOrUpdate(orderTask)) {
            return new ResultUtil<OrderTask>().setData(orderTask);
        }
        return new ResultUtil<OrderTask>().setErrorMsg("操作失败");
    }
    @RequestMapping(value = "/delByIds", method = RequestMethod.POST)
    @ApiOperation(value = "批量通过id删除")
    public Result<Object> delAllByIds(@RequestParam String[] ids) {
        for (String id : ids) {
            iOrderTaskService.removeById(id);
        }
        return ResultUtil.success("批量通过id删除数据成功");
    }
}
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/UserStatisticController.java
New file
@@ -0,0 +1,89 @@
package cn.exrick.xboot.your.controller;
import cn.exrick.xboot.core.common.utils.PageUtil;
import cn.exrick.xboot.core.common.utils.ResultUtil;
import cn.exrick.xboot.core.common.vo.PageVo;
import cn.exrick.xboot.core.common.vo.Result;
import cn.exrick.xboot.your.entity.UserStatistic;
import cn.exrick.xboot.your.service.IUserStatisticService;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
/**
 * @author whj
 */
@Slf4j
@RestController
@Api(tags = "用户统计表管理接口")
@RequestMapping("/xboot/userStatistic")
@Transactional
public class UserStatisticController {
    @Autowired
    private IUserStatisticService iUserStatisticService;
    @RequestMapping(value = "/get/{id}", method = RequestMethod.GET)
    @ApiOperation(value = "通过id获取")
    public Result<UserStatistic> get(@PathVariable String id) {
        UserStatistic userStatistic = iUserStatisticService.getById(id);
        return new ResultUtil<UserStatistic>().setData(userStatistic);
    }
    @RequestMapping(value = "/getByUserId", method = RequestMethod.GET)
    @ApiOperation(value = "通过用户id获取统计信息")
    public Result<UserStatistic> getByUserId(String userId) {
        QueryWrapper<UserStatistic> wrapper = new QueryWrapper<>();
        wrapper.eq("user_id",userId);
        UserStatistic userStatistic = iUserStatisticService.getOne(wrapper);
        if(userStatistic==null){
            return new ResultUtil<UserStatistic>().setData(new UserStatistic());
        }
        return new ResultUtil<UserStatistic>().setData(userStatistic);
    }
    @RequestMapping(value = "/getAll", method = RequestMethod.GET)
    @ApiOperation(value = "获取全部数据")
    public Result<List<UserStatistic>> getAll() {
        List<UserStatistic> list = iUserStatisticService.list();
        return new ResultUtil<List<UserStatistic>>().setData(list);
    }
    @RequestMapping(value = "/getByPage", method = RequestMethod.GET)
    @ApiOperation(value = "分页获取")
    public Result<IPage<UserStatistic>> getByPage(PageVo page) {
        IPage<UserStatistic> data = iUserStatisticService.page(PageUtil.initMpPage(page));
        return new ResultUtil<IPage<UserStatistic>>().setData(data);
    }
    @RequestMapping(value = "/insertOrUpdate", method = RequestMethod.POST)
    @ApiOperation(value = "编辑或更新数据")
    public Result<UserStatistic> saveOrUpdate(UserStatistic userStatistic) {
        if (iUserStatisticService.saveOrUpdate(userStatistic)) {
            return new ResultUtil<UserStatistic>().setData(userStatistic);
        }
        return new ResultUtil<UserStatistic>().setErrorMsg("操作失败");
    }
    @RequestMapping(value = "/delByIds", method = RequestMethod.POST)
    @ApiOperation(value = "批量通过id删除")
    public Result<Object> delAllByIds(@RequestParam String[] ids) {
        for (String id : ids) {
            iUserStatisticService.removeById(id);
        }
        return ResultUtil.success("批量通过id删除数据成功");
    }
}
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/DrivingRecord.java
@@ -31,6 +31,11 @@
    @ApiModelProperty(value = "车辆id")
    private String carId;
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    @ApiModelProperty(value = "行车日期")
    private Date drivingDate;
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "出车时间")
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/OrderDetail.java
New file
@@ -0,0 +1,40 @@
package cn.exrick.xboot.your.entity;
import cn.exrick.xboot.core.base.XbootBaseEntity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import org.springframework.format.annotation.DateTimeFormat;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
/**
 * @author Exrick
 */
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@Table(name = "t_order_detail")
@TableName("t_order_detail")
@ApiModel(value = "订单详情表")
public class OrderDetail extends XbootBaseEntity {
    private static final long serialVersionUID = 1L;
    @ApiModelProperty(value = "订单id")
    private String orderId;
    @ApiModelProperty(value = "产品名称")
    private String product;
    @ApiModelProperty(value = "数量")
    private String num;
}
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/OrderTask.java
New file
@@ -0,0 +1,108 @@
package cn.exrick.xboot.your.entity;
import cn.exrick.xboot.core.base.XbootBaseEntity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import org.springframework.format.annotation.DateTimeFormat;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.Date;
import java.util.List;
/**
 * @author Exrick
 */
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@Table(name = "t_order_task")
@TableName("t_order_task")
@ApiModel(value = "订单任务表")
public class OrderTask extends XbootBaseEntity {
    private static final long serialVersionUID = 1L;
    @ApiModelProperty(value = "订单号")
    private String code;
    @ApiModelProperty(value = "客户id")
    private String customerId;
    @ApiModelProperty(value = "车辆id")
    private String carId;
    @ApiModelProperty(value = "片区id")
    private String areaId;
    @ApiModelProperty(value = "分段id")
    private String areaSectionId;
    @ApiModelProperty(value = "配送人id")
    private String userId;
    @ApiModelProperty(value = "订单顺序")
    private int seq;
    @ApiModelProperty(value = "包数")
    private int num;
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    @ApiModelProperty(value = "订单日")
    private Date orderDate;
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    @ApiModelProperty(value = "封包日")
    private Date endDate;
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    @ApiModelProperty(value = "配送日")
    private Date sendDate;
    @ApiModelProperty(value = "送达照片")
    private String img;
    @ApiModelProperty(value = "是否进行装车(0:否  1:是)")
    private int isPut;
    @ApiModelProperty(value = "是否驶出月台(0:否  1:是)")
    private int isOut;
    @ApiModelProperty(value = "0配送中,1已送达,2无法送达,3异常签收")
    private int status;
    @ApiModelProperty(value = "无法送达的原因")
    private String remarks;
    @ApiModelProperty(value = "商户评价 1星 2星 3星 4星 5星")
    private int level;
    @ApiModelProperty(value = "签收评价")
    private String evaluate;
    @Transient
    @TableField(exist = false)
    @ApiModelProperty(value = "商户名称")
    private String customerName;
    @Transient
    @TableField(exist = false)
    @ApiModelProperty(value = "商户")
    private Customer customer;
    @Transient
    @TableField(exist = false)
    @ApiModelProperty(value = "订单详情")
    private List<OrderDetail> orderDetails;
}
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/UserStatistic.java
New file
@@ -0,0 +1,75 @@
package cn.exrick.xboot.your.entity;
import cn.exrick.xboot.core.base.XbootBaseEntity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import org.springframework.format.annotation.DateTimeFormat;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
/**
 * @author Exrick
 */
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@Table(name = "t_user_statistic")
@TableName("t_user_statistic")
@ApiModel(value = "用户统计表")
public class UserStatistic extends XbootBaseEntity {
    private static final long serialVersionUID = 1L;
    @ApiModelProperty(value = "用户id")
    private String userId;
    @ApiModelProperty(value = "平安驾驶")
    private int safeDriving;
    @ApiModelProperty(value = "出车次数")
    private int outCar;
    @ApiModelProperty(value = "驾驶里程")
    private int driving;
    @ApiModelProperty(value = "疲劳驾驶")
    private int fatigueDriving;
    @ApiModelProperty(value = "不系安全带")
    private int noBelt;
    @ApiModelProperty(value = "抽烟")
    private int smoking;
    @ApiModelProperty(value = "打电话")
    private int phone;
    @ApiModelProperty(value = "被点赞数")
    private int likes;
    @ApiModelProperty(value = "配送次数")
    private int sends;
    @ApiModelProperty(value = "送达次数")
    private int sends2;
    @ApiModelProperty(value = "服务商户")
    private int service;
    @ApiModelProperty(value = "异常开门")
    private int abnormalOpen;
    @ApiModelProperty(value = "点赞率")
    private int likesRate;
}
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/OrderDetailMapper.java
New file
@@ -0,0 +1,14 @@
package cn.exrick.xboot.your.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import cn.exrick.xboot.your.entity.OrderDetail;
import java.util.List;
/**
 * 订单详情表数据处理层
 * @author whj
 */
public interface OrderDetailMapper extends BaseMapper<OrderDetail> {
}
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/OrderTaskMapper.java
New file
@@ -0,0 +1,30 @@
package cn.exrick.xboot.your.mapper;
import cn.exrick.xboot.your.entity.AddOil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import cn.exrick.xboot.your.entity.OrderTask;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Result;
import org.apache.ibatis.annotations.Results;
import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.type.JdbcType;
import java.util.List;
/**
 * 订单表数据处理层
 * @author whj
 */
public interface OrderTaskMapper extends BaseMapper<OrderTask> {
    @Select("SELECT sum(num) FROM t_order_task where area_id=#{arg0} and DATE_FORMAT(send_date,'%Y-%m-%d')=#{arg1}")
    Integer sum(String areaId, String format);
    @Select("SELECT a.*,b.name as temp FROM t_order_task a LEFT JOIN t_customer b ON a.customer_id=b.id ${ew.customSqlSegment} ")
    @Results({@Result(column="temp", property="customerName", jdbcType = JdbcType.VARCHAR)})
    List<OrderTask> list2(@Param(Constants.WRAPPER) QueryWrapper<OrderTask> wrapper2);
}
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/UserStatisticMapper.java
New file
@@ -0,0 +1,14 @@
package cn.exrick.xboot.your.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import cn.exrick.xboot.your.entity.UserStatistic;
import java.util.List;
/**
 * 用户统计表数据处理层
 * @author whj
 */
public interface UserStatisticMapper extends BaseMapper<UserStatistic> {
}
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IOrderDetailService.java
New file
@@ -0,0 +1,14 @@
package cn.exrick.xboot.your.service;
import com.baomidou.mybatisplus.extension.service.IService;
import cn.exrick.xboot.your.entity.OrderDetail;
import java.util.List;
/**
 * 订单详情表接口
 * @author whj
 */
public interface IOrderDetailService extends IService<OrderDetail> {
}
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IOrderTaskService.java
New file
@@ -0,0 +1,18 @@
package cn.exrick.xboot.your.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.IService;
import cn.exrick.xboot.your.entity.OrderTask;
import java.util.List;
/**
 * 订单表接口
 * @author whj
 */
public interface IOrderTaskService extends IService<OrderTask> {
    int sum(String id, String format);
    List<OrderTask> list2(QueryWrapper<OrderTask> wrapper2);
}
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IUserStatisticService.java
New file
@@ -0,0 +1,14 @@
package cn.exrick.xboot.your.service;
import com.baomidou.mybatisplus.extension.service.IService;
import cn.exrick.xboot.your.entity.UserStatistic;
import java.util.List;
/**
 * 用户统计表接口
 * @author whj
 */
public interface IUserStatisticService extends IService<UserStatistic> {
}
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IOrderDetailServiceImpl.java
New file
@@ -0,0 +1,26 @@
package cn.exrick.xboot.your.serviceimpl;
import cn.exrick.xboot.your.mapper.OrderDetailMapper;
import cn.exrick.xboot.your.entity.OrderDetail;
import cn.exrick.xboot.your.service.IOrderDetailService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
/**
 * 订单详情表接口实现
 * @author whj
 */
@Slf4j
@Service
@Transactional
public class IOrderDetailServiceImpl extends ServiceImpl<OrderDetailMapper, OrderDetail> implements IOrderDetailService {
    @Autowired
    private OrderDetailMapper orderDetailMapper;
}
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IOrderTaskServiceImpl.java
New file
@@ -0,0 +1,41 @@
package cn.exrick.xboot.your.serviceimpl;
import cn.exrick.xboot.your.mapper.OrderTaskMapper;
import cn.exrick.xboot.your.entity.OrderTask;
import cn.exrick.xboot.your.service.IOrderTaskService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
/**
 * 订单表接口实现
 * @author whj
 */
@Slf4j
@Service
@Transactional
public class IOrderTaskServiceImpl extends ServiceImpl<OrderTaskMapper, OrderTask> implements IOrderTaskService {
    @Autowired
    private OrderTaskMapper orderTaskMapper;
    @Override
    public int sum(String areaId, String format) {
         Integer sum = orderTaskMapper.sum(areaId,format);
         if(sum==null){
             return 0;
         }
         return sum;
    }
    @Override
    public List<OrderTask> list2(QueryWrapper<OrderTask> wrapper2) {
        return orderTaskMapper.list2(wrapper2);
    }
}
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IUserStatisticServiceImpl.java
New file
@@ -0,0 +1,26 @@
package cn.exrick.xboot.your.serviceimpl;
import cn.exrick.xboot.your.mapper.UserStatisticMapper;
import cn.exrick.xboot.your.entity.UserStatistic;
import cn.exrick.xboot.your.service.IUserStatisticService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
/**
 * 用户统计表接口实现
 * @author whj
 */
@Slf4j
@Service
@Transactional
public class IUserStatisticServiceImpl extends ServiceImpl<UserStatisticMapper, UserStatistic> implements IUserStatisticService {
    @Autowired
    private UserStatisticMapper userStatisticMapper;
}
xboot-modules/xboot-your/src/main/resources/mapper/OrderDetailMapper.xml
New file
@@ -0,0 +1,5 @@
<?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="cn.exrick.xboot.your.mapper.OrderDetailMapper">
</mapper>
xboot-modules/xboot-your/src/main/resources/mapper/OrderTaskMapper.xml
New file
@@ -0,0 +1,5 @@
<?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="cn.exrick.xboot.your.mapper.OrderTaskMapper">
</mapper>
xboot-modules/xboot-your/src/main/resources/mapper/UserStatisticMapper.xml
New file
@@ -0,0 +1,5 @@
<?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="cn.exrick.xboot.your.mapper.UserStatisticMapper">
</mapper>