8.10 一些小优化

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

@@ -131,6 +131,7 @@ public class MethodGoodsTransitService {
         tbOrder.setGoodsNames(tbGoodsTransit.getGoodsName());
         tbOrder.setShopId(tbGoodsTransit.getShopId());
         tbOrder.setShopName(tbGoodsTransit.getShopName());
+        tbOrder.setGoodsUnit(tbGoodsTransit.getGoodsUnits());
         //设置下单时的默认状态
         tbOrder.setDeleteStatus(DeleteStatus.DELETE_STATUS_ON.getCode()); // 删除状态默认是1,可用
         tbOrder.setEnterpriseConfirm(EnterpriseConfirm.ENTERPRISE_CONFIRM_ZERO.getCode()); // 0为待商家确认

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

@@ -331,6 +331,9 @@ public class TbOrder extends Model<TbOrder> implements Serializable {
 	private Integer resaleStatus;
 
 
-
+	/**
+	 * 商品单位
+	 */
+	private String goodsUnit;
 
 }

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

@@ -247,6 +247,8 @@ public class TbOrderService extends ServiceImpl<TbOrderMapper, TbOrder> implemen
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		queryWrapper.eq(TbOrder::getCreateTime,sdf.format(currDay));
 		queryWrapper.eq(TbOrder::getCreateBy,appUserId);
+		//todo:届时放开该注释
+//		queryWrapper.eq(TbOrder::getApply,ApplyStatus.APPLY_STATUS_ONE.getCode()); //申报通过
 		queryWrapper.eq(TbOrder::getDeleteStatus,DeleteStatus.DELETE_STATUS_ON.getCode());
 		List<TbOrder> tbOrderList = tbOrderMapper.selectList(queryWrapper);
 		//创建返回值集合

sp-service/level-two-server/src/main/java/com/pj/tb_demand_quotation/TbDemandQuotationService.java

@@ -136,7 +136,7 @@ public class TbDemandQuotationService extends ServiceImpl<TbDemandQuotationMappe
             if (updateById != 1) throw new RuntimeException("无法进行报价!");
             //短信提示二级市场收购商,需求已报价,进入app进行确认接单
             TbPurchaser tbPurchaser = tbPurchaserMapper.selectById(tbGoodsDemand.getPurchaserId());
-            if (tbPurchaser == null) throw new RuntimeException("服务器繁忙~");
+            if (tbPurchaser == null) throw new RuntimeException("二级商户信息异常!~");
             //todo:发送短信
 //			smsRetryService.sendSmsMsg(tbPurchaser.getContact());
             return true;

sp-service/level-two-server/src/main/java/com/pj/tb_goods_demand/AppTbGoodsDemandController.java

@@ -110,7 +110,7 @@ public class AppTbGoodsDemandController {
     }
 
     /**
-     * app端:二级收购商查看需求发布列表(包括报价信息)
+     * app端:二级收购商查看需求发布需求详情
      */
     @RequestMapping("goodsDemandDetail")
     public AjaxJson goodsDemandDetail() {

sp-service/level-two-server/src/main/java/com/pj/tb_goods_demand/MethodGoodsDemandService.java

@@ -170,12 +170,13 @@ public class MethodGoodsDemandService {
         TbGoodsDemand tbGoodsDemand = tbGoodsDemandMapper.selectById(goodsDemandId);
         if(tbGoodsDemand == null)return false;
         // 修改需求状态
-        tbGoodsDemand.setIsOrders(0); // 将需求设置为未发布
-        int updateById = tbGoodsDemandMapper.updateById(tbGoodsDemand); // 设置二级市场收购商的响应时间
+        tbGoodsDemand.setIsOrders(0); // 将需求设置为未被下单
+        int updateById = tbGoodsDemandMapper.updateById(tbGoodsDemand);
         //修改报价状态
         if(updateById == 1){
             tbDemandQuotation.setQuotationResult(2); // 2 表示拒绝
             tbDemandQuotation.setRemark("\n" + appLoginUserInfo.getLoginName() + ": " + purchaserRemark);
+            // 设置二级市场收购商的响应时间
             tbDemandQuotation.setResultTime(new Date());
             int updateById1 = tbDemandQuotationMapper.updateById(tbDemandQuotation);
             return updateById1 == 1;

sp-service/level-two-server/src/main/java/com/pj/tb_goods_demand/TbGoodsDemandService.java

@@ -101,7 +101,7 @@ public class TbGoodsDemandService extends ServiceImpl<TbGoodsDemandMapper, TbGoo
 	}
 
 	/**
-	 * 二级收购商查看需求发布列表(包括报价信息)
+	 * 二级收购商查看需求发布需求详情
 	 * @return
 	 */
 	public GoodsDemandVo goodsDemandList(SoMap so){

sp-service/transport-server/src/main/java/com/pj/project/tb_logistics/TbLogisticsService.java

@@ -13,7 +13,6 @@ import com.pj.current.dto.APPLoginUserInfo;
 import com.pj.current.satoken.StpAPPUserUtil;
 import com.pj.enummj.DeleteStatus;
 import com.pj.enummj.OrderStatus;
-import com.pj.project.tb_orders.TbOrders;
 import com.pj.utils.so.SoMap;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,195 +0,0 @@
-package com.pj.project.tb_orders;
-
-import java.io.Serializable;
-import java.util.Date;
-
-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_orders -- 订单表
- * @author loovi
- */
-@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)
-	@JsonSerialize(using = ToStringSerializer.class)
-	private Long id;
-
-	/**
-	 * 一级市场订单ID
-	 */
-	private Long levelOneOrderId;
-
-	/**
-	 * 订单编号
-	 */
-	private String orderNo;
-
-	/**
-	 * 贸易区域id
-	 */
-	private Integer tradeAreaId;
-
-	/**
-	 * 贸易区域名称
-	 */
-	private String tradeAreaName;
-
-	/**
-	 * 商品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;
-
-	/**
-	 * 创建时间
-	 */
-	private Date createTime;
-
-	/**
-	 * 创建人编号
-	 */
-	private String createBy;
-
-	/**
-	 * 创建人名称
-	 */
-	private String createName;
-
-	/**
-	 * 更新时间
-	 */
-	private Date updateTime;
-
-	/**
-	 * 更新人编号
-	 */
-	private String updateBy;
-
-	/**
-	 * 更新人名称
-	 */
-	private String updateName;
-
-	/**
-	 * 删除状态(0=禁用,1=启用)
-	 */
-	private Integer deleteStatus;
-
-
-
-}

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

@@ -1,101 +0,0 @@
-package com.pj.project.tb_orders;
-
-import cn.dev33.satoken.annotation.SaCheckPermission;
-import com.pj.project4sp.SP;
-import com.pj.utils.sg.AjaxJson;
-import com.pj.utils.so.SoMap;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-
-/**
- * Controller: tb_orders -- 物流订单表
- * @author loovi
- */
-@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() {
-		SoMap so = SoMap.getRequestSoMap();
-		List<TbOrders> list = tbOrdersService.getList(so.startPage());
-		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/transport-server/src/main/java/com/pj/project/tb_orders/TbOrdersMapper.java

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

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

@@ -1,89 +0,0 @@
-<?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.project.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, create_time, create_by, create_name, update_time, update_by, update_name, delete_status from tb_orders  -->
-	
-	<!-- 通用映射：自动模式 -->
-	<resultMap id="model" autoMapping="true" type="com.pj.project.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("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'> 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'> create_time desc </when>
-			<when test='sortType == 19'> create_by desc </when>
-			<when test='sortType == 20'> create_name desc </when>
-			<when test='sortType == 21'> update_time desc </when>
-			<when test='sortType == 22'> update_by desc </when>
-			<when test='sortType == 23'> update_name desc </when>
-			<when test='sortType == 24'> delete_status desc </when>
-			<otherwise> id desc </otherwise>
-		</choose>
-	</select>
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-</mapper>

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

@@ -1,51 +0,0 @@
-package com.pj.project.tb_orders;
-
-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;
-import com.pj.utils.sg.*;
-
-/**
- * Service: tb_orders -- 订单表
- * @author loovi 
- */
-@Service
-@Transactional(rollbackFor = Exception.class)
-public class TbOrdersService extends ServiceImpl<TbOrdersMapper, TbOrders> implements IService<TbOrders>{
-
-	/** 底层 Mapper 对象 */
-	@Autowired
-	TbOrdersMapper tbOrdersMapper;
-
-	/** 增 */
-	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) { 
-		return tbOrdersMapper.getList(so);	
-	}
-	
-
-}

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

@@ -1,91 +0,0 @@
-//package com.pj.project.tb_orders;
-//
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.stereotype.Component;
-//
-//import com.pj.utils.sg.*;
-//
-///**
-// * 工具类：tb_orders -- 订单表
-// * @author loovi
-// *
-// */
-//@Component
-//public class TbOrdersUtil {
-//
-//
-//	/** 底层 Mapper 对象 */
-//	public static TbOrdersMapper tbOrdersMapper;
-//	@Autowired
-//	private void setTbOrdersMapper(TbOrdersMapper tbOrdersMapper) {
-//		TbOrdersUtil.tbOrdersMapper = tbOrdersMapper;
-//	}
-//
-//
-//	/**
-//	 * 将一个 TbOrders 对象进行进行数据完整性校验 (方便add/update等接口数据校验) [G]
-//	 */
-//	static void check(TbOrders t) {
-//		AjaxError.throwByIsNull(t.getId(), "[货运订单管理表主键] 不能为空");		// 验证: 货运订单管理表主键
-//		AjaxError.throwByIsNull(t.getLevelOneOrderId(), "[一级市场订单ID] 不能为空");		// 验证: 一级市场订单ID
-//		AjaxError.throwByIsNull(t.getOrderNo(), "[订单编号] 不能为空");		// 验证: 订单编号
-//		AjaxError.throwByIsNull(t.getGoodsId(), "[商品id] 不能为空");		// 验证: 商品id
-//		AjaxError.throwByIsNull(t.getGoodsName(), "[商品名称] 不能为空");		// 验证: 商品名称
-//		AjaxError.throwByIsNull(t.getGoodsFrom(), "[商品来源] 不能为空");		// 验证: 商品来源(国家)
-//		AjaxError.throwByIsNull(t.getShipperPhone(), "[发货商电话] 不能为空");		// 验证: 发货商电话
-//		AjaxError.throwByIsNull(t.getShipperName(), "[发货商名称] 不能为空");		// 验证: 发货商名称
-//		AjaxError.throwByIsNull(t.getDriverId(), "[司机ID] 不能为空");		// 验证: 司机ID
-//		AjaxError.throwByIsNull(t.getDriverName(), "[司机名称] 不能为空");		// 验证: 司机名称
-//		AjaxError.throwByIsNull(t.getDriverPhone(), "[司机电话] 不能为空");		// 验证: 司机电话
-//		AjaxError.throwByIsNull(t.getCarId(), "[车型ID] 不能为空");		// 验证: 车型ID
-//		AjaxError.throwByIsNull(t.getCarType(), "[车型名称] 不能为空");		// 验证: 车型名称
-//		AjaxError.throwByIsNull(t.getConsigneeName(), "[收货人名称] 不能为空");		// 验证: 收货人名称
-//		AjaxError.throwByIsNull(t.getConsigneePhone(), "[收货人电话号码] 不能为空");		// 验证: 收货人电话号码
-//		AjaxError.throwByIsNull(t.getDeclarationNumber(), "[申报订单号] 不能为空");		// 验证: (预留字段) 申报订单号
-//		AjaxError.throwByIsNull(t.getOrderFinish(), "[订单状态已完成] 不能为空");		// 验证: 订单状态已完成 (0=禁用,1=启用)
-//		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=启用)
-//	}
-//
-//	/**
-//	 * 获取一个TbOrders (方便复制代码用) [G]
-//	 */
-//	static TbOrders getTbOrders() {
-//		TbOrders t = new TbOrders();	// 声明对象
-//		t.setId(0L);		// 货运订单管理表主键
-//		t.setLevelOneOrderId(0L);		// 一级市场订单ID
-//		t.setOrderNo("");		// 订单编号
-//		t.setGoodsId(0L);		// 商品id
-//		t.setGoodsName("");		// 商品名称
-//		t.setGoodsFrom("");		// 商品来源(国家)
-//		t.setShipperPhone("");		// 发货商电话
-//		t.setShipperName("");		// 发货商名称
-//		t.setDriverId(0L);		// 司机ID
-//		t.setDriverName("");		// 司机名称
-//		t.setDriverPhone("");		// 司机电话
-//		t.setCarId(0L);		// 车型ID
-//		t.setCarType("");		// 车型名称
-//		t.setConsigneeName("");		// 收货人名称
-//		t.setConsigneePhone("");		// 收货人电话号码
-//		t.setDeclarationNumber("");		// (预留字段) 申报订单号
-//		t.setOrderFinish(0);		// 订单状态已完成 (0=禁用,1=启用)
-//		t.setCreateTime("");		// 创建时间
-//		t.setCreateBy("");		// 创建人编号
-//		t.setCreateName("");		// 创建人名称
-//		t.setUpdateTime("");		// 更新时间
-//		t.setUpdateBy("");		// 更新人编号
-//		t.setUpdateName("");		// 更新人名称
-//		t.setDeleteStatus(0);		// 删除状态(0=禁用,1=启用)
-//		return t;
-//	}
-//
-//
-//
-//
-//
-//}

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

@@ -120,8 +120,8 @@ public class MethodVehicleService {
         logistics.setDeleteStatus(DeleteStatus.DELETE_STATUS_ON.getCode()); // 默认可用
 
         //保存物流信息
-        int updateById1 = tbLogisticsMapper.updateById(logistics);
-        if(updateById1 != 1)throw new RuntimeException("物流信息保存异常!");
+        int insert = tbLogisticsMapper.insert(logistics);
+        if(insert != 1)throw new RuntimeException("物流信息保存异常!");
 
         return true;
     }

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

@@ -32,7 +32,8 @@ public class TbVehicleAppController {
 	/** 查 - 根据车牌号查车辆信息 */
 	@RequestMapping("getByVehiclePlate")
 	public AjaxJson getByVehiclePlate(String vehiclePlate){
-		TbVehicle t = tbVehicleService.getByVehiclePlate(vehiclePlate);
+		List<TbVehicle> t = tbVehicleService.getByVehiclePlate(vehiclePlate);
+		if(t.size() == 0)return AjaxJson.getSuccess("暂无更多车辆信息~");
 		return AjaxJson.getSuccessData(t);
 	}
 

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

@@ -93,9 +93,9 @@ public class TbVehicleService extends ServiceImpl<TbVehicleMapper, TbVehicle> im
 	}
 
 	/** 查 - 根据车牌号查车辆信息 */
-	TbVehicle getByVehiclePlate(String vehiclePlate) {
+	List<TbVehicle> getByVehiclePlate(String vehiclePlate) {
 
-		TbVehicle tbVehicle = tbVehicleMapper.selectOne(new LambdaQueryWrapper<TbVehicle>()
+		List<TbVehicle> tbVehicle = tbVehicleMapper.selectList(new LambdaQueryWrapper<TbVehicle>()
 				.like(TbVehicle::getVehiclePlate, vehiclePlate) //车牌号
 				.eq(TbVehicle::getVehicleStatus, 1)//车辆状态:1=空闲
 				.eq(TbVehicle::getDeleteStatus, DeleteStatus.DELETE_STATUS_ON.getCode()));
@@ -161,7 +161,7 @@ public class TbVehicleService extends ServiceImpl<TbVehicleMapper, TbVehicle> im
 		//将叫车表状态改成已拒绝
 		TbCarRecord tbCarRecord = tbCarRecordMapper.selectById(failDriverResultParam.getCarRecordId());
 		if(tbCarRecord == null)throw new ServiceException("叫车记录信息异常!");
-		tbCarRecord.setDriverResult(2);
+		tbCarRecord.setDriverResult(2); // 2=司机拒绝接单
 		//执行保存
 		int i = tbCarRecordMapper.updateById(tbCarRecord);
 		return i == 1;

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

@@ -14,8 +14,8 @@ public class FailDriverResultParam {
     @NotNull(message = "叫车记录表主键")
     private Long carRecordId;
 
-    @NotNull(message = "一级市场商户主键不为空")
-    private Long enterpriseId;
+//    @NotNull(message = "一级市场商户主键不为空")
+//    private Long enterpriseId;
 
     @NotNull(message = "收购商电话不能为空")
     private String enterprisePhone;

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

@@ -56,7 +56,7 @@ public class SucessDriverResultParam {
      * 交易地区名称
      */
     @NotNull(message = "tradeAreaName,交易地区名称不能为空")
-    private Long tradeAreaName;
+    private String tradeAreaName;
 
     /**
      * 司机表ID
@@ -68,13 +68,13 @@ public class SucessDriverResultParam {
      * 司机名称
      */
     @NotNull(message = "driverId,司机名称不能为空")
-    private Long driverName;
+    private String driverName;
 
     /**
      * 司机电话
      */
     @NotNull(message = "driverId,司机电话不能为空")
-    private Long driverPhone;
+    private String driverPhone;
 
     /**
      * 车辆ID
@@ -86,13 +86,13 @@ public class SucessDriverResultParam {
      * 车辆名称
      */
     @NotNull(message = "vehicleName,司机名称不能为空")
-    private Long vehicleName;
+    private String vehicleName;
 
     /**
      * 车辆类型
      */
     @NotNull(message = "vehicleType,司机电话不能为空")
-    private Long vehicleType;
+    private String vehicleType;
 
 
 }