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-13 17:40:11 +08:00
parent 02a08e9114
commit 106f174e13
2 changed files with 6 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/OrderController.java
View File

@ -29,6 +29,7 @@ import com.ghy.payment.service.FinancialDetailService;
import com.ghy.payment.service.FinancialMasterService; import com.ghy.payment.service.FinancialMasterService;
import com.ghy.worker.domain.Worker; import com.ghy.worker.domain.Worker;
import com.ghy.worker.service.WorkerService; import com.ghy.worker.service.WorkerService;
import org.apache.commons.lang3.time.DateUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.transaction.annotation.Transactional; 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 org.springframework.web.bind.annotation.ResponseBody;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.text.ParseException;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -135,7 +137,7 @@ public class OrderController extends BaseController {
od.setOrderMasterCode(om.getCode()); od.setOrderMasterCode(om.getCode());
od.setCustomerId(om.getCustomerId()); od.setCustomerId(om.getCustomerId());
od.setOrderType(om.getOrderType()); od.setOrderType(om.getOrderType());
od.setOrderStatus(OrderStatus.PLAIN.code()); od.setOrderStatus(OrderStatus.GOING.code());
od.setWorkerId(request.getWorkerId()); od.setWorkerId(request.getWorkerId());
od.setRevTime(new Date()); od.setRevTime(new Date());
orderDetailService.insertOrderDetail(od); orderDetailService.insertOrderDetail(od);
@ -197,7 +199,7 @@ public class OrderController extends BaseController {
@PostMapping("/server/app") @PostMapping("/server/app")
@ResponseBody @ResponseBody
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public AjaxResult appOrder(@RequestBody AppOrderRequest appOrderRequest) { public AjaxResult appOrder(@RequestBody AppOrderRequest appOrderRequest) throws ParseException {
// 校验用户信息 // 校验用户信息
Customer customer = customerService.selectByCustomerId(appOrderRequest.getCustomerId()); Customer customer = customerService.selectByCustomerId(appOrderRequest.getCustomerId());
if (StringUtils.isNull(customer)) { if (StringUtils.isNull(customer)) {
@ -232,6 +234,7 @@ public class OrderController extends BaseController {
orderMaster.setPayStatus(PayStatus.WAIT_PAY.getCode()); orderMaster.setPayStatus(PayStatus.WAIT_PAY.getCode());
orderMaster.setCreateTime(new Date()); orderMaster.setCreateTime(new Date());
orderMaster.setWorkerId(goods.getWorkerId()); orderMaster.setWorkerId(goods.getWorkerId());
orderMaster.setRevTime(DateUtils.parseDate(appOrderRequest.getServerTime(), com.ghy.common.utils.DateUtils.YYYY_MM_DD_HH_MM_SS));
orderMasterService.insertOrderMaster(orderMaster); orderMasterService.insertOrderMaster(orderMaster);
Assert.notNull(orderMaster.getId(), "OrderMaster.id is null!"); Assert.notNull(orderMaster.getId(), "OrderMaster.id is null!");

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

@ -75,7 +75,7 @@ public class OrderDetailController extends BaseController {
return prefix; return prefix;
} }
@RequiresPermissions("order:detail:list") // @RequiresPermissions("order:detail:list")
@PostMapping("/list") @PostMapping("/list")
@ResponseBody @ResponseBody
public TableDataInfo list(OrderDetail orderDetail) { public TableDataInfo list(OrderDetail orderDetail) {