From 0561b12e8c5570a0f7e812543cc3460f80fee416 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 11 Nov 2021 10:29:28 +0800
Subject: [PATCH] 20211108
---
gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminJhyOrderController.java | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 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 4c5fb50..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
@@ -4,6 +4,7 @@
import com.xzx.gc.common.constant.CommonEnum;
import com.xzx.gc.common.constant.Constants;
import com.xzx.gc.common.dto.log.OperationAppLog;
+import com.xzx.gc.common.exception.RestException;
import com.xzx.gc.common.request.BaseController;
import com.xzx.gc.entity.JhyInfo;
import com.xzx.gc.entity.JhyOrder;
@@ -82,5 +83,32 @@
return JsonResult.success("操作成功！");
}
+ /**
+ * 指派订单
+ */
+ @PostMapping(Constants.ADMIN_VIEW_PREFIX + "/score/jhy/assignJhyOrder.json")
+ @ApiOperation(value="集物员订单管理-指派订单", notes="test: 仅0有正确返回")
+ public JsonResult assignJhyOrder(@RequestBody AssignJhyOrderDto model, HttpServletRequest request) {
+ long orderId = model.getOrderId();
+ JhyOrder jhyOrder = jhyOrderMapper.selectByPrimaryKey(orderId);
+ if(ObjectUtil.isEmpty(jhyOrder)){
+ return JsonResult.failMessage("当前记录不存在！");
+ }
+ Integer status = jhyOrder.getStatus();
+ if(JhyOrder.ORDER_STATUS_WAITING != status){
+ 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,jhyInfo.getUserId());
+ OperationAppLog build = OperationAppLog.builder().appPrograme(CommonEnum.后台.getValue()).opreateName(getAdminName(request))
+ .methodName(Constants.SCORESHOP_MODUL_NAME).operateAction("集物员管理-指派订单-" + orderId).build();
+ mqUtil.sendApp(build);
+ return JsonResult.success("操作成功！");
+ }
+
}
--
Gitblit v1.9.1