From 9f0b6b2856b6d06053953da4d3804f3329fff7ba Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 19 Apr 2023 17:57:17 +0800
Subject: [PATCH] 拉卡拉支付
---
src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java | 92 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 89 insertions(+), 3 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java
index aa1317a..ba47f51 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java
@@ -12,6 +12,8 @@
import cc.mrbird.febs.common.utils.excl.ResponseHeadUtil;
import cc.mrbird.febs.mall.dto.*;
import cc.mrbird.febs.mall.entity.*;
+import cc.mrbird.febs.mall.mapper.MallExpressInfoMapper;
+import cc.mrbird.febs.mall.mapper.MallMemberMapper;
import cc.mrbird.febs.mall.mapper.MallOrderRefundOperationMapper;
import cc.mrbird.febs.mall.service.IAdminMallGoodsService;
import cc.mrbird.febs.mall.service.IAdminMallOrderService;
@@ -20,9 +22,12 @@
import cc.mrbird.febs.system.entity.Dept;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -45,6 +50,8 @@
public class AdminMallOrderController extends BaseController {
private final IAdminMallOrderService adminMallOrderService;
+ private final MallExpressInfoMapper mallExpressInfoMapper;
+ private final MallMemberMapper mallMemberMapper;
/**
* 订单列表
@@ -57,6 +64,19 @@
public FebsResponse getOrderList(MallOrderInfoDto mallOrderInfo, QueryRequest request) {
Map<String, Object> data = getDataTable(adminMallOrderService.getOrderListInPage(mallOrderInfo, request));
return new FebsResponse().success().data(data);
+ }
+
+ /**
+ * 订单列表-资金流水
+ */
+ @GetMapping("/orderMoneyFlow")
+ public FebsResponse orderMoneyFlow(QueryRequest request, MallOrderInfo mallOrderInfo, Integer parentId) {
+ if (parentId == null) {
+ ViewMallOrderController.idOrderMoneyFlow = 0;
+ }
+ mallOrderInfo.setId(ViewMallOrderController.idOrderMoneyFlow);
+ Map<String, Object> dataTable = getDataTable(adminMallOrderService.orderMoneyFlow(request, mallOrderInfo));
+ return new FebsResponse().success().data(dataTable);
}
/**
@@ -78,6 +98,30 @@
@ControllerEndpoint(operation = "订单列表-取消订单", exceptionMessage = "操作失败")
public FebsResponse cancelOrder(@NotNull(message = "{required}") @PathVariable Long id) {
return adminMallOrderService.cancelOrder(id);
+ }
+
+ /**
+ * 订单列表-自提订单
+ *
+ * @param id
+ * @return
+ */
+ @GetMapping("takeGoods/{id}")
+ @ControllerEndpoint(operation = "订单列表-自提订单", exceptionMessage = "操作失败")
+ public FebsResponse takeGoods(@NotNull(message = "{required}") @PathVariable Long id) {
+ return adminMallOrderService.takeGoods(id);
+ }
+
+ /**
+ * 订单列表-删除订单
+ *
+ * @param id
+ * @return
+ */
+ @GetMapping("delOrder/{id}")
+ @ControllerEndpoint(operation = "订单列表-删除订单", exceptionMessage = "操作失败")
+ public FebsResponse delOrder(@NotNull(message = "{required}") @PathVariable Long id) {
+ return adminMallOrderService.delOrder(id);
}
/**
@@ -234,7 +278,7 @@
String title = "订单列表";
orderSheet.setSheetName(title);
orderSheet.setTitle(title);
- String[] header = {"订单编号", "订单金额", "下单时间", "配送方式", "收货姓名", "收货电话", "收货地址", "商品名称", "订单状态", "物流单号", "物流公司", "物流公司码"};
+ String[] header = {"订单编号", "下单人", "订单金额", "下单时间", "配送方式", "收货姓名", "收货电话", "收货地址", "商品名称", "订单状态", "物流单号", "物流公司", "物流公司码"};
orderSheet.setHeaders(header);
QueryRequest request = new QueryRequest();
@@ -246,6 +290,7 @@
for (MallOrderInfo item : dataList) {
List<Object> temp = new ArrayList<>();
temp.add(item.getOrderNo());
+ temp.add(mallMemberMapper.selectById(item.getMemberId()).getName());
temp.add(item.getAmount());
temp.add(DateUtil.format(item.getOrderTime(), "yyyy-MM-dd HH:mm:ss"));
temp.add("快递配送");
@@ -266,8 +311,22 @@
} else {
temp.add("");
}
-
- temp.add(item.getStatus());
+ switch (item.getStatus()) {
+ case 2:
+ temp.add("待发货");
+ break;
+ case 3:
+ temp.add("已发货");
+ break;
+ default:
+ }
+ Long id = item.getId();
+ MallExpressInfo mallExpressInfo = mallExpressInfoMapper.selectByOrderId(id);
+ if(ObjectUtil.isNotNull(mallExpressInfo)){
+ temp.add(mallExpressInfo.getExpressNo());
+ temp.add(mallExpressInfo.getExpressCom());
+ temp.add(mallExpressInfo.getExpressCode());
+ }
list.add(temp);
}
}
@@ -360,4 +419,31 @@
return new FebsResponse().success();
}
+ /**
+ * 评论列表
+ */
+ @GetMapping("commentList")
+ public FebsResponse getCommentList(AdminMallGoodsCommentDto adminMallGoodsCommentDto, QueryRequest request) {
+ Map<String, Object> data = getDataTable(adminMallOrderService.getCommentListInPage(adminMallGoodsCommentDto, request));
+ return new FebsResponse().success().data(data);
+ }
+
+ /**
+ * 评论列表-显示评论
+ */
+ @GetMapping("showStateSwitchOn/{id}")
+ @ControllerEndpoint(operation = "评论列表-显示评论", exceptionMessage = "设置失败")
+ public FebsResponse showStateSwitchOn(@NotNull(message = "{required}") @PathVariable Long id) {
+ return adminMallOrderService.showStateSwitchOn(id);
+ }
+
+ /**
+ * 评论列表-不显示评论
+ */
+ @GetMapping("showStateSwitchOff/{id}")
+ @ControllerEndpoint(operation = "评论列表-显示评论", exceptionMessage = "设置失败")
+ public FebsResponse showStateSwitchOff(@NotNull(message = "{required}") @PathVariable Long id) {
+ return adminMallOrderService.showStateSwitchOff(id);
+ }
+
}
--
Gitblit v1.9.1