app二级市场新增订单-转售功能

sp-core/sp-api/pom.xml

@@ -12,10 +12,10 @@
 
     <artifactId>sp-api</artifactId>
     <packaging>jar</packaging>
-    
-    
+
+
     <dependencies>
-    
+
 	    <!-- Sa-Token 权限认证（core核心包）, 在线文档：http://sa-token.dev33.cn/ -->
 		<dependency>
 		    <groupId>cn.dev33</groupId>
@@ -23,16 +23,20 @@
 		    <version>1.27.0</version>
 		    <optional>true</optional>
 		</dependency>
-    
+
 		<!-- feign依赖 -->
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-feign</artifactId>
             <version>1.4.0.RELEASE</version>
         </dependency>
-
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <version>2.11.2</version>
+        </dependency>
 
 
     </dependencies>
 
-</project>
+</project>

sp-core/sp-api/src/main/java/com/pj/api/dto/TbLogisticsDto.java

@@ -501,7 +501,7 @@ public class TbLogisticsDto{
 	private Date confirmReceiptTime;
 
 	/**
-	 * 订单状态已完成(0=进行中,1=已完成)
+	 * 订单状态已完成 (0=禁用,1=启用)
 	 */
 	private Integer orderFinish;
 

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

@@ -276,7 +276,7 @@ public class TbOrder extends Model<TbOrder> implements Serializable {
 	/**
 	 * 创建人编号
 	 */
-	private String createBy;
+	private Long createBy;
 
 	/**
 	 * 创建人名称
@@ -292,7 +292,7 @@ public class TbOrder extends Model<TbOrder> implements Serializable {
 	/**
 	 * 更新人编号
 	 */
-	private String updateBy;
+	private Long updateBy;
 
 	/**
 	 * 更新人名称

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

@@ -14,7 +14,7 @@ import lombok.experimental.Accessors;
 
 /**
  * Model: tb_orders -- 订单表
- * @author qzy 
+ * @author qzy
  */
 @Data
 @Accessors(chain = true)
@@ -24,15 +24,15 @@ public class TbOrders extends Model<TbOrders> implements Serializable {
 
 	// ---------- 模块常量 ----------
 	/**
-	 * 序列化版本id 
+	 * 序列化版本id
 	 */
-	private static final long serialVersionUID = 1L;	
+	private static final long serialVersionUID = 1L;
 	/**
-	 * 此模块对应的表名 
+	 * 此模块对应的表名
 	 */
-	public static final String TABLE_NAME = "tb_orders";	
+	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";
@@ -44,158 +44,158 @@ public class TbOrders extends Model<TbOrders> implements Serializable {
 
 	// ---------- 表中字段 ----------
 	/**
-	 * 货运订单管理表主键 
+	 * 货运订单管理表主键
 	 */
 	@TableId(type = IdType.AUTO)
-	private Long id;	
+	private Long id;
 
 	/**
-	 * 一级市场订单ID 
+	 * 一级市场订单ID
 	 */
-	private Long levelOneOrderId;	
+	private Long levelOneOrderId;
 
 	/**
-	 * 订单编号 
+	 * 订单编号
 	 */
-	private String orderNo;	
+	private String orderNo;
 
 	/**
-	 * 商品id 
+	 * 商品id
 	 */
-	private Long goodsId;	
+	private Long goodsId;
 
 	/**
-	 * 商品名称 
+	 * 商品名称
 	 */
-	private String goodsName;	
+	private String goodsName;
 
 	/**
-	 * 商品来源(国家) 
+	 * 商品来源(国家)
 	 */
-	private String goodsFrom;	
+	private String goodsFrom;
 
 	/**
-	 * 发货商电话 
+	 * 发货商电话
 	 */
-	private String shipperPhone;	
+	private String shipperPhone;
 
 	/**
-	 * 发货商名称 
+	 * 发货商名称
 	 */
-	private String shipperName;	
+	private String shipperName;
 
 	/**
-	 * 司机ID 
+	 * 司机ID
 	 */
-	private Long driverId;	
+	private Long driverId;
 
 	/**
-	 * 司机名称 
+	 * 司机名称
 	 */
-	private String driverName;	
+	private String driverName;
 
 	/**
-	 * 司机电话 
+	 * 司机电话
 	 */
-	private String driverPhone;	
+	private String driverPhone;
 
 	/**
-	 * 车型ID 
+	 * 车型ID
 	 */
-	private Long carId;	
+	private Long carId;
 
 	/**
-	 * 车型名称 
+	 * 车型名称
 	 */
-	private String carType;	
+	private String carType;
 
 	/**
-	 * 收货人名称 
+	 * 收货人名称
 	 */
-	private String consigneeName;	
+	private String consigneeName;
 
 	/**
-	 * 收货人电话号码 
+	 * 收货人电话号码
 	 */
-	private String consigneePhone;	
+	private String consigneePhone;
 
 	/**
-	 * (预留字段) 申报订单号 
+	 * (预留字段) 申报订单号
 	 */
-	private String declarationNumber;	
+	private String declarationNumber;
 
 	/**
-	 * 订单状态已完成 (0=禁用,1=启用) 
+	 * 订单状态已完成 (0=禁用,1=启用)
 	 */
-	private Integer orderFinish;	
+	private Integer orderFinish;
 
 	/**
-	 * 装货地址 
+	 * 装货地址
 	 */
-	private String loadingAddress;	
+	private String loadingAddress;
 
 	/**
-	 * 卸货地址 
+	 * 卸货地址
 	 */
-	private String unloadingAddress;	
+	private String unloadingAddress;
 
 	/**
-	 * 备注 
+	 * 备注
 	 */
-	private String comment;	
+	private String comment;
 
 	/**
-	 * 更新时间 
+	 * 更新时间
 	 */
 	@JsonFormat(pattern = "yyyy-MM-dd")
 	private Date updateTime;
 
 	/**
-	 * 创建时间 
+	 * 创建时间
 	 */
 	@JsonFormat(pattern = "yyyy-MM-dd")
 	private Date createTime;
 
 	/**
-	 * 更新人名称 
+	 * 更新人名称
 	 */
-	private String updateName;	
+	private String updateName;
 
 	/**
-	 * 删除状态(0=禁用,1=启用) 
+	 * 删除状态(0=禁用,1=启用)
 	 */
-	private Integer deleteStatus;	
+	private Integer deleteStatus;
 
 	/**
-	 * 更新人编号 
+	 * 更新人编号
 	 */
 	private Long updateBy;
 
 	/**
-	 * 创建人编号 
+	 * 创建人编号
 	 */
-	private String createBy;	
+	private Long createBy;
 
 	/**
-	 * 创建人名称 
+	 * 创建人名称
 	 */
-	private String createName;	
+	private String createName;
 
 	/**
-	 * 贸易区域id 
+	 * 贸易区域id
 	 */
-	private Long tradeAreaId;	
+	private Long tradeAreaId;
 
 	/**
-	 * 贸易区域名称 
+	 * 贸易区域名称
 	 */
-	private String tradeAreaName;	
+	private String tradeAreaName;
+
 
 
 
 
 
-	
 
 
 }

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

@@ -14,7 +14,7 @@ import java.util.List;
 
 /**
  * Controller: tb_orders -- 订单表
- * @author qzy 
+ * @author qzy
  */
 @RestController
 @RequestMapping("/app/TbOrders/")
@@ -24,7 +24,7 @@ public class TbOrdersApiController {
 	@Autowired
 	TbOrdersService tbOrdersService;
 
-	/** 增 */  
+	/** 增 */
 	@RequestMapping("add")
 //	@SaCheckPermission(TbOrders.PERMISSION_CODE_ADD)
 	public AjaxJson add(TbOrders t){
@@ -33,24 +33,24 @@ public class TbOrdersApiController {
 		return AjaxJson.getSuccessData(t);
 	}
 
-	/** 删 */  
+	/** 删 */
 	@RequestMapping("delete")
 //	@SaCheckPermission(TbOrders.PERMISSION_CODE_DEL)
 	public AjaxJson delete(Long id){
 		 tbOrdersService.delete(id);
 		return AjaxJson.getSuccess();
 	}
-	
-	/** 删 - 根据id列表 */  
+
+	/** 删 - 根据id列表 */
 	@RequestMapping("deleteByIds")
 //	@SaCheckPermission(TbOrders.PERMISSION_CODE_DEL)
 	public AjaxJson deleteByIds(){
-		List<Long> ids = SoMap.getRequestSoMap().getListByComma("ids", long.class); 
+		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){
@@ -59,7 +59,7 @@ public class TbOrdersApiController {
 	}
 
 
-	/** 查集合 - 根据条件（参数为空时代表忽略指定条件） */  
+	/** 查集合 - 根据条件（参数为空时代表忽略指定条件） */
 	@RequestMapping("getList")
 //		@SaCheckPermission(TbOrders.PERMISSION_CODE)
 	public AjaxJson getList(@RequestParam(value = "keyword",required = false)String keyword) {
@@ -67,29 +67,35 @@ public class TbOrdersApiController {
 		List<TbOrders> list = tbOrdersService.getList(so.startPage(),keyword);
 		return AjaxJson.getPageData(so.getDataCount(), list);
 	}
-	
-	
-	
-	/** 改 - 订单状态已完成 (0=禁用,1=启用) */  
+
+
+
+	/** 改 - 订单状态已完成 (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=启用) */  
+
+	/** 改 - 删除状态(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);
 	}
-	
-	
 
-	
-	
-	
+
+	/** 增 一级市场已完成订单进行转售时，新增二级市场订单 */
+	@RequestMapping("addOrderByResale")
+	public AjaxJson  addOrderByResale(TbOrdersDto ordersDto) {
+		tbOrdersService.addOrderByResale(ordersDto);
+		TbOrders orders = tbOrdersService.getById(SP.publicMapper.getPrimarykey());
+		return AjaxJson.getSuccessData(orders);
+	}
+
+
+
 
 }

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

@@ -0,0 +1,400 @@
+package com.pj.tb_orders;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * Model: tb_orders -- 订单表
+ * @author lbl
+ */
+public class TbOrdersDto {
+
+	// ---------- 表中字段 ----------
+	/**
+	 * 货运订单管理表主键
+	 */
+	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 Long createBy;
+
+	/**
+	 * 创建人名称
+	 */
+	private String createName;
+
+	/**
+	 * 贸易区域id
+	 */
+	private Long tradeAreaId;
+
+	/**
+	 * 贸易区域名称
+	 */
+	private String tradeAreaName;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public Long getLevelOneOrderId() {
+		return levelOneOrderId;
+	}
+
+	public void setLevelOneOrderId(Long levelOneOrderId) {
+		this.levelOneOrderId = levelOneOrderId;
+	}
+
+	public String getOrderNo() {
+		return orderNo;
+	}
+
+	public void setOrderNo(String orderNo) {
+		this.orderNo = orderNo;
+	}
+
+	public Long getGoodsId() {
+		return goodsId;
+	}
+
+	public void setGoodsId(Long goodsId) {
+		this.goodsId = goodsId;
+	}
+
+	public String getGoodsName() {
+		return goodsName;
+	}
+
+	public void setGoodsName(String goodsName) {
+		this.goodsName = goodsName;
+	}
+
+	public String getGoodsFrom() {
+		return goodsFrom;
+	}
+
+	public void setGoodsFrom(String goodsFrom) {
+		this.goodsFrom = goodsFrom;
+	}
+
+	public String getShipperPhone() {
+		return shipperPhone;
+	}
+
+	public void setShipperPhone(String shipperPhone) {
+		this.shipperPhone = shipperPhone;
+	}
+
+	public String getShipperName() {
+		return shipperName;
+	}
+
+	public void setShipperName(String shipperName) {
+		this.shipperName = shipperName;
+	}
+
+	public Long getDriverId() {
+		return driverId;
+	}
+
+	public void setDriverId(Long driverId) {
+		this.driverId = driverId;
+	}
+
+	public String getDriverName() {
+		return driverName;
+	}
+
+	public void setDriverName(String driverName) {
+		this.driverName = driverName;
+	}
+
+	public String getDriverPhone() {
+		return driverPhone;
+	}
+
+	public void setDriverPhone(String driverPhone) {
+		this.driverPhone = driverPhone;
+	}
+
+	public Long getCarId() {
+		return carId;
+	}
+
+	public void setCarId(Long carId) {
+		this.carId = carId;
+	}
+
+	public String getCarType() {
+		return carType;
+	}
+
+	public void setCarType(String carType) {
+		this.carType = carType;
+	}
+
+	public String getConsigneeName() {
+		return consigneeName;
+	}
+
+	public void setConsigneeName(String consigneeName) {
+		this.consigneeName = consigneeName;
+	}
+
+	public String getConsigneePhone() {
+		return consigneePhone;
+	}
+
+	public void setConsigneePhone(String consigneePhone) {
+		this.consigneePhone = consigneePhone;
+	}
+
+	public String getDeclarationNumber() {
+		return declarationNumber;
+	}
+
+	public void setDeclarationNumber(String declarationNumber) {
+		this.declarationNumber = declarationNumber;
+	}
+
+	public Integer getOrderFinish() {
+		return orderFinish;
+	}
+
+	public void setOrderFinish(Integer orderFinish) {
+		this.orderFinish = orderFinish;
+	}
+
+	public String getLoadingAddress() {
+		return loadingAddress;
+	}
+
+	public void setLoadingAddress(String loadingAddress) {
+		this.loadingAddress = loadingAddress;
+	}
+
+	public String getUnloadingAddress() {
+		return unloadingAddress;
+	}
+
+	public void setUnloadingAddress(String unloadingAddress) {
+		this.unloadingAddress = unloadingAddress;
+	}
+
+	public String getComment() {
+		return comment;
+	}
+
+	public void setComment(String comment) {
+		this.comment = comment;
+	}
+
+	public Date getUpdateTime() {
+		return updateTime;
+	}
+
+	public void setUpdateTime(Date updateTime) {
+		this.updateTime = updateTime;
+	}
+
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+
+	public String getUpdateName() {
+		return updateName;
+	}
+
+	public void setUpdateName(String updateName) {
+		this.updateName = updateName;
+	}
+
+	public Integer getDeleteStatus() {
+		return deleteStatus;
+	}
+
+	public void setDeleteStatus(Integer deleteStatus) {
+		this.deleteStatus = deleteStatus;
+	}
+
+	public Long getUpdateBy() {
+		return updateBy;
+	}
+
+	public void setUpdateBy(Long updateBy) {
+		this.updateBy = updateBy;
+	}
+
+	public Long getCreateBy() {
+		return createBy;
+	}
+
+	public void setCreateBy(Long createBy) {
+		this.createBy = createBy;
+	}
+
+	public String getCreateName() {
+		return createName;
+	}
+
+	public void setCreateName(String createName) {
+		this.createName = createName;
+	}
+
+	public Long getTradeAreaId() {
+		return tradeAreaId;
+	}
+
+	public void setTradeAreaId(Long tradeAreaId) {
+		this.tradeAreaId = tradeAreaId;
+	}
+
+	public String getTradeAreaName() {
+		return tradeAreaName;
+	}
+
+	public void setTradeAreaName(String tradeAreaName) {
+		this.tradeAreaName = tradeAreaName;
+	}
+}

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

@@ -1,14 +1,19 @@
 package com.pj.tb_orders;
 
+import java.util.Date;
 import java.util.List;
 
 import cn.dev33.satoken.stp.StpUtil;
 import com.pj.common.core.exception.ServiceException;
+import com.pj.current.config.SystemObject;
 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.tb_purchaser.TbPurchaser;
 import com.pj.tb_purchaser.TbPurchaserMapper;
 import com.pj.utils.so.SoMap;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -17,7 +22,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 /**
  * Service: tb_orders -- 订单表
- * @author qzy 
+ * @author qzy
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
@@ -76,7 +81,7 @@ public class TbOrdersService extends ServiceImpl<TbOrdersMapper, TbOrders> imple
 		so.set("sortType",22);
 		//todo: 管理二级市场收购商的订单
 
-		return tbOrdersMapper.getList(so);	
+		return tbOrdersMapper.getList(so);
 	}
 
 	/**
@@ -88,4 +93,27 @@ public class TbOrdersService extends ServiceImpl<TbOrdersMapper, TbOrders> imple
 		//todo: 管理二级市场的开票申请信息、并审核
 	}
 
+	/** 增 一级市场已完成订单进行转售时，新增二级市场订单 */
+	void addOrderByResale(TbOrdersDto ordersDto) {
+		//获取app登录用户
+		APPLoginUserInfo appLoginInfo = StpAPPUserUtil.getAPPLoginInfo();
+		if(appLoginInfo == null)throw new RuntimeException("当前登陆用户信息已失效!");
+
+		if(null == ordersDto.getLevelOneOrderId()) throw new RuntimeException("当前一级市场订单号为空，请联系管理员！");
+
+		TbOrders orders = new TbOrders();
+		BeanUtils.copyProperties(ordersDto, orders);
+		//订单编号:EJSCDD=二级市场订单
+		orders.setOrderNo(SystemObject.getREFcode("EJSCDD", new Date()));
+		//订单状态已完成 (0=禁用,1=启用)
+		orders.setOrderFinish(OrderStatus.Order_STATUS_ON.getCode());
+		//删除状态(0=禁用,1=启用)
+		orders.setDeleteStatus(DeleteStatus.DELETE_STATUS_ON.getCode());
+		//创建人
+		orders.setCreateBy(appLoginInfo.getLoginId());
+		orders.setCreateName(appLoginInfo.getLoginName());
+		orders.setCreateTime(new Date());
+
+		this.add(orders);
+	}
 }

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

@@ -188,7 +188,7 @@ public class TbLogistics extends Model<TbLogistics> implements Serializable {
 	private Date confirmReceiptTime;
 
 	/**
-	 * 订单状态已完成(0=进行中,1=已完成)
+	 * 订单状态已完成 (0=禁用,1=启用)
 	 */
 	private Integer orderFinish;
 

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

@@ -126,7 +126,7 @@ public class TbLogisticsController {
 		return AjaxJson.getByLine(line);
 	}
 
-	/** 改 - 订单状态已完成(0=进行中,1=已完成) */
+	/** 改 - 订单状态已完成(0=禁用,1=启用) */
 	@RequestMapping("updateOrderFinish")
 	@SaCheckPermission(TbLogistics.PERMISSION_CODE_EDIT)
 	public AjaxJson updateOrderFinish(Long id, Integer value){

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

@@ -12,6 +12,7 @@ import com.pj.current.config.SystemObject;
 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;
@@ -95,8 +96,8 @@ public class TbLogisticsService extends ServiceImpl<TbLogisticsMapper, TbLogisti
 		logistics.setMakeCargo(0);
 		//收购商确认(0=禁用,1=启用)
 		logistics.setConfirmReceipt(0);
-		//订单状态已完成(0=进行中,1=已完成)
-		logistics.setOrderFinish(0);
+		//订单状态已完成(0=禁用,1=启用)
+		logistics.setOrderFinish(OrderStatus.Order_STATUS_ON.getCode());
 		//创建时间
 		logistics.setCreateTime(new Date());
 		//创建人编号
@@ -104,7 +105,7 @@ public class TbLogisticsService extends ServiceImpl<TbLogisticsMapper, TbLogisti
 		//创建人名称
 		logistics.setCreateName(appLoginInfo.getLoginName());
 		//删除状态
-		logistics.setDeleteStatus(1);
+		logistics.setDeleteStatus(DeleteStatus.DELETE_STATUS_ON.getCode());
 
 		return this.save(logistics);
 	}