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

Merge branch 'master' of https://gitee.com/op-souls/ghy-all

This commit is contained in:
donqi 2022-06-15 16:47:19 +08:00
parent 9dd87f62d9 630a1b4dd4
commit 373606825e
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -195,6 +195,7 @@ public class OrderDetailController extends BaseController {
orderStandard.setStandardNum(orderGoods.getGoodsNum());
orderStandard.setServerNum(orderGoods.getServerGoodsNum());
orderStandard.setFinishTime(orderGoods.getFinishTime());
orderStandard.setWaitServerNum(orderGoods.getGoodsNum() - orderGoods.getServerGoodsNum());
standardList.add(orderStandard);
}

2
ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStandard.java
View File

@ -14,6 +14,8 @@ public class OrderStandard {
private Integer serverNum;
private Integer waitServerNum;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date finishTime;