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

Merge remote-tracking branch 'origin/master'

This commit is contained in:
Hawking 2023-04-19 22:37:32 +08:00
parent 439fecbff2 94852f198a
commit ceafb5526c
4 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -689,12 +689,17 @@ public class OrderController extends BaseController {
response.setServingOrderNum(orderDetailService.countOrderDetailList(orderDetail));
// 统计待确认单量
orderDetail.setOrderStatus(null);
orderDetail.setOrderStatusList(new ArrayList<Integer>(){{
add(4);
add(5);
}});
orderDetail.setWorkFinishTimeExisted(true);
orderDetail.setDrawCashStatusList(new ArrayList<Integer>() {{
add(0);
add(1);
}});
response.setWaitSureOrderNum(orderDetailService.countOrderDetailList(orderDetail));
orderDetail.setOrderStatusList(null);
// 统计已完成子单量
orderDetail.setOrderStatus(OrderStatus.FINISH.code());
orderDetail.setDrawCashStatusList(new ArrayList<Integer>() {{

2
ghy-admin/src/main/resources/application.yaml
View File

@ -59,7 +59,7 @@ spring:
time-zone: GMT+8
date-format: yyyy-MM-dd HH:mm:ss
profiles:
active: dev
active: druid
# 文件上传
servlet:
multipart:

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

@ -144,4 +144,6 @@ public class OrderDetail extends BaseEntity {
private BigDecimal changeMoney;
private boolean workFinishTimeExisted;
private List<Integer> orderStatusList;
}

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

@ -107,6 +107,12 @@
<if test="orderStatus != null">
AND od.order_status = #{orderStatus}
</if>
<if test="orderStatusList != null and orderStatusList.size() > 0">
AND od.order_status in
<foreach collection="orderStatusList" item="orderStatus" open="(" separator="," close=")">
#{orderStatus}
</foreach>
</if>
<if test="orderMasterCode != null and orderMasterCode != ''">
AND od.order_master_code = #{orderMasterCode}
</if>
@ -178,6 +184,12 @@
<if test="orderStatus != null">
AND od.order_status = #{orderStatus}
</if>
<if test="orderStatusList != null and orderStatusList.size() > 0">
AND od.order_status in
<foreach collection="orderStatusList" item="orderStatus" open="(" separator="," close=")">
#{orderStatus}
</foreach>
</if>
<if test="orderMasterCode != null and orderMasterCode != 0">
AND od.order_detail_code = #{orderMasterCode}
</if>