From 4e69d662f31acdb258777ebab3119322a02bd2a0 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 23 Jul 2021 10:06:33 +0800
Subject: [PATCH] 202107023
---
gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java | 5 ++---
gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminJhyOrderController.java | 2 +-
2 files changed, 3 insertions(+), 4 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);
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java b/gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java
index c6060c4..61f23c9 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java
@@ -163,11 +163,10 @@
return total;
}
- public void assignJhyOrder(AssignJhyOrderDto model) {
+ public void assignJhyOrder(AssignJhyOrderDto model,String userId) {
Long orderId = model.getOrderId();
- Long jhyId = model.getJhyId();
JhyOrder order = jhyOrderMapper.selectByPrimaryKey(orderId);
- order.setJhyId(jhyId.toString());
+ order.setJhyId(userId);
order.setStatus(JhyOrder.ORDER_STATUS_IMG);
jhyOrderMapper.updateByPrimaryKey(order);
}
--
Gitblit v1.9.1