Merge remote-tracking branch 'origin/develop' into develop

ruoyi-admin/src/main/resources/application-dev.yml

@@ -126,7 +126,7 @@ spring.data:
     # 数据库索引
     database: 0
     # redis 密码必须配置
-#    password: ruoyi123
+    password: ruoyi123
     # 连接超时时间
     timeout: 10s
     # 是否开启ssl

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/controller/BulkOrderManagementController.java

@@ -1,6 +1,5 @@
 package org.dromara.bulk.controller;
 
-import cn.dev33.satoken.annotation.SaIgnore;
 import lombok.RequiredArgsConstructor;
 import org.dromara.bulk.domain.bo.NewBulkOrderBo;
 import org.dromara.bulk.service.BulkOrderManagementService;
@@ -14,7 +13,6 @@ import org.springframework.web.bind.annotation.RestController;
 /**
  * 大货订单管理接口
  */
-@SaIgnore
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/bulkOrder/daHuoDingDanGuanLi")

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/controller/OrderRecordController.java

@@ -0,0 +1,25 @@
+package org.dromara.bulk.controller;
+
+
+import lombok.RequiredArgsConstructor;
+import org.dromara.bulk.domain.bo.OrderRecordBo;
+import org.dromara.bulk.domain.vo.OrderRecordVo;
+import org.dromara.bulk.service.OrderRecordService;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/bulkOrder/OrderRecord")
+public class OrderRecordController {
+
+    private final OrderRecordService orderRecordService;
+
+    @GetMapping("PageList")
+    public TableDataInfo<OrderRecordVo> selectPageOrderRecordList(OrderRecordBo orderRecordBo, PageQuery page) {
+        return orderRecordService.selectPageOrderList(orderRecordBo,page);
+    }
+}

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/domain/OrderRecord.java

@@ -0,0 +1,65 @@
+package org.dromara.bulk.domain;
+
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.tenant.core.TenantEntity;
+
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class OrderRecord extends TenantEntity {
+    /**
+     * 订单号
+     */
+    @TableField(value = "sc_no")
+    private String scNo;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 联系方式
+     */
+    private String phone;
+
+    /**
+     * 详细地址
+     */
+    private String address;
+
+    /**
+     * 下单图片
+     */
+    private String goodsImage;
+
+    /**
+     * 订单状态
+     */
+    private int status;
+
+    /**
+     * 款号
+     */
+    private String itemNumber;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 确认收货时间
+     */
+    private Date confirmDeliveryTime;
+
+}

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/domain/bo/OrderRecordBo.java

@@ -0,0 +1,62 @@
+package org.dromara.bulk.domain.bo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+
+import java.util.Date;
+
+@Data
+public class OrderRecordBo extends BaseEntity {
+    /**
+     * 订单号
+     */
+    @TableField(value = "sc_no")
+    private String scNo;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 联系方式
+     */
+    private String phone;
+
+    /**
+     * 详细地址
+     */
+    private String address;
+
+    /**
+     * 下单图片
+     */
+    private String goodsImage;
+
+    /**
+     * 订单状态
+     */
+    private int status;
+
+    /**
+     * 款号
+     */
+    private String itemNumber;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 确认收货时间
+     */
+    private Date confirmDeliveryTime;
+}

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/domain/vo/OrderRecordVo.java

@@ -0,0 +1,66 @@
+package org.dromara.bulk.domain.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.bulk.domain.OrderRecord;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = OrderRecord.class)
+public class OrderRecordVo extends BaseEntity {
+    /**
+     * 订单号
+     */
+    @TableField(value = "sc_no")
+    private String scNo;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 联系方式
+     */
+    private String phone;
+
+    /**
+     * 详细地址
+     */
+    private String address;
+
+    /**
+     * 下单图片
+     */
+    private String goodsImage;
+
+    /**
+     * 订单状态
+     */
+    private int status;
+
+    /**
+     * 款号
+     */
+    private String itemNumber;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 确认收货时间
+     */
+    private Date confirmDeliveryTime;
+}

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/mapper/OrderRecordMapper.java

@@ -0,0 +1,17 @@
+package org.dromara.bulk.mapper;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.dromara.bulk.domain.OrderRecord;
+import org.dromara.bulk.domain.vo.OrderRecordVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+@Mapper
+public interface OrderRecordMapper extends BaseMapperPlus<OrderRecord, OrderRecordVo> {
+    Page<OrderRecordVo> selectVoPageWithUserId(IPage<OrderRecordVo> page, @Param(Constants.WRAPPER) QueryWrapper<OrderRecord> wrapper);
+}

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/service/OrderRecordService.java

@@ -0,0 +1,12 @@
+package org.dromara.bulk.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.dromara.bulk.domain.bo.OrderRecordBo;
+import org.dromara.bulk.domain.vo.OrderRecordVo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.springframework.data.domain.Page;
+
+public interface OrderRecordService {
+    TableDataInfo<OrderRecordVo> selectPageOrderList(OrderRecordBo orderRecordBo, PageQuery page);
+}

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/service/impl/OrderRecordServiceImpl.java

@@ -0,0 +1,36 @@
+package org.dromara.bulk.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.dromara.bulk.domain.OrderRecord;
+import org.dromara.bulk.domain.bo.OrderRecordBo;
+import org.dromara.bulk.domain.vo.OrderRecordVo;
+import org.dromara.bulk.mapper.OrderRecordMapper;
+import org.dromara.bulk.service.OrderRecordService;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+
+@Service
+@RequiredArgsConstructor
+public class OrderRecordServiceImpl implements OrderRecordService {
+
+    private final OrderRecordMapper orderRecordMapper;
+
+    @Override
+    public TableDataInfo<OrderRecordVo> selectPageOrderList(OrderRecordBo orderRecordBo, PageQuery page) {
+        QueryWrapper<OrderRecord> qw = new QueryWrapper<>();
+        Map<String, Object> params = orderRecordBo.getParams();
+        qw.like(StringUtils.isNotBlank(orderRecordBo.getScNo()),"pi.sc_no", orderRecordBo.getScNo());
+        qw.like(StringUtils.isNotBlank(orderRecordBo.getItemNumber()),"pi.item_number", orderRecordBo.getItemNumber());
+        qw.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null,
+            "uo.create_time", params.get("beginCreateTime"), params.get("endCreateTime"));
+        Page<OrderRecordVo> result = orderRecordMapper.selectVoPageWithUserId(page.build(),qw);
+        return TableDataInfo.build(result);
+    }
+}

ruoyi-modules/ruoyi-bulkOrder/src/main/resources/mapper/OrderRecordMapper.xml

@@ -0,0 +1,23 @@
+<?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="org.dromara.bulk.mapper.OrderRecordMapper">
+    <select id="selectVoPageWithUserId" resultType="org.dromara.bulk.domain.vo.OrderRecordVo">
+        SELECT
+            uo.name,
+            uo.phone,
+            uo.address,
+            uo.create_time,
+            uo.status,
+            uo.note,
+            uoi.goods_image,
+            pi.sc_no,
+            pi.item_number
+        FROM
+            fa_kuyou_user_order uo
+            LEFT JOIN fa_kuyou_user_orderinfo uoi ON uoi.user_id = uo.id
+            LEFT JOIN fa_kuyou_plan_info pi ON pi.user_id = uo.user_id
+            ${ew.getCustomSqlSegment()}
+    </select>
+</mapper>