订单完成状态修改

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-two-server/src/main/java/com/pj/tb_orders/TbOrders.java

@@ -125,7 +125,7 @@ public class TbOrders extends Model<TbOrders> implements Serializable {
 	private String declarationNumber;
 
 	/**
-	 * 订单状态已完成 (0=禁用,1=启用)
+	 * 订单完成状态 (0=未完成,1=已完成)
 	 */
 	private Integer orderFinish;
 

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

@@ -70,7 +70,7 @@ public class TbOrdersApiController {
 
 
 
-	/** 改 - 订单状态已完成 (0=禁用,1=启用) */
+	/** 改 - 订单完成状态 (0=未完成,1=已完成) */
 	@RequestMapping("updateOrderFinish")
 //	@SaCheckPermission(TbOrders.PERMISSION_CODE_EDIT)
 	public AjaxJson updateOrderFinish(Long id, Integer value){

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

@@ -13,7 +13,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 
 /**
  * Controller: tb_orders -- 订单表
- * @author qzy 
+ * @author qzy
  */
 @RestController
 @RequestMapping("/TbOrders/")
@@ -23,7 +23,7 @@ public class TbOrdersController {
 	@Autowired
 	TbOrdersService tbOrdersService;
 
-	/** 增 */  
+	/** 增 */
 	@RequestMapping("add")
 //	@SaCheckPermission(TbOrders.PERMISSION_CODE_ADD)
 	public AjaxJson add(TbOrders t){
@@ -32,24 +32,24 @@ public class TbOrdersController {
 		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){
@@ -57,7 +57,7 @@ public class TbOrdersController {
 		return AjaxJson.getSuccess();
 	}
 
-	/** 查 - 根据id */  
+	/** 查 - 根据id */
 	@RequestMapping("getById")
 //		@SaCheckPermission(TbOrders.PERMISSION_CODE)
 	public AjaxJson getById(Long id){
@@ -65,7 +65,7 @@ public class TbOrdersController {
 		return AjaxJson.getSuccessData(t);
 	}
 
-	/** 查集合 - 根据条件（参数为空时代表忽略指定条件） */  
+	/** 查集合 - 根据条件（参数为空时代表忽略指定条件） */
 	@RequestMapping("getList")
 //		@SaCheckPermission(TbOrders.PERMISSION_CODE)
 	public AjaxJson getList(@RequestParam(value = "ordersStatus",required = false)Integer ordersStatus) {
@@ -73,17 +73,17 @@ public class TbOrdersController {
 		List<TbOrders> list = tbOrdersService.getPCList(so.startPage(),ordersStatus);
 		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);
 	}
-	
+
 
 
 

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

@@ -100,7 +100,7 @@ public class TbOrdersDto {
 	private String declarationNumber;
 
 	/**
-	 * 订单状态已完成 (0=禁用,1=启用)
+	 * 订单完成状态 (0=未完成,1=已完成)
 	 */
 	private Integer orderFinish;
 

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

@@ -105,8 +105,8 @@ public class TbOrdersService extends ServiceImpl<TbOrdersMapper, TbOrders> imple
 		BeanUtils.copyProperties(ordersDto, orders);
 		//订单编号:EJSCDD=二级市场订单
 		orders.setOrderNo(SystemObject.getREFcode("EJSCDD", new Date()));
-		//订单状态已完成 (0=禁用,1=启用)
-		orders.setOrderFinish(OrderStatus.Order_STATUS_ON.getCode());
+		//订单完成状态 (0=未完成,1=已完成)
+		orders.setOrderFinish(OrderStatus.ORDER_STATUS_ZERO.getCode());
 		//删除状态(0=禁用,1=启用)
 		orders.setDeleteStatus(DeleteStatus.DELETE_STATUS_ON.getCode());
 		//创建人

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

@@ -96,8 +96,8 @@ public class TbLogisticsService extends ServiceImpl<TbLogisticsMapper, TbLogisti
 		logistics.setMakeCargo(0);
 		//收购商确认(0=禁用,1=启用)
 		logistics.setConfirmReceipt(0);
-		//订单状态已完成(0=禁用,1=启用)
-		logistics.setOrderFinish(OrderStatus.Order_STATUS_ON.getCode());
+		//订单完成状态 (0=未完成,1=已完成)
+		logistics.setOrderFinish(OrderStatus.ORDER_STATUS_ONE.getCode());
 		//创建时间
 		logistics.setCreateTime(new Date());
 		//创建人编号

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

@@ -136,7 +136,7 @@ public class TbOrders extends Model<TbOrders> implements Serializable {
 	private String declarationNumber;
 
 	/**
-	 * 订单状态已完成 (0=禁用,1=启用)
+	 * 订单完成状态 (0=未完成,1=已完成)
 	 */
 	private Integer orderFinish;
 

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

@@ -13,7 +13,7 @@ import java.util.List;
 
 /**
  * Controller: tb_orders -- 物流订单表
- * @author loovi 
+ * @author loovi
  */
 @RestController
 @RequestMapping("/TbOrders/")
@@ -23,7 +23,7 @@ public class TbOrdersController {
 	@Autowired
 	TbOrdersService tbOrdersService;
 
-	/** 增 */  
+	/** 增 */
 	@RequestMapping("add")
 	@SaCheckPermission(TbOrders.PERMISSION_CODE_ADD)
 	public AjaxJson add(TbOrders t){
@@ -32,24 +32,24 @@ public class TbOrdersController {
 		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){
@@ -57,7 +57,7 @@ public class TbOrdersController {
 		return AjaxJson.getSuccess();
 	}
 
-	/** 查 - 根据id */  
+	/** 查 - 根据id */
 	@RequestMapping("getById")
 		@SaCheckPermission(TbOrders.PERMISSION_CODE)
 	public AjaxJson getById(Long id){
@@ -65,37 +65,37 @@ public class TbOrdersController {
 		return AjaxJson.getSuccessData(t);
 	}
 
-	/** 查集合 - 根据条件（参数为空时代表忽略指定条件） */  
+	/** 查集合 - 根据条件（参数为空时代表忽略指定条件） */
 	@RequestMapping("getList")
 		@SaCheckPermission(TbOrders.PERMISSION_CODE)
-	public AjaxJson getList() { 
+	public AjaxJson getList() {
 		SoMap so = SoMap.getRequestSoMap();
 		List<TbOrders> list = tbOrdersService.getList(so.startPage());
 		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);
 	}
-	
-	
 
-	
-	
-	
+
+
+
+
+
 
 }