From 106f174e13488e5261987385f213600a3ee567d6 Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Mon, 13 Jun 2022 17:40:11 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E4=B8=8B=E5=8D=95=E7=9A=84?=
 =?UTF-8?q?=E4=B8=8A=E9=97=A8=E6=97=B6=E9=97=B4=E5=92=8C=E6=B4=BE=E5=8D=95?=
 =?UTF-8?q?detail=E8=A1=A8=E6=8F=92=E5=85=A5=E6=97=B6=E7=9A=84=E4=B8=8A?=
 =?UTF-8?q?=E9=97=A8=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ghy/web/controller/order/OrderController.java | 7 +++++--
 .../ghy/web/controller/order/OrderDetailController.java    | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
index 9d66a144..fa0a41c4 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
@@ -29,6 +29,7 @@ import com.ghy.payment.service.FinancialDetailService;
 import com.ghy.payment.service.FinancialMasterService;
 import com.ghy.worker.domain.Worker;
 import com.ghy.worker.service.WorkerService;
+import org.apache.commons.lang3.time.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;
@@ -39,6 +40,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.math.BigDecimal;
+import java.text.ParseException;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -135,7 +137,7 @@ public class OrderController extends BaseController {
         od.setOrderMasterCode(om.getCode());
         od.setCustomerId(om.getCustomerId());
         od.setOrderType(om.getOrderType());
-        od.setOrderStatus(OrderStatus.PLAIN.code());
+        od.setOrderStatus(OrderStatus.GOING.code());
         od.setWorkerId(request.getWorkerId());
         od.setRevTime(new Date());
         orderDetailService.insertOrderDetail(od);
@@ -197,7 +199,7 @@ public class OrderController extends BaseController {
     @PostMapping("/server/app")
     @ResponseBody
     @Transactional(rollbackFor = Exception.class)
-    public AjaxResult appOrder(@RequestBody AppOrderRequest appOrderRequest) {
+    public AjaxResult appOrder(@RequestBody AppOrderRequest appOrderRequest) throws ParseException {
         // 校验用户信息
         Customer customer = customerService.selectByCustomerId(appOrderRequest.getCustomerId());
         if (StringUtils.isNull(customer)) {
@@ -232,6 +234,7 @@ public class OrderController extends BaseController {
         orderMaster.setPayStatus(PayStatus.WAIT_PAY.getCode());
         orderMaster.setCreateTime(new Date());
         orderMaster.setWorkerId(goods.getWorkerId());
+        orderMaster.setRevTime(DateUtils.parseDate(appOrderRequest.getServerTime(), com.ghy.common.utils.DateUtils.YYYY_MM_DD_HH_MM_SS));
         orderMasterService.insertOrderMaster(orderMaster);
         Assert.notNull(orderMaster.getId(), "OrderMaster.id is null!");
 
diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java
index c037d996..3757e679 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java
@@ -75,7 +75,7 @@ public class OrderDetailController extends BaseController {
         return prefix;
     }
 
-    @RequiresPermissions("order:detail:list")
+//    @RequiresPermissions("order:detail:list")
     @PostMapping("/list")
     @ResponseBody
     public TableDataInfo list(OrderDetail orderDetail) {