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-22 01:11:23 +08:00
parent 2a6aefd2f0
commit c06438b2e8
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,6 +32,8 @@ import com.ghy.payment.domain.FinancialMaster;
import com.ghy.payment.domain.OrderTimeoutRecord;
import com.ghy.payment.service.FinancialMasterService;
import com.ghy.payment.service.OrderFineRecordService;
import com.ghy.system.domain.SysArea;
import com.ghy.system.service.ISysAreaService;
import com.ghy.web.pojo.vo.OrderListResponse;
import com.ghy.web.pojo.vo.OrderMasterResponseVo;
import com.ghy.web.pojo.vo.OrderStandard;
@ -89,6 +91,8 @@ public class OrderMasterController extends BaseController {
private GoodsStandardService goodsStandardService;
@Autowired
private OrderFineRecordService orderFineRecordService;
@Autowired
private ISysAreaService sysAreaService;
@RequiresPermissions("order:master:view")
@GetMapping()
@ -127,6 +131,8 @@ public class OrderMasterController extends BaseController {
// 地址信息
CustomerAddress customerAddress = addressService.selectByCustomerAddressId(master.getAddressId());
SysArea sysArea = sysAreaService.selectById(customerAddress.getCountryId());
String completeAddress = sysArea.getMergerName().replaceAll(",", "") + customerAddress.getAddress();
// 查询是否超时
List<OrderTimeoutRecord> timeoutRecords = new ArrayList<>();
@ -164,7 +170,7 @@ public class OrderMasterController extends BaseController {
orderListResponse.setPayType(master.getPayType());
orderListResponse.setOrderMasterCode(master.getCode());
orderListResponse.setStandardList(standardList);
orderListResponse.setAddress(customerAddress.getAddress());
orderListResponse.setAddress(completeAddress);
orderListResponse.setRemark(goods.getRemark());
orderListResponse.setCustomerRemark(master.getRemark());
orderListResponse.setOrderTimeoutRecords(timeoutRecords);
@ -249,8 +255,13 @@ public class OrderMasterController extends BaseController {
// 师傅信息
Worker worker = workerService.selectById(orderMaster.getWorkerId());
// 师傅实名信息
WorkerCertification workerRealInfo = workerCertificationService.selectByWorkerId(orderMaster.getWorkerId());
WorkerCertification workerRealInfo = null;
String workerName = "";
if (worker != null) {
// 师傅实名信息
workerRealInfo = workerCertificationService.selectByWorkerId(orderMaster.getWorkerId());
workerName = workerRealInfo == null ? worker.getName() : workerRealInfo.getName();
}
// 消费者信息
// Customer customer = customerService.selectByCustomerId(orderMaster.getCustomerId());
@ -268,6 +279,8 @@ public class OrderMasterController extends BaseController {
// 地址信息
CustomerAddress customerAddress = addressService.selectByCustomerAddressId(orderMaster.getAddressId());
SysArea sysArea = sysAreaService.selectById(customerAddress.getCountryId());
String completeAddress = sysArea.getMergerName().replaceAll(",", "") + customerAddress.getAddress();
for (OrderGoods orderGoods : orderStandardList) {
OrderStandard orderStandard = new OrderStandard();
@ -286,7 +299,7 @@ public class OrderMasterController extends BaseController {
orderListResponse.setDiscountMoney(financialMaster.getDiscountMoney());
orderListResponse.setTotalMoney(financialMaster.getTotalMoney());
orderListResponse.setPayMoney(financialMaster.getPayMoney());
orderListResponse.setWorkerName(workerRealInfo == null ? worker.getName() : workerRealInfo.getName());
orderListResponse.setWorkerName(workerName);
orderListResponse.setWorkerPhone(worker == null ? "" : worker.getPhone());
orderListResponse.setCustomerName(customerAddress.getName());
orderListResponse.setCustomerPhone(customerAddress.getPhone());
@ -294,7 +307,7 @@ public class OrderMasterController extends BaseController {
orderListResponse.setPayStatus(orderMaster.getPayStatus());
orderListResponse.setPayType(orderMaster.getPayType());
orderListResponse.setStandardList(standardList);
orderListResponse.setAddress(customerAddress.getAddress());
orderListResponse.setAddress(completeAddress);
orderListResponse.setServerTime(orderMaster.getRevTime());
orderListResponse.setExpectTimeStart(orderMaster.getExpectTimeStart());
orderListResponse.setExpectTimeEnd(orderMaster.getExpectTimeEnd());

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

@ -34,9 +34,10 @@ public class OrderListResponse {
private Date serverTime;
@JsonFormat(pattern = "YYYY-MM-dd HH:mm")
private Date expectTimeStart;
@JsonFormat(pattern = "HH:mm:ss")
@JsonFormat(pattern = "HH:mm")
private Date expectTimeEnd;
private Date workBeginTime;