From 15c331e319fa2486534e786fe00c11ee3302b7c2 Mon Sep 17 00:00:00 2001
From: wang-hao-jie <1550036656@qq.com>
Date: 星期二, 09 十一月 2021 15:48:41 +0800
Subject: [PATCH] 订单
---
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/CustomerReceiveController.java | 11 +++++++++++
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/OrderTask.java | 3 +++
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/CustomerReceive.java | 3 +++
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTaskController.java | 10 +++++++++-
4 files changed, 26 insertions(+), 1 deletions(-)
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/CustomerReceiveController.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/CustomerReceiveController.java
index bed5276..5ae43c0 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/CustomerReceiveController.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/CustomerReceiveController.java
@@ -67,6 +67,17 @@
return new ResultUtil<CustomerReceive>().setErrorMsg("鎿嶄綔澶辫触");
}
+ @RequestMapping(value = "/update", method = RequestMethod.POST)
+ @ApiOperation(value = "淇敼澶村儚")
+ public Result<CustomerReceive> update(String id,String imgUrl) {
+ CustomerReceive customerReceive = iCustomerReceiveService.getById(id);
+ customerReceive.setImg(imgUrl);
+ if (iCustomerReceiveService.saveOrUpdate(customerReceive)) {
+ return new ResultUtil<CustomerReceive>().setData(customerReceive);
+ }
+ return new ResultUtil<CustomerReceive>().setErrorMsg("鎿嶄綔澶辫触");
+ }
+
@RequestMapping(value = "/delByIds", method = RequestMethod.POST)
@ApiOperation(value = "鎵归噺閫氳繃id鍒犻櫎")
public Result<Object> delAllByIds(@RequestParam String[] ids) {
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTaskController.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTaskController.java
index 11ed8e9..74d6508 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTaskController.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTaskController.java
@@ -216,10 +216,18 @@
@RequestMapping(value = "/signFor", method = RequestMethod.POST)
@ApiOperation(value = "绛炬敹")
- public Object signFor(String orderId,int status,String content) {
+ public Object signFor(String orderId,int status,String content,String customerReceiveId) {
+ if(status==1){
+ if(StrUtil.isEmpty(customerReceiveId)){
+ return ResultUtil.error("姝ｅ父绛炬敹锛屾帴璐т汉id蹇呭～");
+ }
+ }
OrderTask orderTask = iOrderTaskService.getById(orderId);
orderTask.setStatus(status);
orderTask.setUserId(securityUtil.getCurrUser().getId());
+ if(StrUtil.isNotEmpty(customerReceiveId)){
+ orderTask.setCustomerReceiveId(customerReceiveId);
+ }
if(!StrUtil.isEmpty(content)){
orderTask.setRemarks(content);
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/CustomerReceive.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/CustomerReceive.java
index dc100e5..219a2c5 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/CustomerReceive.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/CustomerReceive.java
@@ -49,4 +49,7 @@
@ApiModelProperty(value = "澶村儚")
private String img;
+ @ApiModelProperty(value = "鎸囩汗鐘舵�� 0锛氭湭褰曞叆 1锛氬凡褰曞叆")
+ private Integer fstatus=0;
+
}
\ No newline at end of file
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/OrderTask.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/OrderTask.java
index b0f6892..d9e5c1e 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/OrderTask.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/OrderTask.java
@@ -91,6 +91,9 @@
@ApiModelProperty(value = "绛炬敹璇勪环")
private String evaluate;
+ @ApiModelProperty(value = "鏀惰揣浜篿d")
+ private String customerReceiveId;
+
@Transient
@TableField(exist = false)
@ApiModelProperty(value = "鍟嗘埛鍚嶇О")
--
Gitblit v1.9.1