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

订单部分问题修改

This commit is contained in:
donqi 2022-09-20 23:45:22 +08:00
parent 4ee556fbd2
commit 1f423bcdf6
4 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
View File

@ -533,7 +533,7 @@ public class OrderController extends BaseController {
Worker worker = master.getWorkerId() != null ? workerService.selectById(master.getWorkerId()) : null; Worker worker = master.getWorkerId() != null ? workerService.selectById(master.getWorkerId()) : null;
// 消费者信息 // 消费者信息
Customer customer = customerService.selectByCustomerId(master.getCustomerId()); // Customer customer = customerService.selectByCustomerId(master.getCustomerId());
// 商品规格及信息 // 商品规格及信息
List<OrderGoods> orderStandardList = orderGoodsService.selectByOrderMasterId(master.getId()); List<OrderGoods> orderStandardList = orderGoodsService.selectByOrderMasterId(master.getId());
@ -578,8 +578,8 @@ public class OrderController extends BaseController {
orderListResponse.setPayMoney(financialMaster.getPayMoney()); orderListResponse.setPayMoney(financialMaster.getPayMoney());
orderListResponse.setWorkerName(worker == null ? "" : worker.getName()); orderListResponse.setWorkerName(worker == null ? "" : worker.getName());
orderListResponse.setWorkerPhone(worker == null ? "" : worker.getPhone()); orderListResponse.setWorkerPhone(worker == null ? "" : worker.getPhone());
orderListResponse.setCustomerName(customer.getName()); orderListResponse.setCustomerName(customerAddress.getName());
orderListResponse.setCustomerPhone(customer.getPhone()); orderListResponse.setCustomerPhone(customerAddress.getPhone());
orderListResponse.setServerTime(master.getRevTime()); orderListResponse.setServerTime(master.getRevTime());
orderListResponse.setExpectTimeStart(master.getExpectTimeStart()); orderListResponse.setExpectTimeStart(master.getExpectTimeStart());
orderListResponse.setExpectTimeEnd(master.getExpectTimeEnd()); orderListResponse.setExpectTimeEnd(master.getExpectTimeEnd());
@ -611,7 +611,7 @@ public class OrderController extends BaseController {
Worker worker = workerService.selectById(detail.getWorkerId()); Worker worker = workerService.selectById(detail.getWorkerId());
// 消费者信息 // 消费者信息
Customer customer = customerService.selectByCustomerId(detail.getCustomerId()); // Customer customer = customerService.selectByCustomerId(detail.getCustomerId());
// 商品规格及信息 // 商品规格及信息
List<OrderGoods> orderStandardList = orderGoodsService.selectByOrderDetailId(detail.getId()); List<OrderGoods> orderStandardList = orderGoodsService.selectByOrderDetailId(detail.getId());
@ -656,8 +656,8 @@ public class OrderController extends BaseController {
orderListResponse.setPayMoney(financialDetail.getPayMoney()); orderListResponse.setPayMoney(financialDetail.getPayMoney());
orderListResponse.setWorkerName(worker.getName()); orderListResponse.setWorkerName(worker.getName());
orderListResponse.setWorkerPhone(worker.getPhone()); orderListResponse.setWorkerPhone(worker.getPhone());
orderListResponse.setCustomerName(customer.getName()); orderListResponse.setCustomerName(customerAddress.getName());
orderListResponse.setCustomerPhone(customer.getPhone()); orderListResponse.setCustomerPhone(customerAddress.getPhone());
orderListResponse.setOrderStatus(detail.getOrderStatus()); orderListResponse.setOrderStatus(detail.getOrderStatus());
orderListResponse.setPayStatus(orderMaster.getPayStatus()); orderListResponse.setPayStatus(orderMaster.getPayStatus());
orderListResponse.setPayType(orderMaster.getPayType()); orderListResponse.setPayType(orderMaster.getPayType());

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

@ -123,7 +123,7 @@ public class OrderDetailController extends BaseController {
Worker worker = workerService.selectById(detail.getWorkerId()); Worker worker = workerService.selectById(detail.getWorkerId());
// 消费者信息 // 消费者信息
Customer customer = customerService.selectByCustomerId(detail.getCustomerId()); // Customer customer = customerService.selectByCustomerId(detail.getCustomerId());
// 商品规格及信息 // 商品规格及信息
List<OrderGoods> orderStandardList = orderGoodsService.selectByOrderDetailId(detail.getId()); List<OrderGoods> orderStandardList = orderGoodsService.selectByOrderDetailId(detail.getId());
@ -173,8 +173,8 @@ public class OrderDetailController extends BaseController {
orderListResponse.setPayMoney(financialDetail.getPayMoney()); orderListResponse.setPayMoney(financialDetail.getPayMoney());
orderListResponse.setWorkerName(worker.getName()); orderListResponse.setWorkerName(worker.getName());
orderListResponse.setWorkerPhone(worker.getPhone()); orderListResponse.setWorkerPhone(worker.getPhone());
orderListResponse.setCustomerName(customer.getName()); orderListResponse.setCustomerName(customerAddress.getName());
orderListResponse.setCustomerPhone(customer.getPhone()); orderListResponse.setCustomerPhone(customerAddress.getPhone());
orderListResponse.setOrderStatus(detail.getOrderStatus()); orderListResponse.setOrderStatus(detail.getOrderStatus());
orderListResponse.setPayStatus(orderMaster.getPayStatus()); orderListResponse.setPayStatus(orderMaster.getPayStatus());
orderListResponse.setPayType(orderMaster.getPayType()); orderListResponse.setPayType(orderMaster.getPayType());
@ -218,7 +218,7 @@ public class OrderDetailController extends BaseController {
Worker worker = workerService.selectById(detail.getWorkerId()); Worker worker = workerService.selectById(detail.getWorkerId());
// 消费者信息 // 消费者信息
Customer customer = customerService.selectByCustomerId(detail.getCustomerId()); // Customer customer = customerService.selectByCustomerId(detail.getCustomerId());
// 商品规格及信息 // 商品规格及信息
List<OrderGoods> orderStandardList = orderGoodsService.selectByOrderDetailId(detail.getId()); List<OrderGoods> orderStandardList = orderGoodsService.selectByOrderDetailId(detail.getId());
@ -262,8 +262,8 @@ public class OrderDetailController extends BaseController {
orderListResponse.setPayMoney(financialDetail.getPayMoney()); orderListResponse.setPayMoney(financialDetail.getPayMoney());
orderListResponse.setWorkerName(worker.getName()); orderListResponse.setWorkerName(worker.getName());
orderListResponse.setWorkerPhone(worker.getPhone()); orderListResponse.setWorkerPhone(worker.getPhone());
orderListResponse.setCustomerName(customer.getName()); orderListResponse.setCustomerName(customerAddress.getName());
orderListResponse.setCustomerPhone(customer.getPhone()); orderListResponse.setCustomerPhone(customerAddress.getPhone());
orderListResponse.setOrderStatus(detail.getOrderStatus()); orderListResponse.setOrderStatus(detail.getOrderStatus());
orderListResponse.setPayStatus(orderMaster.getPayStatus()); orderListResponse.setPayStatus(orderMaster.getPayStatus());
orderListResponse.setPayType(orderMaster.getPayType()); orderListResponse.setPayType(orderMaster.getPayType());

16
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
View File

@ -111,7 +111,7 @@ public class OrderMasterController extends BaseController {
Worker worker = master.getWorkerId() != null ? workerService.selectById(master.getWorkerId()) : null; Worker worker = master.getWorkerId() != null ? workerService.selectById(master.getWorkerId()) : null;
// 消费者信息 // 消费者信息
Customer customer = customerService.selectByCustomerId(master.getCustomerId()); // Customer customer = customerService.selectByCustomerId(master.getCustomerId());
// 商品规格及信息 // 商品规格及信息
List<OrderGoods> orderStandardList = orderGoodsService.selectByOrderMasterId(master.getId()); List<OrderGoods> orderStandardList = orderGoodsService.selectByOrderMasterId(master.getId());
@ -150,8 +150,8 @@ public class OrderMasterController extends BaseController {
orderListResponse.setPayMoney(financialMaster.getPayMoney()); orderListResponse.setPayMoney(financialMaster.getPayMoney());
orderListResponse.setWorkerName(worker == null ? "" : worker.getName()); orderListResponse.setWorkerName(worker == null ? "" : worker.getName());
orderListResponse.setWorkerPhone(worker == null ? "" : worker.getPhone()); orderListResponse.setWorkerPhone(worker == null ? "" : worker.getPhone());
orderListResponse.setCustomerName(customer.getName()); orderListResponse.setCustomerName(customerAddress.getName());
orderListResponse.setCustomerPhone(customer.getPhone()); orderListResponse.setCustomerPhone(customerAddress.getPhone());
orderListResponse.setServerTime(master.getRevTime()); orderListResponse.setServerTime(master.getRevTime());
orderListResponse.setExpectTimeStart(master.getExpectTimeStart()); orderListResponse.setExpectTimeStart(master.getExpectTimeStart());
orderListResponse.setExpectTimeEnd(master.getExpectTimeEnd()); orderListResponse.setExpectTimeEnd(master.getExpectTimeEnd());
@ -249,7 +249,7 @@ public class OrderMasterController extends BaseController {
WorkerCertification workerRealInfo = workerCertificationService.selectByWorkerId(orderMaster.getWorkerId()); WorkerCertification workerRealInfo = workerCertificationService.selectByWorkerId(orderMaster.getWorkerId());
// 消费者信息 // 消费者信息
Customer customer = customerService.selectByCustomerId(orderMaster.getCustomerId()); // Customer customer = customerService.selectByCustomerId(orderMaster.getCustomerId());
// 商品规格及信息 // 商品规格及信息
List<OrderGoods> orderStandardList = orderGoodsService.selectByOrderMasterId(orderMaster.getId()); List<OrderGoods> orderStandardList = orderGoodsService.selectByOrderMasterId(orderMaster.getId());
@ -284,8 +284,8 @@ public class OrderMasterController extends BaseController {
orderListResponse.setPayMoney(financialMaster.getPayMoney()); orderListResponse.setPayMoney(financialMaster.getPayMoney());
orderListResponse.setWorkerName(workerRealInfo == null ? worker.getName() : workerRealInfo.getName()); orderListResponse.setWorkerName(workerRealInfo == null ? worker.getName() : workerRealInfo.getName());
orderListResponse.setWorkerPhone(worker == null ? "" : worker.getPhone()); orderListResponse.setWorkerPhone(worker == null ? "" : worker.getPhone());
orderListResponse.setCustomerName(customer.getName()); orderListResponse.setCustomerName(customerAddress.getName());
orderListResponse.setCustomerPhone(customer.getPhone()); orderListResponse.setCustomerPhone(customerAddress.getPhone());
orderListResponse.setOrderStatus(orderMaster.getOrderStatus()); orderListResponse.setOrderStatus(orderMaster.getOrderStatus());
orderListResponse.setPayStatus(orderMaster.getPayStatus()); orderListResponse.setPayStatus(orderMaster.getPayStatus());
orderListResponse.setPayType(orderMaster.getPayType()); orderListResponse.setPayType(orderMaster.getPayType());
@ -324,8 +324,8 @@ public class OrderMasterController extends BaseController {
orderMasterResponseVo.setWorkerName(worker.getName()); orderMasterResponseVo.setWorkerName(worker.getName());
} }
// 消费者信息 // 消费者信息
Customer customer = customerService.selectByCustomerId(master.getCustomerId()); CustomerAddress customerAddress = addressService.selectByCustomerAddressId(orderMaster.getAddressId());
orderMasterResponseVo.setCustomerName(customer.getName()); orderMasterResponseVo.setCustomerName(customerAddress.getName());
orderMasterResponseVos.add(orderMasterResponseVo); orderMasterResponseVos.add(orderMasterResponseVo);
} }

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

@ -1,5 +1,7 @@
package com.ghy.web.pojo.vo; package com.ghy.web.pojo.vo;
import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ghy.payment.domain.OrderTimeoutRecord; import com.ghy.payment.domain.OrderTimeoutRecord;
import lombok.Data; import lombok.Data;
@ -34,6 +36,7 @@ public class OrderListResponse {
private Date expectTimeStart; private Date expectTimeStart;
@JsonFormat(pattern = "HH:mm:ss")
private Date expectTimeEnd; private Date expectTimeEnd;
private Date workBeginTime; private Date workBeginTime;