From 0c568e9f295471f6b80e0b6d156ae890163b19bf Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 13 Feb 2023 15:06:56 +0800
Subject: [PATCH] 订单发货设置
---
src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java | 47 +++++++++++++++++++++++++++++------------------
1 files changed, 29 insertions(+), 18 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 ac9a274..03897f1 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java
@@ -278,13 +278,24 @@
String title = "订单列表";
orderSheet.setSheetName(title);
orderSheet.setTitle(title);
+// 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) {
@@ -346,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();
@@ -372,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){
@@ -510,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()) {
--
Gitblit v1.9.1