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

sp-service/level-one-server/src/main/java/com/pj/tb_enterprise/TbEnterprise.java

@@ -7,6 +7,8 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.EqualsAndHashCode;
 
 import lombok.Data;
@@ -46,6 +48,7 @@ public class TbEnterprise extends Model<TbEnterprise> implements Serializable {
 	 *  
 	 */
 	@TableId(type = IdType.AUTO)
+	@JsonSerialize(using = ToStringSerializer.class)
 	private Long id;	
 
 	/**

sp-service/level-one-server/src/main/java/com/pj/tb_goods/TbGoods.java

@@ -6,6 +6,8 @@ import java.util.Date;
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.EqualsAndHashCode;
 
 import lombok.Data;
@@ -46,6 +48,7 @@ public class TbGoods extends Model<TbGoods> implements Serializable {
 	 * 主键 
 	 */
 	@TableId(type = IdType.AUTO)
+	@JsonSerialize(using = ToStringSerializer.class)
 	private Long id;
 
 	/**

sp-service/level-one-server/src/main/java/com/pj/tb_goods_transit/TbGoodsTransit.java

@@ -6,6 +6,8 @@ import java.util.Date;
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.EqualsAndHashCode;
 
 import lombok.Data;
@@ -46,6 +48,7 @@ public class TbGoodsTransit extends Model<TbGoodsTransit> implements Serializabl
 	 * 在销商品表主键 
 	 */
 	@TableId(type = IdType.AUTO)
+	@JsonSerialize(using = ToStringSerializer.class)
 	private Long id;	
 
 	/**

sp-service/level-one-server/src/main/java/com/pj/tb_goods_type/TbGoodsType.java

@@ -6,6 +6,8 @@ import java.util.Date;
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.EqualsAndHashCode;
 
 import lombok.Data;
@@ -46,7 +48,8 @@ public class TbGoodsType extends Model<TbGoodsType> implements Serializable {
 	 * 主键 
 	 */
 	@TableId(type = IdType.AUTO)
-	private String id;	
+	@JsonSerialize(using = ToStringSerializer.class)
+	private Long id;
 
 	/**
 	 * 类别名称 

sp-service/level-one-server/src/main/java/com/pj/tb_goods_units/TbGoodsUnits.java

@@ -3,6 +3,8 @@ package com.pj.tb_goods_units;
 import java.io.Serializable;
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.EqualsAndHashCode;
 
 import lombok.Data;
@@ -43,6 +45,7 @@ public class TbGoodsUnits extends Model<TbGoodsUnits> implements Serializable {
 	 * 商品主键 
 	 */
 	@TableId(type = IdType.AUTO)
+	@JsonSerialize(using = ToStringSerializer.class)
 	private Long id;	
 
 	/**

sp-service/level-one-server/src/main/java/com/pj/tb_group/TbGroup.java

@@ -6,6 +6,8 @@ import java.util.Date;
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.EqualsAndHashCode;
 
 import lombok.Data;
@@ -46,6 +48,7 @@ public class TbGroup extends Model<TbGroup> implements Serializable {
 	 *  
 	 */
 	@TableId(type = IdType.AUTO)
+	@JsonSerialize(using = ToStringSerializer.class)
 	private Long id;
 
 	/**

sp-service/level-one-server/src/main/java/com/pj/tb_order/TbOrder.java

@@ -0,0 +1,305 @@
+package com.pj.tb_order;
+
+import java.io.Serializable;
+import java.util.*;
+import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.EqualsAndHashCode;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * Model: tb_order -- 订单表
+ * @author loovi 
+ */
+@Data
+@Accessors(chain = true)
+@TableName(TbOrder.TABLE_NAME)
+@EqualsAndHashCode(callSuper = false)
+public class TbOrder extends Model<TbOrder> implements Serializable {
+
+	// ---------- 模块常量 ----------
+	/**
+	 * 序列化版本id 
+	 */
+	private static final long serialVersionUID = 1L;	
+	/**
+	 * 此模块对应的表名 
+	 */
+	public static final String TABLE_NAME = "tb_order";
+	/**
+	 * 此模块对应的权限码 
+	 */
+	public static final String PERMISSION_CODE = "tb-order";
+	public static final String PERMISSION_CODE_ADD = "tb-order-add";
+	public static final String PERMISSION_CODE_EDIT = "tb-order-edit";
+	public static final String PERMISSION_CODE_DEL = "tb-order-del";
+
+
+
+
+	// ---------- 表中字段 ----------
+	/**
+	 * 主键 
+	 */
+	@TableId(type = IdType.AUTO)
+	@JsonSerialize(using = ToStringSerializer.class)
+	private Long id;
+
+	/**
+	 *  
+	 */
+	@JsonSerialize(using = ToStringSerializer.class)
+	private Long tradeAreaId;	
+
+	/**
+	 *  
+	 */
+	private String tradeAreaName;	
+
+	/**
+	 *  
+	 */
+	private String addressIds;	
+
+	/**
+	 *  
+	 */
+	private Long saleMainId;	
+
+	/**
+	 * 订单号 
+	 */
+	private String tradeNo;	
+
+	/**
+	 * 买家ID 
+	 */
+	private Long buyUserId;	
+
+	/**
+	 * 买家 
+	 */
+	private String buyUserName;	
+
+	/**
+	 * 购买用户类型(3=边民,2=组长) 
+	 */
+	private String buyUserType;	
+
+	/**
+	 * 商家ID 
+	 */
+	private Long enterpriseId;	
+
+	/**
+	 * 商家名称 
+	 */
+	private String enterpriseName;	
+
+	/**
+	 * 总重量 
+	 */
+	private Double totalWeight;	
+
+	/**
+	 * 总金额 
+	 */
+	private Double totalPrice;	
+
+	/**
+	 * 交易时间 
+	 */
+	private Date tradeTime;	
+
+	/**
+	 * 交易状态(0=未支付,1=已支付) 
+	 */
+	private String tradeStatus;	
+
+	/**
+	 * 支付方式(0=金融互助,1=现金刷卡) 
+	 */
+	private String payType;	
+
+	/**
+	 * 结算时间 
+	 */
+	private String settleTime;	
+
+	/**
+	 * 当前结算金额 
+	 */
+	private Double realPrice;	
+
+	/**
+	 * 应结金额 
+	 */
+	private Double shouldPrice;	
+
+	/**
+	 * 对账人 
+	 */
+	private Long settleUserId;	
+
+	/**
+	 * 对账人员 
+	 */
+	private Long recordUserId;	
+
+	/**
+	 * 对账时间 
+	 */
+	private String recordTime;	
+
+	/**
+	 * 是否对账(0=否,) 
+	 */
+	private String record;	
+
+	/**
+	 * 退款原因 
+	 */
+	private String refundReason;	
+
+	/**
+	 * 退款时间 
+	 */
+	private String refundTime;	
+
+	/**
+	 *  
+	 */
+	private String receiveName;	
+
+	/**
+	 *  
+	 */
+	private String receivePhone;	
+
+	/**
+	 *  
+	 */
+	private String receiveAddress;	
+
+	/**
+	 * 出互市区时间 
+	 */
+	private String outTime;	
+
+	/**
+	 * 商品名称字符串 
+	 */
+	private String goodsNames;	
+
+	/**
+	 * 是否申报 
+	 */
+	private String apply;	
+
+	/**
+	 * 申报时间 
+	 */
+	private String applyTime;	
+
+	/**
+	 * 申报结果 
+	 */
+	private String applyResult;	
+
+	/**
+	 *  
+	 */
+	private String applyFailReason;	
+
+	/**
+	 * 分配方式(0=均分,1=自选数量) 
+	 */
+	private String distribution;	
+
+	/**
+	 * 是否确认(0=否,1=是) 
+	 */
+	private String confirm;	
+
+	/**
+	 * 是否接单 
+	 */
+	private String pick;	
+
+	/**
+	 * 接单时间 
+	 */
+	private String pickTime;	
+
+	/**
+	 *  
+	 */
+	private Long shopId;	
+
+	/**
+	 *  
+	 */
+	private String shopName;	
+
+	/**
+	 * 是否发货 
+	 */
+	private String send;	
+
+	/**
+	 * 发货时间 
+	 */
+	private String sendTime;	
+
+	/**
+	 * 对应二级市场中的收购单ID 
+	 */
+	private Long levelTwoOrderId;	
+
+	/**
+	 * 创建时间 
+	 */
+	private String createTime;	
+
+	/**
+	 * 创建人编号 
+	 */
+	private String createBy;	
+
+	/**
+	 * 创建人名称 
+	 */
+	private String createName;	
+
+	/**
+	 * 更新时间 
+	 */
+	private String updateTime;	
+
+	/**
+	 * 更新人编号 
+	 */
+	private String updateBy;	
+
+	/**
+	 * 更新人名称 
+	 */
+	private String updateName;	
+
+	/**
+	 * 删除状态(0=禁用,1=启用) 
+	 */
+	private Integer deleteStatus;	
+
+
+
+
+
+	
+
+
+}

sp-service/level-one-server/src/main/java/com/pj/tb_order/TbOrderController.java

@@ -0,0 +1,93 @@
+package com.pj.tb_order;
+
+import java.util.List;
+import com.pj.utils.so.SoMap;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import com.pj.utils.sg.*;
+import com.pj.project4sp.SP;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+
+
+/**
+ * Controller: tb_order -- 订单表
+ * @author loovi 
+ */
+@RestController
+@RequestMapping("/TbOrder/")
+public class TbOrderController {
+
+	/** 底层 Service 对象 */
+	@Autowired
+	TbOrderService tbOrderService;
+
+	/** 增 */  
+	@RequestMapping("add")
+	@SaCheckPermission(TbOrder.PERMISSION_CODE_ADD)
+	public AjaxJson add(TbOrder t){
+		tbOrderService.add(t);
+		t = tbOrderService.getById(SP.publicMapper.getPrimarykey());
+		return AjaxJson.getSuccessData(t);
+	}
+
+	/** 删 */  
+	@RequestMapping("delete")
+	@SaCheckPermission(TbOrder.PERMISSION_CODE_DEL)
+	public AjaxJson delete(Long id){
+		 tbOrderService.delete(id);
+		return AjaxJson.getSuccess();
+	}
+	
+	/** 删 - 根据id列表 */  
+	@RequestMapping("deleteByIds")
+	@SaCheckPermission(TbOrder.PERMISSION_CODE_DEL)
+	public AjaxJson deleteByIds(){
+		List<Long> ids = SoMap.getRequestSoMap().getListByComma("ids", long.class); 
+		int line = SP.publicMapper.deleteByIds(TbOrder.TABLE_NAME, ids);
+		return AjaxJson.getByLine(line);
+	}
+	
+	/** 改 */  
+	@RequestMapping("update")
+	@SaCheckPermission(TbOrder.PERMISSION_CODE_EDIT)
+	public AjaxJson update(TbOrder t){
+		tbOrderService.update(t);
+		return AjaxJson.getSuccess();
+	}
+
+	/** 查 - 根据id */  
+	@RequestMapping("getById")
+		@SaCheckPermission(TbOrder.PERMISSION_CODE)
+	public AjaxJson getById(Long id){
+		TbOrder t = tbOrderService.getById(id);
+		return AjaxJson.getSuccessData(t);
+	}
+
+	/** 查集合 - 根据条件（参数为空时代表忽略指定条件） */  
+	@RequestMapping("getList")
+//		@SaCheckPermission(TbOrder.PERMISSION_CODE)
+	public AjaxJson getList() { 
+		SoMap so = SoMap.getRequestSoMap();
+		List<TbOrder> list = tbOrderService.getList(so.startPage());
+		return AjaxJson.getPageData(so.getDataCount(), list);
+	}
+	
+	
+	
+	/** 改 - 删除状态(0=禁用,1=启用) */  
+	@RequestMapping("updateDeleteStatus")
+	@SaCheckPermission(TbOrder.PERMISSION_CODE_EDIT)
+	public AjaxJson updateDeleteStatus(Long id, Integer value){
+		int line = SP.publicMapper.updateColumnById(TbOrder.TABLE_NAME, "delete_status", value, id);
+		return AjaxJson.getByLine(line);
+	}
+	
+	
+
+	
+	
+	
+
+}

sp-service/level-one-server/src/main/java/com/pj/tb_order/TbOrderMapper.java

@@ -0,0 +1,30 @@
+package com.pj.tb_order;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Mapper;
+
+import com.pj.utils.so.*;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * Mapper: tb_order -- 订单表
+ * @author loovi 
+ */
+
+@Mapper
+@Repository
+public interface TbOrderMapper extends BaseMapper <TbOrder> {
+
+
+
+	/**
+	 * 查集合 - 根据条件（参数为空时代表忽略指定条件）
+	 * @param so 参数集合 
+	 * @return 数据列表 
+	 */
+	List<TbOrder> getList(SoMap so);
+
+
+}

sp-service/level-one-server/src/main/java/com/pj/tb_order/TbOrderMapper.xml

@@ -0,0 +1,142 @@
+<?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.pj.tb_order.TbOrderMapper">
+
+
+
+
+	<!-- ================================== 查询相关 ================================== -->
+	<!-- select id, trade_area_id, trade_area_name, address_ids, sale_main_id, trade_no, buy_user_id, buy_user_name, buy_user_type, enterprise_id, enterprise_name, total_weight, total_price, trade_time, trade_status, pay_type, settle_time, real_price, should_price, settle_user_id, record_user_id, record_time, record, refund_reason, refund_time, receive_name, receive_phone, receive_address, out_time, goods_names, apply, apply_time, apply_result, apply_fail_reason, distribution, confirm, pick, pick_time, shop_id, shop_name, send, send_time, level_two_order_id, create_time, create_by, create_name, update_time, update_by, update_name, delete_status from tb_order  -->
+	
+	<!-- 通用映射：自动模式 -->
+	<resultMap id="model" autoMapping="true" type="com.pj.tb_order.TbOrder"></resultMap>
+	
+	<!-- 公共查询sql片段 -->
+	<sql id="select_sql">
+		select id,trade_area_id,trade_no,trade_area_name,buy_user_name,buy_user_type,enterprise_name,total_weight,total_price,
+			   trade_time, trade_status, real_price,pay_type,should_price,goods_names,apply,confirm,pick,pick_time,
+			   send,send_time,level_two_order_id
+		from tb_order 
+	</sql>
+
+	
+	<!-- 查集合 - 根据条件（参数为空时代表忽略指定条件） [G] -->
+	<select id="getList" resultMap="model">
+		<include refid="select_sql"></include>
+<!--		<where>-->
+<!--			<if test=' this.has("id") '> and id = #{id} </if>-->
+<!--			<if test=' this.has("tradeAreaId") '> and trade_area_id = #{tradeAreaId} </if>-->
+<!--			<if test=' this.has("tradeAreaName") '> and trade_area_name = #{tradeAreaName} </if>-->
+<!--			<if test=' this.has("addressIds") '> and address_ids = #{addressIds} </if>-->
+<!--			<if test=' this.has("saleMainId") '> and sale_main_id = #{saleMainId} </if>-->
+<!--			<if test=' this.has("tradeNo") '> and trade_no = #{tradeNo} </if>-->
+<!--			<if test=' this.has("buyUserId") '> and buy_user_id = #{buyUserId} </if>-->
+<!--			<if test=' this.has("buyUserName") '> and buy_user_name = #{buyUserName} </if>-->
+<!--			<if test=' this.has("buyUserType") '> and buy_user_type = #{buyUserType} </if>-->
+<!--			<if test=' this.has("enterpriseId") '> and enterprise_id = #{enterpriseId} </if>-->
+<!--			<if test=' this.has("enterpriseName") '> and enterprise_name = #{enterpriseName} </if>-->
+<!--			<if test=' this.has("totalWeight") '> and total_weight = #{totalWeight} </if>-->
+<!--			<if test=' this.has("totalPrice") '> and total_price = #{totalPrice} </if>-->
+<!--			<if test=' this.has("tradeStatus") '> and trade_status = #{tradeStatus} </if>-->
+<!--			<if test=' this.has("payType") '> and pay_type = #{payType} </if>-->
+<!--			<if test=' this.has("settleTime") '> and settle_time = #{settleTime} </if>-->
+<!--			<if test=' this.has("realPrice") '> and real_price = #{realPrice} </if>-->
+<!--			<if test=' this.has("shouldPrice") '> and should_price = #{shouldPrice} </if>-->
+<!--			<if test=' this.has("settleUserId") '> and settle_user_id = #{settleUserId} </if>-->
+<!--			<if test=' this.has("recordUserId") '> and record_user_id = #{recordUserId} </if>-->
+<!--			<if test=' this.has("recordTime") '> and record_time = #{recordTime} </if>-->
+<!--			<if test=' this.has("record") '> and record = #{record} </if>-->
+<!--			<if test=' this.has("refundReason") '> and refund_reason = #{refundReason} </if>-->
+<!--			<if test=' this.has("refundTime") '> and refund_time = #{refundTime} </if>-->
+<!--			<if test=' this.has("receiveName") '> and receive_name = #{receiveName} </if>-->
+<!--			<if test=' this.has("receivePhone") '> and receive_phone = #{receivePhone} </if>-->
+<!--			<if test=' this.has("receiveAddress") '> and receive_address = #{receiveAddress} </if>-->
+<!--			<if test=' this.has("outTime") '> and out_time = #{outTime} </if>-->
+<!--			<if test=' this.has("goodsNames") '> and goods_names = #{goodsNames} </if>-->
+<!--			<if test=' this.has("apply") '> and apply = #{apply} </if>-->
+<!--			<if test=' this.has("applyTime") '> and apply_time = #{applyTime} </if>-->
+<!--			<if test=' this.has("applyResult") '> and apply_result = #{applyResult} </if>-->
+<!--			<if test=' this.has("applyFailReason") '> and apply_fail_reason = #{applyFailReason} </if>-->
+<!--			<if test=' this.has("distribution") '> and distribution = #{distribution} </if>-->
+<!--			<if test=' this.has("confirm") '> and confirm = #{confirm} </if>-->
+<!--			<if test=' this.has("pick") '> and pick = #{pick} </if>-->
+<!--			<if test=' this.has("pickTime") '> and pick_time = #{pickTime} </if>-->
+<!--			<if test=' this.has("shopId") '> and shop_id = #{shopId} </if>-->
+<!--			<if test=' this.has("shopName") '> and shop_name = #{shopName} </if>-->
+<!--			<if test=' this.has("send") '> and send = #{send} </if>-->
+<!--			<if test=' this.has("sendTime") '> and send_time = #{sendTime} </if>-->
+<!--			<if test=' this.has("levelTwoOrderId") '> and level_two_order_id = #{levelTwoOrderId} </if>-->
+<!--			<if test=' this.has("createTime") '> and create_time = #{createTime} </if>-->
+<!--			<if test=' this.has("createBy") '> and create_by = #{createBy} </if>-->
+<!--			<if test=' this.has("createName") '> and create_name = #{createName} </if>-->
+<!--			<if test=' this.has("updateTime") '> and update_time = #{updateTime} </if>-->
+<!--			<if test=' this.has("updateBy") '> and update_by = #{updateBy} </if>-->
+<!--			<if test=' this.has("updateName") '> and update_name = #{updateName} </if>-->
+<!--			<if test=' this.has("deleteStatus") '> and delete_status = #{deleteStatus} </if>-->
+<!--		</where>-->
+<!--		order by-->
+<!--		<choose>-->
+<!--			<when test='sortType == 1'> id desc </when>-->
+<!--			<when test='sortType == 2'> trade_area_id desc </when>-->
+<!--			<when test='sortType == 3'> trade_area_name desc </when>-->
+<!--			<when test='sortType == 4'> address_ids desc </when>-->
+<!--			<when test='sortType == 5'> sale_main_id desc </when>-->
+<!--			<when test='sortType == 6'> trade_no desc </when>-->
+<!--			<when test='sortType == 7'> buy_user_id desc </when>-->
+<!--			<when test='sortType == 8'> buy_user_name desc </when>-->
+<!--			<when test='sortType == 9'> buy_user_type desc </when>-->
+<!--			<when test='sortType == 10'> enterprise_id desc </when>-->
+<!--			<when test='sortType == 11'> enterprise_name desc </when>-->
+<!--			<when test='sortType == 12'> total_weight desc </when>-->
+<!--			<when test='sortType == 13'> total_price desc </when>-->
+<!--			<when test='sortType == 14'> trade_time desc </when>-->
+<!--			<when test='sortType == 15'> trade_status desc </when>-->
+<!--			<when test='sortType == 16'> pay_type desc </when>-->
+<!--			<when test='sortType == 17'> settle_time desc </when>-->
+<!--			<when test='sortType == 18'> real_price desc </when>-->
+<!--			<when test='sortType == 19'> should_price desc </when>-->
+<!--			<when test='sortType == 20'> settle_user_id desc </when>-->
+<!--			<when test='sortType == 21'> record_user_id desc </when>-->
+<!--			<when test='sortType == 22'> record_time desc </when>-->
+<!--			<when test='sortType == 23'> record desc </when>-->
+<!--			<when test='sortType == 24'> refund_reason desc </when>-->
+<!--			<when test='sortType == 25'> refund_time desc </when>-->
+<!--			<when test='sortType == 26'> receive_name desc </when>-->
+<!--			<when test='sortType == 27'> receive_phone desc </when>-->
+<!--			<when test='sortType == 28'> receive_address desc </when>-->
+<!--			<when test='sortType == 29'> out_time desc </when>-->
+<!--			<when test='sortType == 30'> goods_names desc </when>-->
+<!--			<when test='sortType == 31'> apply desc </when>-->
+<!--			<when test='sortType == 32'> apply_time desc </when>-->
+<!--			<when test='sortType == 33'> apply_result desc </when>-->
+<!--			<when test='sortType == 34'> apply_fail_reason desc </when>-->
+<!--			<when test='sortType == 35'> distribution desc </when>-->
+<!--			<when test='sortType == 36'> confirm desc </when>-->
+<!--			<when test='sortType == 37'> pick desc </when>-->
+<!--			<when test='sortType == 38'> pick_time desc </when>-->
+<!--			<when test='sortType == 39'> shop_id desc </when>-->
+<!--			<when test='sortType == 40'> shop_name desc </when>-->
+<!--			<when test='sortType == 41'> send desc </when>-->
+<!--			<when test='sortType == 42'> send_time desc </when>-->
+<!--			<when test='sortType == 43'> level_two_order_id desc </when>-->
+<!--			<when test='sortType == 44'> create_time desc </when>-->
+<!--			<when test='sortType == 45'> create_by desc </when>-->
+<!--			<when test='sortType == 46'> create_name desc </when>-->
+<!--			<when test='sortType == 47'> update_time desc </when>-->
+<!--			<when test='sortType == 48'> update_by desc </when>-->
+<!--			<when test='sortType == 49'> update_name desc </when>-->
+<!--			<when test='sortType == 50'> delete_status desc </when>-->
+<!--			<otherwise> id desc </otherwise>-->
+<!--		</choose>-->
+	</select>
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+</mapper>

sp-service/level-one-server/src/main/java/com/pj/tb_order/TbOrderService.java

@@ -0,0 +1,50 @@
+package com.pj.tb_order;
+
+import java.util.List;
+import com.pj.utils.so.SoMap;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * Service: tb_order -- 订单表
+ * @author loovi 
+ */
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class TbOrderService extends ServiceImpl<TbOrderMapper, TbOrder> implements IService<TbOrder>{
+
+	/** 底层 Mapper 对象 */
+	@Autowired
+	TbOrderMapper tbOrderMapper;
+
+	/** 增 */
+	void add(TbOrder t){
+		save(t);
+	}
+
+	/** 删 */
+	void delete(Long id){
+		removeById(id);
+	}
+
+	/** 改 */
+	void update(TbOrder t){
+		updateById(t);
+
+	}
+
+	/** 查 */
+	TbOrder getById(Long id){
+		return super.getById(id);
+	}
+
+	/** 查集合 - 根据条件（参数为空时代表忽略指定条件） */  
+	List<TbOrder> getList(SoMap so) { 
+		return tbOrderMapper.getList(so);	
+	}
+	
+
+}

sp-service/level-one-server/src/main/java/com/pj/tb_order/TbOrderUtil.java

@@ -0,0 +1,144 @@
+package com.pj.tb_order;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import com.pj.utils.sg.*;
+import java.util.*;
+
+/**
+ * 工具类：tb_order -- 订单表
+ * @author loovi 
+ *
+ */
+@Component
+public class TbOrderUtil {
+
+	
+	/** 底层 Mapper 对象 */
+	public static TbOrderMapper tbOrderMapper;
+	@Autowired
+	private void setTbOrderMapper(TbOrderMapper tbOrderMapper) {
+		TbOrderUtil.tbOrderMapper = tbOrderMapper;
+	}
+	
+	
+	/** 
+	 * 将一个 TbOrder 对象进行进行数据完整性校验 (方便add/update等接口数据校验) [G] 
+	 */
+	static void check(TbOrder t) {
+		AjaxError.throwByIsNull(t.getId(), "[主键] 不能为空");		// 验证: 主键 
+		AjaxError.throwByIsNull(t.getTradeAreaId(), "[] 不能为空");		// 验证:  
+		AjaxError.throwByIsNull(t.getTradeAreaName(), "[] 不能为空");		// 验证:  
+		AjaxError.throwByIsNull(t.getAddressIds(), "[] 不能为空");		// 验证:  
+		AjaxError.throwByIsNull(t.getSaleMainId(), "[] 不能为空");		// 验证:  
+		AjaxError.throwByIsNull(t.getTradeNo(), "[订单号] 不能为空");		// 验证: 订单号 
+		AjaxError.throwByIsNull(t.getBuyUserId(), "[买家ID] 不能为空");		// 验证: 买家ID 
+		AjaxError.throwByIsNull(t.getBuyUserName(), "[买家] 不能为空");		// 验证: 买家 
+		AjaxError.throwByIsNull(t.getBuyUserType(), "[购买用户类型] 不能为空");		// 验证: 购买用户类型(3=边民,2=组长) 
+		AjaxError.throwByIsNull(t.getEnterpriseId(), "[商家ID] 不能为空");		// 验证: 商家ID 
+		AjaxError.throwByIsNull(t.getEnterpriseName(), "[商家名称] 不能为空");		// 验证: 商家名称 
+		AjaxError.throwByIsNull(t.getTotalWeight(), "[总重量] 不能为空");		// 验证: 总重量 
+		AjaxError.throwByIsNull(t.getTotalPrice(), "[总金额] 不能为空");		// 验证: 总金额 
+		AjaxError.throwByIsNull(t.getTradeTime(), "[交易时间] 不能为空");		// 验证: 交易时间 
+		AjaxError.throwByIsNull(t.getTradeStatus(), "[交易状态] 不能为空");		// 验证: 交易状态(0=未支付,1=已支付) 
+		AjaxError.throwByIsNull(t.getPayType(), "[支付方式] 不能为空");		// 验证: 支付方式(0=金融互助,1=现金刷卡) 
+		AjaxError.throwByIsNull(t.getSettleTime(), "[结算时间] 不能为空");		// 验证: 结算时间 
+		AjaxError.throwByIsNull(t.getRealPrice(), "[当前结算金额] 不能为空");		// 验证: 当前结算金额 
+		AjaxError.throwByIsNull(t.getShouldPrice(), "[应结金额] 不能为空");		// 验证: 应结金额 
+		AjaxError.throwByIsNull(t.getSettleUserId(), "[对账人] 不能为空");		// 验证: 对账人 
+		AjaxError.throwByIsNull(t.getRecordUserId(), "[对账人员] 不能为空");		// 验证: 对账人员 
+		AjaxError.throwByIsNull(t.getRecordTime(), "[对账时间] 不能为空");		// 验证: 对账时间 
+		AjaxError.throwByIsNull(t.getRecord(), "[是否对账] 不能为空");		// 验证: 是否对账(0=否,) 
+		AjaxError.throwByIsNull(t.getRefundReason(), "[退款原因] 不能为空");		// 验证: 退款原因 
+		AjaxError.throwByIsNull(t.getRefundTime(), "[退款时间] 不能为空");		// 验证: 退款时间 
+		AjaxError.throwByIsNull(t.getReceiveName(), "[] 不能为空");		// 验证:  
+		AjaxError.throwByIsNull(t.getReceivePhone(), "[] 不能为空");		// 验证:  
+		AjaxError.throwByIsNull(t.getReceiveAddress(), "[] 不能为空");		// 验证:  
+		AjaxError.throwByIsNull(t.getOutTime(), "[出互市区时间] 不能为空");		// 验证: 出互市区时间 
+		AjaxError.throwByIsNull(t.getGoodsNames(), "[商品名称字符串] 不能为空");		// 验证: 商品名称字符串 
+		AjaxError.throwByIsNull(t.getApply(), "[是否申报] 不能为空");		// 验证: 是否申报 
+		AjaxError.throwByIsNull(t.getApplyTime(), "[申报时间] 不能为空");		// 验证: 申报时间 
+		AjaxError.throwByIsNull(t.getApplyResult(), "[申报结果] 不能为空");		// 验证: 申报结果 
+		AjaxError.throwByIsNull(t.getApplyFailReason(), "[] 不能为空");		// 验证:  
+		AjaxError.throwByIsNull(t.getDistribution(), "[分配方式] 不能为空");		// 验证: 分配方式(0=均分,1=自选数量) 
+		AjaxError.throwByIsNull(t.getConfirm(), "[是否确认] 不能为空");		// 验证: 是否确认(0=否,1=是) 
+		AjaxError.throwByIsNull(t.getPick(), "[是否接单] 不能为空");		// 验证: 是否接单 
+		AjaxError.throwByIsNull(t.getPickTime(), "[接单时间] 不能为空");		// 验证: 接单时间 
+		AjaxError.throwByIsNull(t.getShopId(), "[] 不能为空");		// 验证:  
+		AjaxError.throwByIsNull(t.getShopName(), "[] 不能为空");		// 验证:  
+		AjaxError.throwByIsNull(t.getSend(), "[是否发货] 不能为空");		// 验证: 是否发货 
+		AjaxError.throwByIsNull(t.getSendTime(), "[发货时间] 不能为空");		// 验证: 发货时间 
+		AjaxError.throwByIsNull(t.getLevelTwoOrderId(), "[对应二级市场中的收购单ID] 不能为空");		// 验证: 对应二级市场中的收购单ID 
+		AjaxError.throwByIsNull(t.getCreateTime(), "[创建时间] 不能为空");		// 验证: 创建时间 
+		AjaxError.throwByIsNull(t.getCreateBy(), "[创建人编号] 不能为空");		// 验证: 创建人编号 
+		AjaxError.throwByIsNull(t.getCreateName(), "[创建人名称] 不能为空");		// 验证: 创建人名称 
+		AjaxError.throwByIsNull(t.getUpdateTime(), "[更新时间] 不能为空");		// 验证: 更新时间 
+		AjaxError.throwByIsNull(t.getUpdateBy(), "[更新人编号] 不能为空");		// 验证: 更新人编号 
+		AjaxError.throwByIsNull(t.getUpdateName(), "[更新人名称] 不能为空");		// 验证: 更新人名称 
+		AjaxError.throwByIsNull(t.getDeleteStatus(), "[删除状态] 不能为空");		// 验证: 删除状态(0=禁用,1=启用) 
+	}
+
+	/** 
+	 * 获取一个TbOrder (方便复制代码用) [G] 
+	 */ 
+	static TbOrder getTbOrder() {
+		TbOrder t = new TbOrder();	// 声明对象 
+		t.setId(0L);		// 主键
+		t.setTradeAreaId(0L);		//  
+		t.setTradeAreaName("");		//  
+		t.setAddressIds("");		//  
+		t.setSaleMainId(0L);		//  
+		t.setTradeNo("");		// 订单号 
+		t.setBuyUserId(0L);		// 买家ID 
+		t.setBuyUserName("");		// 买家 
+		t.setBuyUserType("");		// 购买用户类型(3=边民,2=组长) 
+		t.setEnterpriseId(0L);		// 商家ID 
+		t.setEnterpriseName("");		// 商家名称 
+		t.setTotalWeight(0.0);		// 总重量 
+		t.setTotalPrice(0.0);		// 总金额 
+		t.setTradeTime(new Date());		// 交易时间 
+		t.setTradeStatus("");		// 交易状态(0=未支付,1=已支付) 
+		t.setPayType("");		// 支付方式(0=金融互助,1=现金刷卡) 
+		t.setSettleTime("");		// 结算时间 
+		t.setRealPrice(0.0);		// 当前结算金额 
+		t.setShouldPrice(0.0);		// 应结金额 
+		t.setSettleUserId(0L);		// 对账人 
+		t.setRecordUserId(0L);		// 对账人员 
+		t.setRecordTime("");		// 对账时间 
+		t.setRecord("");		// 是否对账(0=否,) 
+		t.setRefundReason("");		// 退款原因 
+		t.setRefundTime("");		// 退款时间 
+		t.setReceiveName("");		//  
+		t.setReceivePhone("");		//  
+		t.setReceiveAddress("");		//  
+		t.setOutTime("");		// 出互市区时间 
+		t.setGoodsNames("");		// 商品名称字符串 
+		t.setApply("");		// 是否申报 
+		t.setApplyTime("");		// 申报时间 
+		t.setApplyResult("");		// 申报结果 
+		t.setApplyFailReason("");		//  
+		t.setDistribution("");		// 分配方式(0=均分,1=自选数量) 
+		t.setConfirm("");		// 是否确认(0=否,1=是) 
+		t.setPick("");		// 是否接单 
+		t.setPickTime("");		// 接单时间 
+		t.setShopId(0L);		//  
+		t.setShopName("");		//  
+		t.setSend("");		// 是否发货 
+		t.setSendTime("");		// 发货时间 
+		t.setLevelTwoOrderId(0L);		// 对应二级市场中的收购单ID 
+		t.setCreateTime("");		// 创建时间 
+		t.setCreateBy("");		// 创建人编号 
+		t.setCreateName("");		// 创建人名称 
+		t.setUpdateTime("");		// 更新时间 
+		t.setUpdateBy("");		// 更新人编号 
+		t.setUpdateName("");		// 更新人名称 
+		t.setDeleteStatus(0);		// 删除状态(0=禁用,1=启用) 
+		return t;
+	}
+	
+	
+	
+	
+	
+}

sp-service/level-one-server/src/main/java/com/pj/tb_people/TbPeople.java

@@ -6,6 +6,8 @@ import java.util.Date;
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.EqualsAndHashCode;
 
 import lombok.Data;
@@ -46,6 +48,7 @@ public class TbPeople extends Model<TbPeople> implements Serializable {
 	 * 主键 
 	 */
 	@TableId(type = IdType.AUTO)
+	@JsonSerialize(using = ToStringSerializer.class)
 	private Long id;
 
 	/**

sp-service/level-one-server/src/main/java/com/pj/tb_shop/TbShop.java

@@ -5,6 +5,8 @@ import java.util.*;
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.EqualsAndHashCode;
 
 import lombok.Data;
@@ -45,6 +47,7 @@ public class TbShop extends Model<TbShop> implements Serializable {
 	 * 主键 
 	 */
 	@TableId(type = IdType.AUTO)
+	@JsonSerialize(using = ToStringSerializer.class)
 	private Long id;
 
 	/**

sp-service/level-one-server/src/main/java/com/pj/tb_trade_area/TbTradeArea.java

@@ -5,6 +5,8 @@ import java.util.*;
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.EqualsAndHashCode;
 
 import lombok.Data;
@@ -45,6 +47,7 @@ public class TbTradeArea extends Model<TbTradeArea> implements Serializable {
 	 * 主键 
 	 */
 	@TableId(type = IdType.AUTO)
+	@JsonSerialize(using = ToStringSerializer.class)
 	private Long id;
 
 	/**

sp-service/level-two-server/src/main/java/com/pj/tb_purchaser/TbPurchaser.java

@@ -5,6 +5,8 @@ import java.util.*;
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.pj.common.core.annotation.Excel;
 import lombok.EqualsAndHashCode;
 
@@ -47,6 +49,7 @@ public class TbPurchaser extends Model<TbPurchaser> implements Serializable {
 	 */
 	@Excel(name = "id")
 	@TableId(type = IdType.AUTO)
+	@JsonSerialize(using = ToStringSerializer.class)
 	private Long id;	
 
 	/**

sp-service/sp-admin/src/main/java/com/pj/project4sp/admin/SpAdmin.java

@@ -3,6 +3,7 @@ package com.pj.project4sp.admin;
 import java.io.Serializable;
 import java.util.Date;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
 import lombok.Data;

sp-service/sp-admin/src/main/java/com/pj/project4sp/admin/SpLoginInfo.java

@@ -0,0 +1,39 @@
+package com.pj.project4sp.admin;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class SpLoginInfo {
+    /** id，--主键、自增 */
+    private String id;
+    /** admin名称 */
+    private String name;
+    /** 手机号 */
+    private String phone;
+
+    /** 所属角色id */
+    private Integer roleId;
+
+    /** 账号状态(1=正常, 2=禁用) */
+    private Integer status;
+
+    /** 上次登陆时间 */
+
+    private Date loginTime;
+
+    /** 上次登陆IP */
+    private String loginIp;
+
+    /** 登陆次数 */
+    private Integer loginCount;
+
+}

sp-service/sp-admin/src/main/java/com/pj/project4sp/admin4login/SpAccAdminController.java

@@ -3,7 +3,9 @@ package com.pj.project4sp.admin4login;
 import javax.servlet.http.HttpServletRequest;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.json.JSONUtil;
 import com.pj.current.satoken.AuthConst;
+import com.pj.utils.cache.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -49,6 +51,8 @@ public class SpAccAdminController {
 	/** 退出登录  */
 	@RequestMapping("doExit")
 	AjaxJson doExit() {
+		// 退出时删除登录信息
+		RedisUtil.del("loginInfo:");
 		StpUtil.logout();
 		return AjaxJson.getSuccess();
 	}

sp-service/sp-admin/src/main/java/com/pj/project4sp/admin4login/SpAccAdminService.java

@@ -4,7 +4,11 @@ package com.pj.project4sp.admin4login;
 import java.util.Date;
 import java.util.List;
 
+import cn.hutool.json.JSONUtil;
 import com.pj.current.satoken.StpUserUtil;
+import com.pj.project4sp.admin.SpLoginInfo;
+import com.pj.utils.cache.RedisUtil;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
@@ -90,16 +94,20 @@ public class SpAccAdminService {
             return AjaxJson.getError("此账号已被禁用，如有疑问，请联系管理员");
         }
 
-        // =========== 至此, 已登录成功 ============ 
+        // =========== 至此, 已登录成功 ============
         successLogin(admin);
         StpUtil.login(admin.getId());
         // 组织返回参数
+        SpLoginInfo spLoginInfo = new SpLoginInfo();
+        BeanUtils.copyProperties(admin,spLoginInfo);
         SoMap map = new SoMap();
         map.put("admin", admin);
         List<String> per_list = spRolePermissionService.getPcodeByRid2(admin.getRoleId());
         map.put("per_list", per_list);
         map.put("tokenInfo", StpUtil.getTokenInfo());
         StpUserUtil.cachePerList(per_list);
+        // 记录登录信息至redis
+        RedisUtil.set("loginInfo:", JSONUtil.toJsonStr(spLoginInfo));
         return AjaxJson.getSuccessData(map);
     }
 

sp-service/transport-server/src/main/java/com/pj/project/tb_driver/TbDriver.java

@@ -5,6 +5,9 @@ import java.util.*;
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.pj.common.core.annotation.Excel;
 import lombok.EqualsAndHashCode;
 
 import lombok.Data;
@@ -45,21 +48,25 @@ public class TbDriver extends Model<TbDriver> implements Serializable {
 	 * 主键 
 	 */
 	@TableId(type = IdType.AUTO)
+	@JsonSerialize(using = ToStringSerializer.class)
 	private Long id;	
 
 	/**
 	 * 姓名 
 	 */
+	@Excel(name = "姓名")
 	private String name;	
 
 	/**
 	 * 年龄 
 	 */
+	@Excel(name = "年龄")
 	private Integer age;	
 
 	/**
 	 * 性别性别(1=男,2=女) 
 	 */
+	@Excel(name = "性别")
 	private Integer sex;
 
 	/**

sp-service/transport-server/src/main/java/com/pj/project/tb_orders/TbOrders.java

@@ -3,6 +3,8 @@ package com.pj.project.tb_orders;
 import java.io.Serializable;
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.EqualsAndHashCode;
 
 import lombok.Data;
@@ -43,6 +45,7 @@ public class TbOrders extends Model<TbOrders> implements Serializable {
 	 * 货运订单管理表主键 
 	 */
 	@TableId(type = IdType.AUTO)
+	@JsonSerialize(using = ToStringSerializer.class)
 	private Long id;	
 
 	/**

sp-service/transport-server/src/main/java/com/pj/project/tb_vehicle/TbVehicle.java

@@ -5,6 +5,8 @@ import java.util.*;
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.EqualsAndHashCode;
 
 import lombok.Data;
@@ -45,6 +47,7 @@ public class TbVehicle extends Model<TbVehicle> implements Serializable {
 	 * 主键 
 	 */
 	@TableId(type = IdType.AUTO)
+	@JsonSerialize(using = ToStringSerializer.class)
 	private Long id;	
 
 	/**