From 0ef2ea54b85d11f537a761e2028a40ec1ec1df1b Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 13 Feb 2023 15:55:31 +0800
Subject: [PATCH] 订单发货设置
---
src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java | 74 ++++++++++++++++++++++++++-----------
1 files changed, 52 insertions(+), 22 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 08902f1..ae86f42 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java
@@ -9,6 +9,7 @@
import cc.mrbird.febs.common.enumerates.OrderDeliveryStateEnum;
import cc.mrbird.febs.common.enumerates.OrderStatusEnum;
import cc.mrbird.febs.common.exception.FebsException;
+import cc.mrbird.febs.common.utils.FebsUtil;
import cc.mrbird.febs.common.utils.SpringContextHolder;
import cc.mrbird.febs.common.utils.excl.ExcelSheetPO;
import cc.mrbird.febs.common.utils.excl.ExcelUtil;
@@ -25,6 +26,7 @@
import cc.mrbird.febs.pay.service.IXcxPayService;
import cc.mrbird.febs.pay.util.WechatConfigure;
import cc.mrbird.febs.system.entity.Dept;
+import cc.mrbird.febs.system.entity.User;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
@@ -276,13 +278,24 @@
String title = "订单列表";
orderSheet.setSheetName(title);
orderSheet.setTitle(title);
- String[] header = {"订单编号", "订单金额", "下单时间", "配送方式", "收货姓名", "收货电话", "收货地址", "商品名称", "订单状态", "物流单号", "物流公司", "物流公司码"};
+// String[] header = {"订单编号", "订单金额", "下单时间", "配送方式", "收货姓名", "收货电话", "收货地址", "商品名称", "订单状态", "物流单号", "物流公司", "物流公司码"};
+ String[] header = {"订单编号", "订单金额", "下单时间", "配送方式", "收货姓名", "收货电话", "收货地址", "商品详情", "物流单号", "物流公司", "物流公司码"};
orderSheet.setHeaders(header);
QueryRequest request = new QueryRequest();
request.setPageNum(1);
request.setPageSize(9999);
- List<MallOrderInfo> dataList = adminMallOrderService.findOrderListInPage(mallOrderInfo, request).getRecords();
+ List<MallOrderInfo> dataList = new ArrayList<>();
+ String orderIds = mallOrderInfo.getOrderIds();
+ List<String> ids = StrUtil.splitTrim(orderIds, ",");
+ for(String id : ids){
+ long orderId = Long.parseLong(id);
+ MallOrderInfo mallOrderInfo1 = mallOrderInfoMapper.selectAllOrderInfoByIdAndTakeUniqueCode(orderId,mallOrderInfo.getTakeUniqueCode());
+ if(ObjectUtil.isNotEmpty(mallOrderInfo1)){
+ dataList.add(mallOrderInfo1);
+ }
+ }
+// List<MallOrderInfo> dataList = adminMallOrderService.findOrderListInPage(mallOrderInfo, request).getRecords();
List<List<Object>> list = new ArrayList<>();
if (dataList.size() > 0) {
for (MallOrderInfo item : dataList) {
@@ -309,7 +322,7 @@
temp.add("");
}
- temp.add(item.getStatus());
+// temp.add(item.getStatus());
list.add(temp);
}
}
@@ -344,19 +357,19 @@
mallOrderInfo.setDeliveryState(OrderDeliveryStateEnum.DELIVERY_FINISH.getValue());
mallOrderInfoMapper.updateById(mallOrderInfo);
- OrderStateDto orderStateDto = new OrderStateDto();
- String productNames = getProductNames(mallOrderInfo.getMemberId(), mallOrderInfo.getId());
- orderStateDto.setGoodsName(StrUtil.sub(productNames,0,15)+"...");
- String takeUniqueCode = mallOrderInfo.getTakeUniqueCode();
- MallTeamLeader mallTeamLeader = mallTeamLeaderMapper.selectLeaderByUniqueCode(takeUniqueCode);
- orderStateDto.setAddressArea(mallTeamLeader.getAddressArea());
- orderStateDto.setDetailAddress(StrUtil.sub(mallTeamLeader.getDetailAddress(),0,20)+"...");
- orderStateDto.setRemark("果蔬等生鲜,请尽快取货");
- orderStateDto.setLeaderPhone(mallTeamLeader.getPhone());
- orderStateDto.setOpenId(mallMemberMapper.selectById(mallOrderInfo.getMemberId()).getOpenId());
- DataDictionaryCustom dataDictionaryCustom = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.WX_TEMPLATE_ID_THREE.getType(), DataDictionaryEnum.WX_TEMPLATE_ID_THREE.getCode());
- orderStateDto.setTemplateId(dataDictionaryCustom.getValue());
- iXcxPayService.pushOrderToAddress(orderStateDto);
+// OrderStateDto orderStateDto = new OrderStateDto();
+// String productNames = getProductNames(mallOrderInfo.getMemberId(), mallOrderInfo.getId());
+// orderStateDto.setGoodsName(StrUtil.sub(productNames,0,15)+"...");
+// String takeUniqueCode = mallOrderInfo.getTakeUniqueCode();
+// MallTeamLeader mallTeamLeader = mallTeamLeaderMapper.selectLeaderByUniqueCode(takeUniqueCode);
+// orderStateDto.setAddressArea(mallTeamLeader.getAddressArea());
+// orderStateDto.setDetailAddress(StrUtil.sub(mallTeamLeader.getDetailAddress(),0,20)+"...");
+// orderStateDto.setRemark("果蔬等生鲜,请尽快取货");
+// orderStateDto.setLeaderPhone(mallTeamLeader.getPhone());
+// orderStateDto.setOpenId(mallMemberMapper.selectById(mallOrderInfo.getMemberId()).getOpenId());
+// DataDictionaryCustom dataDictionaryCustom = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.WX_TEMPLATE_ID_THREE.getType(), DataDictionaryEnum.WX_TEMPLATE_ID_THREE.getCode());
+// orderStateDto.setTemplateId(dataDictionaryCustom.getValue());
+// iXcxPayService.pushOrderToAddress(orderStateDto);
// iXcxPayService.uniformMessageSend(orderStateDto);
}
return new FebsResponse().success();
@@ -370,9 +383,9 @@
for(String id : ids){
long orderId = Long.parseLong(id);
MallOrderInfo mallOrderInfo = mallOrderInfoMapper.selectByIdAndTakeUniqueCode(orderId,mallOrderInfoDto.getTakeUniqueCode());
- if(ObjectUtil.isEmpty(mallOrderInfo)){
- return new FebsResponse().fail().message("请确认订单是否属于该团长");
- }
+// if(ObjectUtil.isEmpty(mallOrderInfo)){
+// return new FebsResponse().fail().message("请确认订单是否属于该团长");
+// }
Integer status = mallOrderInfo.getStatus() == null ? 0 : mallOrderInfo.getStatus();
Integer deliveryState = mallOrderInfo.getDeliveryState() == null ? 0 : mallOrderInfo.getDeliveryState();
if(OrderStatusEnum.WAIT_SHIPPING.getValue() != status){
@@ -436,7 +449,9 @@
orderSheet.setSheetName(title);
orderSheet.setTitle(title);
- String[] header = {"订单编号", "订单详情（商品*数量）", "订单金额", "用户提货码", "配送方式", "用户姓名", "用户电话", "团长名称", "团长手机号码", "自提点名称"};
+// String[] header = {"订单编号", "订单详情（商品*数量）", "订单金额", "用户提货码", "配送方式", "用户姓名", "用户电话","用户地址", "团长名称", "团长手机号码", "自提点名称"};
+
+ String[] header = {"订单编号", "订单详情（商品*数量）", "订单金额", "用户提货码", "用户姓名", "用户电话","用户地址", "团长名称", "团长手机号码", "自提点名称"};
orderSheet.setHeaders(header);
QueryRequest request = new QueryRequest();
@@ -474,9 +489,10 @@
}
temp.add(item.getAmount());
temp.add(item.getTakeCode());
- temp.add("自提");
+// temp.add("自提");
temp.add(item.getName());
temp.add(item.getPhone());
+ temp.add(item.getAddress());
temp.add(item.getLeaderName());
temp.add(item.getLeaderPhone());
@@ -505,7 +521,7 @@
}
String fileName = file.getOriginalFilename();
- String dirPath = "/Users/helius/Documents/";
+ String dirPath = "/home/javaweb/webresource/qianAYi/";
File saveFile = new File(new File(dirPath).getAbsolutePath() + File.separator + fileName);
if (!saveFile.exists()) {
@@ -603,4 +619,18 @@
return adminMallOrderService.showStateSwitchOff(id);
}
+ /**
+ * 订单列表-统计商品份数
+ */
+ @GetMapping("goodsStatistics")
+ public FebsResponse goodsStatistics(MallOrderItem mallOrderItem, QueryRequest request, Integer parentId) {
+ if (parentId == null) {
+ ViewMallOrderController.orderIdsStr = "";
+ }
+ long[] longs = StrUtil.splitToLong(ViewMallOrderController.orderIdsStr, ',');
+ mallOrderItem.setOrderIdsStr(longs);
+ Map<String, Object> data = getDataTable(adminMallOrderService.goodsStatistics(mallOrderItem,request));
+ return new FebsResponse().success().data(data);
+ }
+
}
--
Gitblit v1.9.1