From 12542f379312598f83a50893584944e51fc0f2b9 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sat, 09 Oct 2021 16:06:43 +0800
Subject: [PATCH] fix
---
gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminJhyOrderController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminJhyOrderController.java b/gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminJhyOrderController.java
index c84bad1..e4ee667 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminJhyOrderController.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminJhyOrderController.java
@@ -96,14 +96,14 @@
}
Integer status = jhyOrder.getStatus();
if(JhyOrder.ORDER_STATUS_WAITING != status){
- return JsonResult.failMessage("订单不是待接单状态，不允许取消！");
+ return JsonResult.failMessage("订单不是待接单状态，不允许指派！");
}
long jhyId = model.getJhyId();
JhyInfo jhyInfo = jhyOrderMapper.selectJhyInfoByUserId(jhyId);
if (jhyInfo == null || !JhyInfo.CHECK_PASS.equals(jhyInfo.getStatus())) {
return JsonResult.failMessage("不是集货员！");
}
- jhyService.assignJhyOrder(model);
+ jhyService.assignJhyOrder(model,jhyInfo.getUserId());
OperationAppLog build = OperationAppLog.builder().appPrograme(CommonEnum.后台.getValue()).opreateName(getAdminName(request))
.methodName(Constants.SCORESHOP_MODUL_NAME).operateAction("集物员管理-指派订单-" + orderId).build();
mqUtil.sendApp(build);
--
Gitblit v1.9.1