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 | 121 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 118 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 af091f8..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,27 +5,34 @@
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;
+import cc.mrbird.febs.common.utils.SpringContextHolder;
import cc.mrbird.febs.common.utils.excl.ExcelSheetPO;
import cc.mrbird.febs.common.utils.excl.ExcelUtil;
import cc.mrbird.febs.common.utils.excl.ExcelVersion;
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.MallOrderInfoMapper;
-import cc.mrbird.febs.mall.mapper.MallOrderRefundOperationMapper;
+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;
import cc.mrbird.febs.mall.vo.AdminMallOrderRefundAddressVo;
+import cc.mrbird.febs.pay.model.OrderStateDto;
+import cc.mrbird.febs.pay.service.IXcxPayService;
+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;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -49,6 +56,27 @@
private final IAdminMallOrderService adminMallOrderService;
private final MallOrderInfoMapper mallOrderInfoMapper;
+ private final SpringContextHolder springContextHolder;
+
+ 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);
+ }
/**
* 订单列表
@@ -59,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);
}
@@ -285,6 +323,83 @@
return null;
}
+ @GetMapping("confirmOrder")
+ @ControllerEndpoint(operation = "确认货到达自提点", exceptionMessage = "操作失败")
+ public FebsResponse confirmOrder(MallOrderInfo mallOrderInfoDto){
+ String orderIds = mallOrderInfoDto.getOrderIds();
+ List<String> ids = StrUtil.splitTrim(orderIds, ",");
+ for(String id : ids){
+ long orderId = Long.parseLong(id);
+ MallOrderInfo mallOrderInfo = mallOrderInfoMapper.selectById(orderId);
+ if(ObjectUtil.isEmpty(mallOrderInfo)){
+// 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("配送状态不是配送中状态");
+ }
+ 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);
+// iXcxPayService.uniformMessageSend(orderStateDto);
+ }
+ return new FebsResponse().success();
+ }
+
+ /**
+ * 根据用户ID和订单ID获取所购买商品名称
+ * @return 所含商品名称（多个以"，"隔开）
+ */
+ public String getProductNames(Long memberId, Long orderId) {
+ MallOrderInfo mallOrderInfo = mallOrderInfoMapper.selectOrderByMemberIdAndId(memberId, orderId);
+ List<MallOrderItem> details = mallOrderInfo.getItems();
+ if (CollectionUtils.isEmpty(details)) {
+ return "";
+ }
+ StringBuffer productNameBuffer = new StringBuffer();
+ Integer maxLength = 30;
+ for (int i = 0; i< details.size(); i++) {
+ MallOrderItem mallOrderItem = details.get(i);
+ String goodsName = mallOrderItem.getGoodsName();
+ if (goodsName == null) {
+ continue;
+ }
+ if (i == 0 && goodsName.length() > maxLength) {
+ productNameBuffer.append(goodsName.substring(0, maxLength) + "...");
+ break;
+ }
+ if ((productNameBuffer.length() + goodsName.length()) > maxLength) {
+ productNameBuffer.append("等");
+ break;
+ }
+ productNameBuffer.append(goodsName + ",");
+ }
+ String productNames = productNameBuffer.toString();
+ if (productNames.endsWith(",")) {
+ productNames = productNames.substring(0, productNames.length() - 1);
+ }
+ if (productNames.endsWith(",等")) {
+ productNames = productNames.substring(0, productNames.length() - 2) + "等";
+ }
+ return productNames;
+ }
+
@GetMapping("exportOrderListOne")
@ControllerEndpoint(operation = "订单列表", exceptionMessage = "导出失败")
public FebsResponse exportOrderListOne(MallOrderInfo mallOrderInfo, HttpServletResponse response) throws IOException {
@@ -328,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