clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

detail表更新接口修改

This commit is contained in:
donqi 2022-06-17 18:33:03 +08:00
parent 1970ec921d
commit 42f3840fac
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java
View File

@ -140,7 +140,6 @@ public class OrderDetailController extends BaseController {
orderListResponse.setWorkerPhone(worker.getPhone()); orderListResponse.setWorkerPhone(worker.getPhone());
orderListResponse.setCustomerName(customer.getName()); orderListResponse.setCustomerName(customer.getName());
orderListResponse.setCustomerPhone(customer.getPhone()); orderListResponse.setCustomerPhone(customer.getPhone());
orderListResponse.setServerTime(detail.getWorkBeginTime());
orderListResponse.setOrderStatus(detail.getOrderStatus()); orderListResponse.setOrderStatus(detail.getOrderStatus());
orderListResponse.setPayStatus(orderMaster.getPayStatus()); orderListResponse.setPayStatus(orderMaster.getPayStatus());
orderListResponse.setPayType(orderMaster.getPayType()); orderListResponse.setPayType(orderMaster.getPayType());
@ -148,6 +147,8 @@ public class OrderDetailController extends BaseController {
orderListResponse.setAddress(customerAddress.getAddress()); orderListResponse.setAddress(customerAddress.getAddress());
orderListResponse.setServerTime(detail.getRevTime()); orderListResponse.setServerTime(detail.getRevTime());
orderListResponse.setCreateTime(detail.getCreateTime()); orderListResponse.setCreateTime(detail.getCreateTime());
orderListResponse.setWorkBeginTime(detail.getWorkBeginTime());
orderListResponse.setWorkFinishTime(detail.getWorkFinishTime());
return AjaxResult.success(orderListResponse); return AjaxResult.success(orderListResponse);
}catch (Exception e){ }catch (Exception e){
@ -216,15 +217,15 @@ public class OrderDetailController extends BaseController {
orderListResponse.setWorkerPhone(worker.getPhone()); orderListResponse.setWorkerPhone(worker.getPhone());
orderListResponse.setCustomerName(customer.getName()); orderListResponse.setCustomerName(customer.getName());
orderListResponse.setCustomerPhone(customer.getPhone()); orderListResponse.setCustomerPhone(customer.getPhone());
orderListResponse.setServerTime(detail.getWorkBeginTime());
orderListResponse.setOrderStatus(detail.getOrderStatus()); orderListResponse.setOrderStatus(detail.getOrderStatus());
orderListResponse.setPayStatus(orderMaster.getPayStatus()); orderListResponse.setPayStatus(orderMaster.getPayStatus());
orderListResponse.setPayType(orderMaster.getPayType()); orderListResponse.setPayType(orderMaster.getPayType());
orderListResponse.setStandardList(standardList); orderListResponse.setStandardList(standardList);
orderListResponse.setAddress(customerAddress.getAddress()); orderListResponse.setAddress(customerAddress.getAddress());
orderListResponse.setServerTime(detail.getRevTime()); orderListResponse.setServerTime(detail.getRevTime());
orderListResponse.setWorkBeginTime(detail.getWorkBeginTime());
orderListResponse.setWorkFinishTime(detail.getWorkFinishTime());
orderListResponses.add(orderListResponse); orderListResponses.add(orderListResponse);
}); });
return voDataTable(orderListResponses, list); return voDataTable(orderListResponses, list);
} }

4
ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java
View File

@ -28,6 +28,10 @@ public class OrderListResponse {
private Date serverTime; private Date serverTime;
private Date workBeginTime;
private Date workFinishTime;
private String goodsName; private String goodsName;
private Integer orderStatus; private Integer orderStatus;