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

补充上一commit

This commit is contained in:
donqi 2023-03-28 00:53:25 +08:00
parent 6172a682ab
commit 18957b09ef
3 changed files with 24 additions and 2 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

@ -661,13 +661,21 @@ public class OrderController extends BaseController {
orderDetail.setOrderStatus(OrderStatus.SERVER.code()); orderDetail.setOrderStatus(OrderStatus.SERVER.code());
response.setServingOrderNum(orderDetailService.countOrderDetailList(orderDetail)); response.setServingOrderNum(orderDetailService.countOrderDetailList(orderDetail));
// 统计待确认单量 // 统计待确认单量
orderDetail.setOrderStatus(OrderStatus.FINISH_CHECK.code()); orderDetail.setOrderStatus(null);
orderDetail.setWorkFinishTimeExisted(true); orderDetail.setWorkFinishTimeExisted(true);
orderDetail.setDrawCashStatusList(new ArrayList<Integer>(){{
add(0);
add(1);
}});
response.setWaitSureOrderNum(orderDetailService.countOrderDetailList(orderDetail)); response.setWaitSureOrderNum(orderDetailService.countOrderDetailList(orderDetail));
orderDetail.setWorkFinishTimeExisted(false);
// 统计已完成子单量 // 统计已完成子单量
orderDetail.setOrderStatus(OrderStatus.FINISH.code()); orderDetail.setOrderStatus(OrderStatus.FINISH.code());
orderDetail.setDrawCashStatusList(new ArrayList<Integer>(){{
add(2);
}});
response.setFinishedOrderNum(orderDetailService.countOrderDetailList(orderDetail)); response.setFinishedOrderNum(orderDetailService.countOrderDetailList(orderDetail));
orderDetail.setWorkFinishTimeExisted(false);
orderDetail.setDrawCashStatusList(null);
// 统计已完成主单量 // 统计已完成主单量
orderMaster.setOrderStatus(OrderStatus.FINISH.code()); orderMaster.setOrderStatus(OrderStatus.FINISH.code());
response.setFinishedMasterOrderNum(orderMasterService.countOrderMasterList(orderMaster)); response.setFinishedMasterOrderNum(orderMasterService.countOrderMasterList(orderMaster));

2
ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java
View File

@ -107,6 +107,8 @@ public class OrderDetail extends BaseEntity {
*/ */
private Integer drawCashStatus; private Integer drawCashStatus;
private List<Integer> drawCashStatusList;
/** /**
* 发起提现时间 draw_cash_time * 发起提现时间 draw_cash_time
*/ */

12
ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml
View File

@ -140,6 +140,12 @@
<if test="drawCashStatus != null"> <if test="drawCashStatus != null">
AND od.draw_cash_status = ${drawCashStatus} AND od.draw_cash_status = ${drawCashStatus}
</if> </if>
<if test="drawCashStatusList != null and drawCashStatusList.size() > 0">
AND od.draw_cash_status in
<foreach collection="drawCashStatusList" item="drawCashStatus" open="(" separator="," close=")">
#{drawCashStatus}
</foreach>
</if>
<if test="workFinishTimeExisted"> <if test="workFinishTimeExisted">
AND od.work_finish_time is not null AND od.work_finish_time is not null
</if> </if>
@ -199,6 +205,12 @@
<if test="workFinishTimeExisted"> <if test="workFinishTimeExisted">
AND od.work_finish_time is not null AND od.work_finish_time is not null
</if> </if>
<if test="drawCashStatusList != null and drawCashStatusList.size() > 0">
AND od.draw_cash_status in
<foreach collection="drawCashStatusList" item="drawCashStatus" open="(" separator="," close=")">
#{drawCashStatus}
</foreach>
</if>
</where> </where>
order by od.create_time order by od.create_time
<trim suffixOverrides=","> <trim suffixOverrides=",">