From 19ab08f041d6773f22594ed393105c623e09f543 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 23 Sep 2022 17:00:01 +0800
Subject: [PATCH] 20220902
---
src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java | 54 +++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 41 insertions(+), 13 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 a3e1ece..c019b2e 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java
@@ -5,6 +5,7 @@
import cc.mrbird.febs.common.entity.DeptTree;
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.entity.QueryRequest;
+import cc.mrbird.febs.common.enumerates.DataDictionaryEnum;
import cc.mrbird.febs.common.enumerates.OrderDeliveryStateEnum;
import cc.mrbird.febs.common.enumerates.OrderStatusEnum;
import cc.mrbird.febs.common.exception.FebsException;
@@ -15,10 +16,7 @@
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.MallMemberMapper;
-import cc.mrbird.febs.mall.mapper.MallOrderInfoMapper;
-import cc.mrbird.febs.mall.mapper.MallOrderRefundOperationMapper;
-import cc.mrbird.febs.mall.mapper.MallTeamLeaderMapper;
+import cc.mrbird.febs.mall.mapper.*;
import cc.mrbird.febs.mall.service.IAdminMallGoodsService;
import cc.mrbird.febs.mall.service.IAdminMallOrderService;
import cc.mrbird.febs.mall.vo.AdminAddAddressTreeVo;
@@ -28,6 +26,7 @@
import cc.mrbird.febs.pay.util.WechatConfigure;
import cc.mrbird.febs.system.entity.Dept;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
@@ -62,6 +61,22 @@
private final IXcxPayService iXcxPayService;
private final MallTeamLeaderMapper mallTeamLeaderMapper;
private final MallMemberMapper mallMemberMapper;
+ private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
+
+
+
+ /**
+ * 订单多次退款列表
+ *
+ * @param mallRefundEntity
+ * @param request
+ * @return
+ */
+ @GetMapping("orderRefundList")
+ public FebsResponse orderRefundList(MallRefundEntity mallRefundEntity, QueryRequest request) {
+ Map<String, Object> data = getDataTable(adminMallOrderService.getOrderRefundListInPage(mallRefundEntity, request));
+ return new FebsResponse().success().data(data);
+ }
/**
* 订单列表
@@ -72,6 +87,16 @@
*/
@GetMapping("orderList")
public FebsResponse getOrderList(MallOrderInfoDto mallOrderInfo, QueryRequest request) {
+ String startTime = mallOrderInfo.getStartTime();
+ String endTime = mallOrderInfo.getEndTime();
+ if(StrUtil.isNotBlank(startTime) && StrUtil.isNotBlank(endTime)){
+ DateTime dateStartTime= DateUtil.parseDate(startTime);
+ DateTime dateEndTime = DateUtil.parseDate(endTime);
+ int compare = DateUtil.compare(dateStartTime, dateEndTime);
+ if(compare >= 0){
+ return new FebsResponse().fail().message("请输入正确的开始时间和结束时间");
+ }
+ }
Map<String, Object> data = getDataTable(adminMallOrderService.getOrderListInPage(mallOrderInfo, request));
return new FebsResponse().success().data(data);
}
@@ -307,29 +332,32 @@
long orderId = Long.parseLong(id);
MallOrderInfo mallOrderInfo = mallOrderInfoMapper.selectById(orderId);
if(ObjectUtil.isEmpty(mallOrderInfo)){
- continue;
-// return new FebsResponse().fail().message("订单不存在");
+// continue;
+ return new FebsResponse().fail().message("订单不存在");
}
Integer status = mallOrderInfo.getStatus() == null ? 0 : mallOrderInfo.getStatus();
Integer deliveryState = mallOrderInfo.getDeliveryState() == null ? 0 : mallOrderInfo.getDeliveryState();
if(OrderStatusEnum.WAIT_FINISH.getValue() != status || 2 != deliveryState){
- continue;
-// return new FebsResponse().fail().message("订单不是待确认到货状态");
+// continue;
+ return new FebsResponse().fail().message("配送状态不是配送中状态");
}
mallOrderInfo.setDeliveryState(OrderDeliveryStateEnum.DELIVERY_FINISH.getValue());
mallOrderInfoMapper.updateById(mallOrderInfo);
OrderStateDto orderStateDto = new OrderStateDto();
- orderStateDto.setOrderNo(mallOrderInfo.getOrderNo());
String productNames = getProductNames(mallOrderInfo.getMemberId(), mallOrderInfo.getId());
- orderStateDto.setGoodsName(StrUtil.isEmpty(productNames)?"商品":productNames);
- orderStateDto.setOrderState("已送达自提点");
+ 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());
- orderStateDto.setTemplateId(WechatConfigure.WX_ORDER_STATEMSG_TEMPLATE_ID);
+ 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();
}
@@ -415,7 +443,7 @@
temp.add(item.getLeaderName());
temp.add(item.getLeaderPhone());
temp.add(item.getAddressArea());
- temp.add(item.getProvince()+item.getCity()+item.getTownship()+item.getDetailAddress());
+ temp.add(item.getDetailAddress());
list.add(temp);
adminMallOrderService.updateOrderStateAndDeliveryState(item.getId(), OrderStatusEnum.WAIT_FINISH.getValue(), OrderDeliveryStateEnum.DELIVERY_ING.getValue());
--
Gitblit v1.9.1