7.31 日常开发

sp-core/sp-base/src/main/java/com/pj/rabbitmq/config/RabbitMqConfig.java

@@ -16,6 +16,8 @@ public class RabbitMqConfig {
     public  static final String PEOPLE_REVEIVE_MESSAGE_MQ = "people_queue";
     /** 商家队列 */
     public  static final String ENTERPRISE_REVEIVE_MESSAGE_MQ = "enterprise_queue";
+    /** 收购商队列 */
+    public static final String PURCHASER_REVEIVE_MESSAGE_MQ = "purchaser_queue";
 
     /**
      * 边民接收消息队列
@@ -35,6 +37,15 @@ public class RabbitMqConfig {
         return new Queue(ENTERPRISE_REVEIVE_MESSAGE_MQ,true);
     }
 
+    /**
+     * 二级市场收购商消息队列
+     * @return
+     */
+    @Bean
+    public Queue purchaserQueue(){
+        return new Queue(PURCHASER_REVEIVE_MESSAGE_MQ,true);
+    }
+
 
 
 

sp-service/level-one-server/src/main/java/com/pj/rabbitmq/listener/RabbitMQListener.java → sp-service/level-one-server/src/main/java/com/pj/rabbitmq/listener/PeopleRabbitMQListener.java

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Component;
  * @Date 2023 07 28 17 12
  **/
 @Component
-public class RabbitMQListener {
+public class PeopleRabbitMQListener {
 
 
     @RabbitHandler

sp-service/level-two-server/src/main/java/com/pj/tb_orders/TbOrders.java

@@ -0,0 +1,201 @@
+package com.pj.tb_orders;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.alibaba.excel.annotation.format.DateTimeFormat;
+import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.EqualsAndHashCode;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * Model: tb_orders -- 订单表
+ * @author qzy 
+ */
+@Data
+@Accessors(chain = true)
+@TableName(TbOrders.TABLE_NAME)
+@EqualsAndHashCode(callSuper = false)
+public class TbOrders extends Model<TbOrders> implements Serializable {
+
+	// ---------- 模块常量 ----------
+	/**
+	 * 序列化版本id 
+	 */
+	private static final long serialVersionUID = 1L;	
+	/**
+	 * 此模块对应的表名 
+	 */
+	public static final String TABLE_NAME = "tb_orders";	
+	/**
+	 * 此模块对应的权限码 
+	 */
+	public static final String PERMISSION_CODE = "tb-orders";
+	public static final String PERMISSION_CODE_ADD = "tb-orders-add";
+	public static final String PERMISSION_CODE_EDIT = "tb-orders-edit";
+	public static final String PERMISSION_CODE_DEL = "tb-orders-del";
+
+
+
+
+	// ---------- 表中字段 ----------
+	/**
+	 * 货运订单管理表主键 
+	 */
+	@TableId(type = IdType.AUTO)
+	private Long id;	
+
+	/**
+	 * 一级市场订单ID 
+	 */
+	private Long levelOneOrderId;	
+
+	/**
+	 * 订单编号 
+	 */
+	private String orderNo;	
+
+	/**
+	 * 商品id 
+	 */
+	private Long goodsId;	
+
+	/**
+	 * 商品名称 
+	 */
+	private String goodsName;	
+
+	/**
+	 * 商品来源(国家) 
+	 */
+	private String goodsFrom;	
+
+	/**
+	 * 发货商电话 
+	 */
+	private String shipperPhone;	
+
+	/**
+	 * 发货商名称 
+	 */
+	private String shipperName;	
+
+	/**
+	 * 司机ID 
+	 */
+	private Long driverId;	
+
+	/**
+	 * 司机名称 
+	 */
+	private String driverName;	
+
+	/**
+	 * 司机电话 
+	 */
+	private String driverPhone;	
+
+	/**
+	 * 车型ID 
+	 */
+	private Long carId;	
+
+	/**
+	 * 车型名称 
+	 */
+	private String carType;	
+
+	/**
+	 * 收货人名称 
+	 */
+	private String consigneeName;	
+
+	/**
+	 * 收货人电话号码 
+	 */
+	private String consigneePhone;	
+
+	/**
+	 * (预留字段) 申报订单号 
+	 */
+	private String declarationNumber;	
+
+	/**
+	 * 订单状态已完成 (0=禁用,1=启用) 
+	 */
+	private Integer orderFinish;	
+
+	/**
+	 * 装货地址 
+	 */
+	private String loadingAddress;	
+
+	/**
+	 * 卸货地址 
+	 */
+	private String unloadingAddress;	
+
+	/**
+	 * 备注 
+	 */
+	private String comment;	
+
+	/**
+	 * 更新时间 
+	 */
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	private Date updateTime;
+
+	/**
+	 * 创建时间 
+	 */
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	private Date createTime;
+
+	/**
+	 * 更新人名称 
+	 */
+	private String updateName;	
+
+	/**
+	 * 删除状态(0=禁用,1=启用) 
+	 */
+	private Integer deleteStatus;	
+
+	/**
+	 * 更新人编号 
+	 */
+	private Long updateBy;
+
+	/**
+	 * 创建人编号 
+	 */
+	private String createBy;	
+
+	/**
+	 * 创建人名称 
+	 */
+	private String createName;	
+
+	/**
+	 * 贸易区域id 
+	 */
+	private Long tradeAreaId;	
+
+	/**
+	 * 贸易区域名称 
+	 */
+	private String tradeAreaName;	
+
+
+
+
+
+	
+
+
+}

sp-service/level-two-server/src/main/java/com/pj/tb_orders/TbOrdersController.java

@@ -0,0 +1,101 @@
+package com.pj.tb_orders;
+
+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_orders -- 订单表
+ * @author qzy 
+ */
+@RestController
+@RequestMapping("/TbOrders/")
+public class TbOrdersController {
+
+	/** 底层 Service 对象 */
+	@Autowired
+	TbOrdersService tbOrdersService;
+
+	/** 增 */  
+	@RequestMapping("add")
+	@SaCheckPermission(TbOrders.PERMISSION_CODE_ADD)
+	public AjaxJson add(TbOrders t){
+		tbOrdersService.add(t);
+		t = tbOrdersService.getById(SP.publicMapper.getPrimarykey());
+		return AjaxJson.getSuccessData(t);
+	}
+
+	/** 删 */  
+	@RequestMapping("delete")
+	@SaCheckPermission(TbOrders.PERMISSION_CODE_DEL)
+	public AjaxJson delete(Long id){
+		 tbOrdersService.delete(id);
+		return AjaxJson.getSuccess();
+	}
+	
+	/** 删 - 根据id列表 */  
+	@RequestMapping("deleteByIds")
+	@SaCheckPermission(TbOrders.PERMISSION_CODE_DEL)
+	public AjaxJson deleteByIds(){
+		List<Long> ids = SoMap.getRequestSoMap().getListByComma("ids", long.class); 
+		int line = SP.publicMapper.deleteByIds(TbOrders.TABLE_NAME, ids);
+		return AjaxJson.getByLine(line);
+	}
+	
+	/** 改 */  
+	@RequestMapping("update")
+	@SaCheckPermission(TbOrders.PERMISSION_CODE_EDIT)
+	public AjaxJson update(TbOrders t){
+		tbOrdersService.update(t);
+		return AjaxJson.getSuccess();
+	}
+
+	/** 查 - 根据id */  
+	@RequestMapping("getById")
+		@SaCheckPermission(TbOrders.PERMISSION_CODE)
+	public AjaxJson getById(Long id){
+		TbOrders t = tbOrdersService.getById(id);
+		return AjaxJson.getSuccessData(t);
+	}
+
+	/** 查集合 - 根据条件（参数为空时代表忽略指定条件） */  
+	@RequestMapping("getList")
+		@SaCheckPermission(TbOrders.PERMISSION_CODE)
+	public AjaxJson getList(@RequestParam(value = "keyword",required = false)String keyword) {
+		SoMap so = SoMap.getRequestSoMap();
+		List<TbOrders> list = tbOrdersService.getList(so.startPage(),keyword);
+		return AjaxJson.getPageData(so.getDataCount(), list);
+	}
+	
+	
+	
+	/** 改 - 订单状态已完成 (0=禁用,1=启用) */  
+	@RequestMapping("updateOrderFinish")
+	@SaCheckPermission(TbOrders.PERMISSION_CODE_EDIT)
+	public AjaxJson updateOrderFinish(Long id, Integer value){
+		int line = SP.publicMapper.updateColumnById(TbOrders.TABLE_NAME, "order_finish", value, id);
+		return AjaxJson.getByLine(line);
+	}
+	
+	/** 改 - 删除状态(0=禁用,1=启用) */  
+	@RequestMapping("updateDeleteStatus")
+	@SaCheckPermission(TbOrders.PERMISSION_CODE_EDIT)
+	public AjaxJson updateDeleteStatus(Long id, Integer value){
+		int line = SP.publicMapper.updateColumnById(TbOrders.TABLE_NAME, "delete_status", value, id);
+		return AjaxJson.getByLine(line);
+	}
+	
+	
+
+	
+	
+	
+
+}

sp-service/level-two-server/src/main/java/com/pj/tb_orders/TbOrdersMapper.java

@@ -0,0 +1,30 @@
+package com.pj.tb_orders;
+
+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_orders -- 订单表
+ * @author qzy 
+ */
+
+@Mapper
+@Repository
+public interface TbOrdersMapper extends BaseMapper <TbOrders> {
+
+
+
+	/**
+	 * 查集合 - 根据条件（参数为空时代表忽略指定条件）
+	 * @param so 参数集合 
+	 * @return 数据列表 
+	 */
+	List<TbOrders> getList(SoMap so);
+
+
+}

sp-service/level-two-server/src/main/java/com/pj/tb_orders/TbOrdersMapper.xml

@@ -0,0 +1,99 @@
+<?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_orders.TbOrdersMapper">
+
+
+
+
+	<!-- ================================== 查询相关 ================================== -->
+	<!-- select id, level_one_order_id, order_no, goods_id, goods_name, goods_from, shipper_phone, shipper_name, driver_id, driver_name, driver_phone, car_id, car_type, consignee_name, consignee_phone, declaration_number, order_finish, loading_address, unloading_address, comment, update_time, create_time, update_name, delete_status, update_by, create_by, create_name, trade_area_id, trade_area_name from tb_orders  -->
+	
+	<!-- 通用映射：自动模式 -->
+	<resultMap id="model" autoMapping="true" type="com.pj.tb_orders.TbOrders"></resultMap>
+	
+	<!-- 公共查询sql片段 -->
+	<sql id="select_sql">
+		select * 
+		from tb_orders 
+	</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("levelOneOrderId") '> and level_one_order_id = #{levelOneOrderId} </if>
+			<if test=' this.has("orderNo") '> and order_no = #{orderNo} </if>
+			<if test=' this.has("goodsId") '> and goods_id = #{goodsId} </if>
+			<if test=' this.has("goodsName") '> and goods_name = #{goodsName} </if>
+			<if test=' this.has("goodsFrom") '> and goods_from = #{goodsFrom} </if>
+			<if test=' this.has("shipperPhone") '> and shipper_phone = #{shipperPhone} </if>
+			<if test=' this.has("shipperName") '> and shipper_name = #{shipperName} </if>
+			<if test=' this.has("driverId") '> and driver_id = #{driverId} </if>
+			<if test=' this.has("driverName") '> and driver_name = #{driverName} </if>
+			<if test=' this.has("driverPhone") '> and driver_phone = #{driverPhone} </if>
+			<if test=' this.has("carId") '> and car_id = #{carId} </if>
+			<if test=' this.has("carType") '> and car_type = #{carType} </if>
+			<if test=' this.has("consigneeName") '> and consignee_name = #{consigneeName} </if>
+			<if test=' this.has("consigneePhone") '> and consignee_phone = #{consigneePhone} </if>
+			<if test=' this.has("declarationNumber") '> and declaration_number = #{declarationNumber} </if>
+			<if test=' this.has("orderFinish") '> and order_finish = #{orderFinish} </if>
+			<if test=' this.has("loadingAddress") '> and loading_address = #{loadingAddress} </if>
+			<if test=' this.has("unloadingAddress") '> and unloading_address = #{unloadingAddress} </if>
+			<if test=' this.has("comment") '> and comment = #{comment} </if>
+			<if test=' this.has("updateTime") '> and update_time = #{updateTime} </if>
+			<if test=' this.has("createTime") '> and create_time = #{createTime} </if>
+			<if test=' this.has("updateName") '> and update_name = #{updateName} </if>
+			<if test=' this.has("deleteStatus") '> and delete_status = #{deleteStatus} </if>
+			<if test=' this.has("updateBy") '> and update_by = #{updateBy} </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("tradeAreaId") '> and trade_area_id = #{tradeAreaId} </if>
+			<if test=' this.has("tradeAreaName") '> and trade_area_name = #{tradeAreaName} </if>
+		</where>
+		order by
+		<choose>
+			<when test='sortType == 1'> id desc </when>
+			<when test='sortType == 2'> level_one_order_id desc </when>
+			<when test='sortType == 3'> order_no desc </when>
+			<when test='sortType == 4'> goods_id desc </when>
+			<when test='sortType == 5'> goods_name desc </when>
+			<when test='sortType == 6'> goods_from desc </when>
+			<when test='sortType == 7'> shipper_phone desc </when>
+			<when test='sortType == 8'> shipper_name desc </when>
+			<when test='sortType == 9'> driver_id desc </when>
+			<when test='sortType == 10'> driver_name desc </when>
+			<when test='sortType == 11'> driver_phone desc </when>
+			<when test='sortType == 12'> car_id desc </when>
+			<when test='sortType == 13'> car_type desc </when>
+			<when test='sortType == 14'> consignee_name desc </when>
+			<when test='sortType == 15'> consignee_phone desc </when>
+			<when test='sortType == 16'> declaration_number desc </when>
+			<when test='sortType == 17'> order_finish desc </when>
+			<when test='sortType == 18'> loading_address desc </when>
+			<when test='sortType == 19'> unloading_address desc </when>
+			<when test='sortType == 20'> comment desc </when>
+			<when test='sortType == 21'> update_time desc </when>
+			<when test='sortType == 22'> create_time desc </when>
+			<when test='sortType == 23'> update_name desc </when>
+			<when test='sortType == 24'> delete_status desc </when>
+			<when test='sortType == 25'> update_by desc </when>
+			<when test='sortType == 26'> create_by desc </when>
+			<when test='sortType == 27'> create_name desc </when>
+			<when test='sortType == 28'> trade_area_id desc </when>
+			<when test='sortType == 29'> trade_area_name desc </when>
+			<otherwise> id desc </otherwise>
+		</choose>
+	</select>
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+</mapper>

sp-service/level-two-server/src/main/java/com/pj/tb_orders/TbOrdersService.java

@@ -0,0 +1,72 @@
+package com.pj.tb_orders;
+
+import java.util.List;
+
+import com.pj.common.core.exception.ServiceException;
+import com.pj.current.dto.APPLoginUserInfo;
+import com.pj.current.satoken.StpAPPUserUtil;
+import com.pj.tb_purchaser.TbPurchaser;
+import com.pj.tb_purchaser.TbPurchaserMapper;
+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_orders -- 订单表
+ * @author qzy 
+ */
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class TbOrdersService extends ServiceImpl<TbOrdersMapper, TbOrders> implements IService<TbOrders>{
+
+	/** 底层 Mapper 对象 */
+	@Autowired
+	TbOrdersMapper tbOrdersMapper;
+	@Autowired
+	private TbPurchaserMapper tbPurchaserMapper;
+
+	/** 增 */
+	void add(TbOrders t){
+		save(t);
+	}
+
+	/** 删 */
+	void delete(Long id){
+		removeById(id);
+	}
+
+	/** 改 */
+	void update(TbOrders t){
+		updateById(t);
+
+	}
+
+	/** 查 */
+	TbOrders getById(Long id){
+		return super.getById(id);
+	}
+
+	/** 查集合 - 根据条件（参数为空时代表忽略指定条件）
+	 * 管理购买的商品订单（包括已支付、运输中、售后）
+	 * */
+	List<TbOrders> getList(SoMap so,String keyword) {
+		//首先判断该用户是否为收购商
+		APPLoginUserInfo appLoginInfo = StpAPPUserUtil.getAPPLoginInfo();
+		if(appLoginInfo == null || appLoginInfo.getLoginId() == null)
+			throw new ServiceException("当前登陆用户信息已失效!");
+		TbPurchaser tbPurchaser = tbPurchaserMapper.selectById(appLoginInfo.getLoginId());
+		if(tbPurchaser == null)throw new ServiceException("您的身份不是收购商!");
+		//执行查询
+		so.set("create_by",appLoginInfo.getLoginId());
+		so.set("keyword",keyword);
+		so.set("sortType",22);
+		//todo: 管理二级市场收购商的订单
+
+		return tbOrdersMapper.getList(so);	
+	}
+	
+
+}

sp-service/level-two-server/src/main/java/com/pj/tb_orders/TbOrdersUtil.java

@@ -0,0 +1,27 @@
+package com.pj.tb_orders;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 工具类：tb_orders -- 订单表
+ * @author qzy 
+ *
+ */
+@Component
+public class TbOrdersUtil {
+
+	
+	/** 底层 Mapper 对象 */
+	public static TbOrdersMapper tbOrdersMapper;
+	@Autowired
+	private void setTbOrdersMapper(TbOrdersMapper tbOrdersMapper) {
+		TbOrdersUtil.tbOrdersMapper = tbOrdersMapper;
+	}
+	
+
+
+	
+	
+	
+}