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

主订单查询兼容需求大厅订单查询

This commit is contained in:
donqi 2022-06-28 18:05:41 +08:00
parent 7f907a3863
commit 380d9729fe
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -102,7 +102,7 @@ public class OrderMasterController extends BaseController {
List<OrderStandard> standardList = new ArrayList<>(); List<OrderStandard> standardList = new ArrayList<>();
// 师傅信息 // 师傅信息
Worker worker = workerService.selectById(master.getWorkerId()); Worker worker = master.getWorkerId() != null ? workerService.selectById(master.getWorkerId()) : null;
// 消费者信息 // 消费者信息
Customer customer = customerService.selectByCustomerId(master.getCustomerId()); Customer customer = customerService.selectByCustomerId(master.getCustomerId());
@ -135,8 +135,8 @@ public class OrderMasterController extends BaseController {
orderListResponse.setDiscountMoney(financialMaster.getDiscountMoney()); orderListResponse.setDiscountMoney(financialMaster.getDiscountMoney());
orderListResponse.setTotalMoney(financialMaster.getTotalMoney()); orderListResponse.setTotalMoney(financialMaster.getTotalMoney());
orderListResponse.setPayMoney(financialMaster.getPayMoney()); orderListResponse.setPayMoney(financialMaster.getPayMoney());
orderListResponse.setWorkerName(worker.getName()); orderListResponse.setWorkerName(worker == null ? "" : worker.getName());
orderListResponse.setWorkerPhone(worker.getPhone()); orderListResponse.setWorkerPhone(worker == null ? "" : worker.getPhone());
orderListResponse.setCustomerName(customer.getName()); orderListResponse.setCustomerName(customer.getName());
orderListResponse.setCustomerPhone(customer.getPhone()); orderListResponse.setCustomerPhone(customer.getPhone());
orderListResponse.setServerTime(master.getRevTime()); orderListResponse.setServerTime(master.getRevTime());

5
ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
View File

@ -71,9 +71,12 @@
<if test="payStatus != null"> <if test="payStatus != null">
AND pay_status = #{payStatus} AND pay_status = #{payStatus}
</if> </if>
<if test="workerId != null and workerId != 0"> <if test="workerId != null and workerId > 0">
AND worker_id = #{workerId} AND worker_id = #{workerId}
</if> </if>
<if test="workerId == -1">
AND worker_id IS NULL
</if>
</where> </where>
order by create_time desc order by create_time desc
</select> </select>