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

各列表超时状态、序列、扣点随动、状态名称

This commit is contained in:
kuang.yife 2023-11-13 00:11:49 +08:00
parent c97d064aca
commit 32119e1348
8 changed files with 109 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -179,6 +179,9 @@ public class OrderDetailController extends BaseController {
.stream().collect(Collectors.toMap(Worker::getWorkerId, x -> x, (x, y) -> y)); .stream().collect(Collectors.toMap(Worker::getWorkerId, x -> x, (x, y) -> y));
for (OrderDetail detail : orderDetails) { for (OrderDetail detail : orderDetails) {
if(StringUtils.isNotEmpty(orderDetail.getOrderStatusName())){
detail.setOrderStatusName(orderDetail.getOrderStatusName());
}
Customer customer = customerMap.get(detail.getCustomerId()); Customer customer = customerMap.get(detail.getCustomerId());
detail.setWorker(workerMap.get(detail.getWorkerId())); detail.setWorker(workerMap.get(detail.getWorkerId()));
if (customer != null) { if (customer != null) {

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

@ -777,6 +777,9 @@ public class OrderMasterController extends BaseController {
master.setCustomerName(customer.getName()); master.setCustomerName(customer.getName());
master.setCustomerPhone(customer.getPhone()); master.setCustomerPhone(customer.getPhone());
} }
if(StringUtils.isNotEmpty(orderMaster.getOrderStatusName())){
master.setOrderStatusName(orderMaster.getOrderStatusName());
}
FinancialMaster fm = financialMasterMap.get(master.getId()); FinancialMaster fm = financialMasterMap.get(master.getId());
if (fm != null) { if (fm != null) {
master.setFinancialMasterMoney(fm.getPayMoney()); master.setFinancialMasterMoney(fm.getPayMoney());

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

@ -77,6 +77,8 @@ public class OrderListResponse {
private Integer orderStatus; private Integer orderStatus;
private String orderStatusName;
private Integer payStatus; private Integer payStatus;
private Integer payType; private Integer payType;

76
ghy-admin/src/main/resources/templates/order/master.html
View File

@ -73,35 +73,35 @@
<option value="">全部</option> <option value="">全部</option>
<option value="">在途</option> <option value="">在途</option>
</select> </select>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {sysPayStatus: 0})"> <a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatusName : '待付款', sysPayStatus: 0})">
待付款 待付款
(<span id="nonPaidOrderNum">0</span>) (<span id="nonPaidOrderNum">0</span>)
</a> </a>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 1, isCall : '01'})"> <a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatusName : '待约单', orderStatus: 1, isCall : '01'})">
待约单 待约单
(<span id="notCallOrderNum">0</span>) (<span id="notCallOrderNum">0</span>)
</a> </a>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 1, isCall : '02'})"> <a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatusName : '待排期', orderStatus: 1, isCall : '02'})">
待排期 待排期
(<span id="notSetTimeOrderNum">0</span>) (<span id="notSetTimeOrderNum">0</span>)
</a> </a>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 2})"> <a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatusName : '待上门', orderStatus: 2})">
待上门 待上门
(<span id="waitForDoorOrderNum">0</span>) (<span id="waitForDoorOrderNum">0</span>)
</a> </a>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 3})"> <a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatusName : '进行中', orderStatus: 3})">
进行中 进行中
(<span id="servingOrderNum">0</span>) (<span id="servingOrderNum">0</span>)
</a> </a>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 4})"> <a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatusName : '确认审核', orderStatus: 4})">
确认审核 确认审核
(<span class="confirmingOrderNum">0</span>) (<span class="confirmingOrderNum">0</span>)
</a> </a>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 5})"> <a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatusName : '完成', orderStatus: 5})">
完成 完成
(<span id="finishedOrderNum">0</span>) (<span id="finishedOrderNum">0</span>)
</a> </a>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 6})"> <a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatusName : '关闭', orderStatus: 6})">
关闭 关闭
(<span id="canceledOrderNum">0</span>) (<span id="canceledOrderNum">0</span>)
</a> </a>
@ -113,19 +113,19 @@
明日待上门 明日待上门
(<span id="tomorrowOrderNum">0</span>) (<span id="tomorrowOrderNum">0</span>)
</a> </a>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {searchAfterList: true})"> <a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatusName : '售后', searchAfterList: true})">
售后 售后
(<span id="afterServiceOrderNum">0</span>) (<span id="afterServiceOrderNum">0</span>)
</a> </a>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: -1})"> <a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatusName : '急报中', orderStatus: -1})">
急报中 急报中
(<span>0</span>) (<span>0</span>)
</a> </a>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: -1})"> <a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatusName : '退单', orderStatus: -1})">
退单 退单
(<span>0</span>) (<span>0</span>)
</a> </a>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: -1})"> <a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatusName : '售后纠纷', orderStatus: -1})">
售后纠纷 售后纠纷
(<span>0</span>) (<span>0</span>)
</a> </a>
@ -260,13 +260,13 @@
接单超时 接单超时
(<span id="newTimeoutOrderNum">0</span>) (<span id="newTimeoutOrderNum">0</span>)
</a> </a>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {timeout: 1, orderStatus: 1})"> <a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {timeout: 1, orderStatus: 1, isCall: '01'})">
约单超时 约单超时
(<span class="acceptedTimeoutOrderNum">0</span>) (<span id="acceptedTimeoutOrderNum">0</span>)
</a> </a>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {timeout: 1, orderStatus: 1})"> <a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {timeout: 1, orderStatus: 1, isCall: '02'})">
排单超时 排单超时
(<span class="acceptedTimeoutOrderNum">0</span>) (<span id="plainTimeoutOrderNum">0</span>)
</a> </a>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: -1})"> <a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: -1})">
无法排单 无法排单
@ -455,7 +455,6 @@
success: function (result) { success: function (result) {
if (result.code == web_status.SUCCESS) { if (result.code == web_status.SUCCESS) {
$('#newTimeoutOrderNum').text(result.data.newOrderNum); $('#newTimeoutOrderNum').text(result.data.newOrderNum);
$('.acceptedTimeoutOrderNum').text(result.data.acceptedOrderNum);
$('#servingTimeoutOrderNum').text(result.data.servingOrderNum); $('#servingTimeoutOrderNum').text(result.data.servingOrderNum);
$('#waitForDoorTimeoutOrderNum').text(result.data.waitForDoorOrderNum); $('#waitForDoorTimeoutOrderNum').text(result.data.waitForDoorOrderNum);
} else { } else {
@ -464,7 +463,34 @@
} }
}) })
<!-- 待付款订单数量统计--> $.ajax({
type: "GET",
dataType:"json",
url: prefix + '/differentStatus/count',
data: {timeout: 1, isCall : '01'},
success: function (result) {
if (result.code == web_status.SUCCESS) {
$('#acceptedTimeoutOrderNum').text(result.data.acceptedOrderNum);
} else {
$.modal.msgError("数据加载错误，请重试！")
}
}
})
$.ajax({
type: "GET",
dataType:"json",
url: prefix + '/differentStatus/count',
data: {timeout: 1, isCall : '02'},
success: function (result) {
if (result.code == web_status.SUCCESS) {
$('#plainTimeoutOrderNum').text(result.data.acceptedOrderNum);
} else {
$.modal.msgError("数据加载错误，请重试！")
}
}
})
$.ajax({ $.ajax({
type: "GET", type: "GET",
dataType:"json", dataType:"json",
@ -479,7 +505,6 @@
} }
}) })
<!-- 今日和明日单数量统计-->
var date = new Date(); var date = new Date();
$.ajax({ $.ajax({
type: "GET", type: "GET",
@ -516,7 +541,6 @@
} }
}) })
<!-- 售后订单数量统计-->
$.ajax({ $.ajax({
type: "GET", type: "GET",
dataType:"json", dataType:"json",
@ -588,6 +612,12 @@
{ {
checkbox: true checkbox: true
}, },
{
title: "序号",
formatter: function (value, row, index) {
return $.table.serialNumber(index);
}
},
{ {
field: 'id', field: 'id',
title: '订单ID', title: '订单ID',
@ -616,7 +646,11 @@
title: '订单状态', title: '订单状态',
align: 'center', align: 'center',
formatter: function (value, row, index) { formatter: function (value, row, index) {
return $.table.selectDictLabel(orderStatus, value); if(row.orderStatusName){
return row.orderStatusName;
}else {
return $.table.selectDictLabel(orderStatus, value);
}
} }
}, },
{ {

42
ghy-admin/src/main/resources/templates/order/orderManager.html
View File

@ -72,11 +72,11 @@
<option value="">全部</option> <option value="">全部</option>
<option value="">在途</option> <option value="">在途</option>
</select> </select>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 0, sysPayStatus: 0, orderMode: '02'})"> <a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatusName : '待付款', orderStatus: 0, sysPayStatus: 0, orderMode: '02'})">
待付款 待付款
(<span id="nonPaidOrderNum">0</span>) (<span id="nonPaidOrderNum">0</span>)
</a> </a>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 0, workerId: -1})"> <a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatusName : '已发布', orderStatus: 0, workerId: -1})">
已发布 已发布
(<span id="publishedOrderNum">0</span>) (<span id="publishedOrderNum">0</span>)
</a> </a>
@ -84,31 +84,31 @@
<!-- 已接单--> <!-- 已接单-->
<!-- (<span id="acceptedOrderNum">0</span>)--> <!-- (<span id="acceptedOrderNum">0</span>)-->
<!-- </a>--> <!-- </a>-->
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 1, isCall: '01'})"> <a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatusName : '待约单', orderStatus: 1, isCall: '01'})">
未约时 待约单
(<span id="notAppointedOrderNum">0</span>) (<span id="notAppointedOrderNum">0</span>)
</a> </a>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 1, isCall: '02'})"> <a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatusName : '待排期', orderStatus: 1, isCall: '02'})">
未排班 待排期
(<span id="notArrangedOrderNum">0</span>) (<span id="notArrangedOrderNum">0</span>)
</a> </a>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 2})"> <a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatusName : '待上门', orderStatus: 2})">
待上门 待上门
(<span id="waitForDoorOrderNum">0</span>) (<span id="waitForDoorOrderNum">0</span>)
</a> </a>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 3})"> <a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatusName : '进行中', orderStatus: 3})">
进行中 进行中
(<span id="servingOrderNum">0</span>) (<span id="servingOrderNum">0</span>)
</a> </a>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 4})"> <a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatusName : '确认审核', orderStatus: 4})">
确认审核 确认审核
(<span class="confirmingOrderNum">0</span>) (<span class="confirmingOrderNum">0</span>)
</a> </a>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 5})"> <a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatusName : '完成', orderStatus: 5})">
完成 完成
(<span id="finishedOrderNum">0</span>) (<span id="finishedOrderNum">0</span>)
</a> </a>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 6})"> <a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatusName : '关闭', orderStatus: 6})">
关闭 关闭
(<span id="canceledOrderNum">0</span>) (<span id="canceledOrderNum">0</span>)
</a> </a>
@ -120,19 +120,19 @@
明日待上门 明日待上门
(<span id="tomorrowOrderNum">0</span>) (<span id="tomorrowOrderNum">0</span>)
</a> </a>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {searchAfterList: true})"> <a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatusName : '售后', searchAfterList: true})">
售后 售后
(<span id="afterServiceOrderNum">0</span>) (<span id="afterServiceOrderNum">0</span>)
</a> </a>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: -1})"> <a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatusName : '急报中', orderStatus: -1})">
急报中 急报中
(<span>0</span>) (<span>0</span>)
</a> </a>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: -1})"> <a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatusName : '退单', orderStatus: -1})">
退单 退单
(<span>0</span>) (<span>0</span>)
</a> </a>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: -1})"> <a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatusName : '售后纠纷', orderStatus: -1})">
售后纠纷 售后纠纷
(<span>0</span>) (<span>0</span>)
</a> </a>
@ -617,6 +617,12 @@
{ {
checkbox: true checkbox: true
}, },
{
title: "序号",
formatter: function (value, row, index) {
return $.table.serialNumber(index);
}
},
{ {
field: 'id', field: 'id',
title: '订单ID', title: '订单ID',
@ -646,7 +652,11 @@
title: '订单状态', title: '订单状态',
align: 'center', align: 'center',
formatter: function (value, row, index) { formatter: function (value, row, index) {
return $.table.selectDictLabel(orderStatus, value); if(row.orderStatusName){
return row.orderStatusName;
}else {
return $.table.selectDictLabel(orderStatus, value);
}
} }
}, },
{ {

26
ghy-admin/src/main/resources/templates/order/pc-master.html
View File

@ -72,15 +72,15 @@
<option value="">全部</option> <option value="">全部</option>
<option value="">在途</option> <option value="">在途</option>
</select> </select>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 0, sysPayStatus: 0, payMode: '02'})"> <a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatusName:'待付款', orderStatus: 0, sysPayStatus: 0, payMode: '02'})">
待付款 待付款
(<span id="nonPaidOrderNum">0</span>) (<span id="nonPaidOrderNum">0</span>)
</a> </a>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 0, workerId: -1})"> <a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatusName:'已发布', orderStatus: 0, workerId: -1})">
已发布 已发布
(<span id="publishedOrderNum">0</span>) (<span id="publishedOrderNum">0</span>)
</a> </a>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 1})"> <a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatusName:'已接单', orderStatus: 1})">
已接单 已接单
(<span id="acceptedOrderNum">0</span>) (<span id="acceptedOrderNum">0</span>)
</a> </a>
@ -90,23 +90,23 @@
<!-- <a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 1, isCall: '02'})">--> <!-- <a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 1, isCall: '02'})">-->
<!-- 未排班--> <!-- 未排班-->
<!-- </a>--> <!-- </a>-->
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 2})"> <a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatusName:'待上门', orderStatus: 2})">
待上门 待上门
(<span id="waitForDoorOrderNum">0</span>) (<span id="waitForDoorOrderNum">0</span>)
</a> </a>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 3})"> <a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatusName:'进行中', orderStatus: 3})">
进行中 进行中
(<span id="servingOrderNum">0</span>) (<span id="servingOrderNum">0</span>)
</a> </a>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 4})"> <a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatusName:'确认审核', orderStatus: 4})">
确认审核 确认审核
(<span id="confirmingOrderNum">0</span>) (<span id="confirmingOrderNum">0</span>)
</a> </a>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 5})"> <a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatusName:'完成', orderStatus: 5})">
完成 完成
(<span id="finishedOrderNum">0</span>) (<span id="finishedOrderNum">0</span>)
</a> </a>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 6})"> <a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatusName:'关闭', orderStatus: 6})">
关闭 关闭
(<span id="canceledOrderNum">0</span>) (<span id="canceledOrderNum">0</span>)
</a> </a>
@ -118,11 +118,11 @@
明日待上门 明日待上门
(<span id="tomorrowOrderNum">0</span>) (<span id="tomorrowOrderNum">0</span>)
</a> </a>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: -1})"> <a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatusName:'售后', orderStatus: -1})">
售后 售后
(<span>0</span>) (<span>0</span>)
</a> </a>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: -1})"> <a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatusName:'急报中', orderStatus: -1})">
急报中 急报中
(<span>0</span>) (<span>0</span>)
</a> </a>
@ -402,6 +402,12 @@
{ {
checkbox: true checkbox: true
}, },
{
title: "序号",
formatter: function (value, row, index) {
return $.table.serialNumber(index);
}
},
{ {
field: 'id', field: 'id',
title: '订单ID', title: '订单ID',

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

@ -63,6 +63,8 @@ public class OrderDetail extends BaseEntity {
@Excel(name = "订单状态", cellType = Excel.ColumnType.NUMERIC) @Excel(name = "订单状态", cellType = Excel.ColumnType.NUMERIC)
private Integer orderStatus; private Integer orderStatus;
private String orderStatusName;
@Excel(name = "接单师傅id", cellType = Excel.ColumnType.NUMERIC) @Excel(name = "接单师傅id", cellType = Excel.ColumnType.NUMERIC)
private Long workerId; private Long workerId;

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

@ -104,6 +104,8 @@ public class OrderMaster extends BaseEntity {
private String orderStatuses; private String orderStatuses;
private String orderStatusName;
private Boolean isOverTime; private Boolean isOverTime;
private String orderMasterIds; private String orderMasterIds;