From e84450eda524efd94e9c86307108f7dfc4c0392c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 06 Jul 2021 11:36:54 +0800
Subject: [PATCH] 20210706 积分拨付
---
gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminOrderController.java | 24 +++++-------------------
1 files changed, 5 insertions(+), 19 deletions(-)
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminOrderController.java b/gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminOrderController.java
index 1c6c463..45e5c60 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminOrderController.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminOrderController.java
@@ -151,26 +151,12 @@
if(ScoreOrder.STATUS_READY != status){
return JsonResult.failMessage("当前订单不是待发货状态！");
}
- ScoreOrder order = scoreOrderMapper.selectByPrimaryKey(model.getId());
- Example exampleDetails = new Example(ScoreDetails.class);
- Example.Criteria criteriaDetails = exampleDetails.createCriteria();
- criteriaDetails.andEqualTo("orderNo",order.getOrderNo());
- criteriaDetails.andEqualTo("userId",order.getUserId());
- criteriaDetails.andEqualTo("type",ScoreDetails.SCORE_TYPE_SHOPPING_RETURN);
- List<ScoreDetails> scoreDetails = scoreDetailsMapper.selectByExample(exampleDetails);
- if(CollUtil.isNotEmpty(scoreDetails)){
- return JsonResult.failMessage("当前订单已经取消过了！");
- }
- Long aLong = orderService.cancelOrder(model);
- if(aLong > 0){
- OperationAppLog build = OperationAppLog.builder().appPrograme(CommonEnum.后台.getValue()).opreateName(getAdminName(request))
- .methodName(Constants.SCORESHOP_MODUL_NAME).operateAction("订单管理-取消-" + id).build();
- mqUtil.sendApp(build);
- return JsonResult.success("操作成功！");
- }else{
- return JsonResult.success("操作失败！");
- }
+ orderService.cancelOrder(id,scoreOrder.getUserId());
+ OperationAppLog build = OperationAppLog.builder().appPrograme(CommonEnum.后台.getValue()).opreateName(getAdminName(request))
+ .methodName(Constants.SCORESHOP_MODUL_NAME).operateAction("订单管理-取消-" + id).build();
+ mqUtil.sendApp(build);
+ return JsonResult.success("操作成功！");
}
--
Gitblit v1.9.1