From 375237a59434d61567161131d85229d45c792366 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 23 Jul 2021 10:17:26 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
---
gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminJhyOrderController.java | 2 +-
1 files changed, 1 insertions(+), 1 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 c9513c7..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
@@ -103,7 +103,7 @@
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