From fd45fcbd496bbeaf9ee18edd8f2f858cf9cebaf3 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 24 一月 2025 16:47:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java | 152 +++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 136 insertions(+), 16 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
index bc929ba..ef78283 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
@@ -1,12 +1,15 @@
package com.ruoyi.order.controller;
+import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.ruoyi.account.api.feignClient.UserAddressClient;
import com.ruoyi.account.api.model.UserAddress;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.common.core.web.page.TableDataInfo;
@@ -14,9 +17,12 @@
import com.ruoyi.order.enums.OrderStatus;
import com.ruoyi.order.mapper.OrderMapper;
import com.ruoyi.order.model.Order;
+import com.ruoyi.order.model.RefundPass;
import com.ruoyi.order.service.CommissionService;
import com.ruoyi.order.service.OrderService;
+import com.ruoyi.order.service.RefundPassService;
import com.ruoyi.order.util.payment.model.RefundCallbackResult;
+import com.ruoyi.order.util.vo.MapTrackKD100Vo;
import com.ruoyi.order.vo.*;
import com.ruoyi.other.api.domain.BaseSetting;
import com.ruoyi.other.api.feignClient.BaseSettingClient;
@@ -26,6 +32,7 @@
import io.swagger.annotations.*;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
@@ -66,6 +73,8 @@
private OrderMapper orderMapper;
@Resource
private SysUserClient sysUserClient;
+ @Resource
+ private RefundPassService refundPassService;
/**
@@ -124,9 +133,9 @@
@ApiImplicitParams({
@ApiImplicitParam(value = "订单id", name = "id", required = true, dataType = "String"),
})
- @GetMapping("/writeOff/{id}/{shopId}")
- public R<Void> writeOff(@PathVariable("id") String id, @PathVariable("shopId") Integer shopId){
- orderService.writeOff(id, shopId);
+ @GetMapping("/writeOff")
+ public R<Void> writeOff(String code, Integer shopId, String technicianId){
+ orderService.writeOff(code, shopId, technicianId);
return R.ok();
}
@@ -202,6 +211,7 @@
public R<Void> updateOrderStatus(@RequestBody Order order){
Order order1 = orderService.getById(order.getId());
order1.setOrderStatus(order.getOrderStatus());
+ order1.setOldOrderStatus(order.getOldOrderStatus());
orderService.updateById(order1);
return R.ok();
}
@@ -226,12 +236,31 @@
@PostMapping("/byUserId")
- public R<List<Order>> byUserId(@RequestParam("appUserId") Long appUserId){
- return R.ok(orderService.lambdaQuery().eq(Order::getAppUserId, appUserId).list());
+ public R<List<Order>> byUserId(@RequestParam("appUserId") Long appUserId,@RequestParam("shopId") Integer shopId){
+ List<Order> list = orderService.lambdaQuery()
+ .eq(Order::getAppUserId, appUserId)
+ .eq(null != shopId && -1 != shopId, Order::getShopId, shopId)
+ .eq(Order::getDistributionMode, 1)
+ .eq(Order::getPayStatus, 2)
+ .isNull(Order::getRefundStatus)
+ .eq(Order::getDelFlag, 0)
+ .notIn(Order::getOrderStatus, 5, 6).list();
+ return R.ok(list);
}
@PostMapping("/byShopId")
public R<List<Order>> byShopId(@RequestParam("shopId") Integer shopId){
return R.ok(orderService.lambdaQuery().isNotNull(Order::getEndTime).eq(Order::getShopId, shopId).list());
+ }
+ @PostMapping("/byShopIdAndUserId")
+ public R<List<Order>> byShopIdAndUserId(@RequestParam("appUserId") Long appUserId,@RequestParam("shopId") Integer shopId){
+ List<Order> list = orderService.lambdaQuery().isNotNull(Order::getEndTime)
+ .eq(null != shopId && -1 != shopId, Order::getShopId, shopId)
+ .eq(Order::getAppUserId, appUserId)
+ .eq(Order::getPayStatus, 2)
+ .isNull(Order::getRefundStatus)
+ .eq(Order::getDelFlag, 0)
+ .notIn(Order::getOrderStatus, 5, 6).list();
+ return R.ok(list);
}
@@ -242,7 +271,7 @@
@PostMapping("/confirmDelivery")
@ApiOperation(value = "已发货操作", tags = {"管理后台-订单管理"})
public R confirmDelivery(@RequestBody ConfirmDelivery confirmDelivery){
- return orderService.confirmDelivery(confirmDelivery.getOrderId(), confirmDelivery.getCode());
+ return orderService.confirmDelivery(confirmDelivery);
}
@@ -263,6 +292,11 @@
@ApiOperation(value = "查询订单详情", tags = {"管理后台-订单管理"})
public R<OrderInfoVo> getOrderInfo(@PathVariable("orderId") Long orderId){
OrderInfoVo orderInfo = orderService.getOrderInfo(orderId);
+ RefundPass one = refundPassService.getOne(new LambdaQueryWrapper<RefundPass>().eq(RefundPass::getOrderId, orderId)
+ .eq(RefundPass::getDelFlag, 0).last(" order by create_time desc limit 0,1"));
+ if (one!=null){
+ orderInfo.setRefundPassId(one.getId().toString());
+ }
return R.ok(orderInfo);
}
@@ -283,12 +317,19 @@
Long userid = tokenService.getLoginUser().getUserid();
SysUser sysUser = sysUserClient.getSysUser(userid).getData();
- List<Order> orderList = orderService.list(new LambdaQueryWrapper<Order>().eq(sysUser.getRoleType() == 2, Order::getShopId, sysUser.getObjectId())
- .between(Order::getCreateTime, LocalDateTime.parse(startTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")), LocalDateTime.parse(endTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))));
+ List<Order> orderList = orderService.list(new LambdaQueryWrapper<Order>()
+ .ne(Order::getOrderStatus,5)
+ .eq(sysUser.getRoleType() == 2, Order::getShopId, sysUser.getObjectId())
+ .between(Order::getCreateTime, LocalDateTime.parse(startTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")), LocalDateTime.parse(endTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")))
+ .orderByAsc(Order::getCreateTime));
- Map<String, List<Order>> map = orderList.stream().collect(Collectors.groupingBy(item -> item.getCreateTime()
- .format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))));
+ Map<String, List<Order>> map = orderList.stream()
+ .collect(Collectors.groupingBy(
+ item -> item.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")),
+ TreeMap::new, // 使用 TreeMap 按键排序
+ Collectors.toList()
+ ));
List<OrderStatisticsDetail> orderStatisticsDetails = new ArrayList<>();
map.forEach((key, value) -> {
@@ -302,13 +343,15 @@
for (Order order : value) {
if (order.getOrderType().equals(1)) {
serviceTotal++;
- serviceTotalMoney = serviceTotalMoney.add(order.getPaymentAmount());
+ serviceTotalMoney = serviceTotalMoney.add(order.getTotalAmount());
+ total++;
+ totalMoney = totalMoney.add(order.getTotalAmount());
}else if (order.getOrderType().equals(2)){
singleTotal++;
- singleTotalMoney = singleTotalMoney.add(order.getPaymentAmount());
+ singleTotalMoney = singleTotalMoney.add(order.getTotalAmount());
+ total++;
+ totalMoney = totalMoney.add(order.getTotalAmount());
}
- total++;
- totalMoney = totalMoney.add(order.getPaymentAmount());
}
orderStatisticsDetail.setDate(key);
orderStatisticsDetail.setServiceTotal(serviceTotal);
@@ -334,7 +377,7 @@
} catch (ParseException e) {
throw new RuntimeException(e);
}
- }).reversed())
+ }))
.collect(Collectors.toList());
orderStatistics.setOrderStatisticsDetailList(sortedDetails);
}
@@ -398,7 +441,7 @@
*/
@PostMapping("/getGoodsSaleNum")
public R<Integer> getGoodsSaleNum(@RequestParam("goodsId") Integer goodsId, @RequestParam("type") Integer type){
- Integer goodsSaleNum = orderService.getGoodsSaleNum(goodsId, type);
+ Integer goodsSaleNum = orderService.getGoodsSaleNum(goodsId, type, null);
return R.ok(goodsSaleNum);
}
@@ -429,5 +472,82 @@
Set<Long> collect = list.stream().map(Order::getAppUserId).collect(Collectors.toSet());
return R.ok(collect);
}
+
+
+ /**
+ * 获取订单快递明细
+ * @param id
+ * @return
+ */
+ @GetMapping("/getOrderExpress/{id}")
+ @ApiOperation(value = "获取订单快递明细", tags = {"小程序-订单管理"})
+ public R<MapTrackKD100Vo> getOrderExpress(@PathVariable("id") Long id){
+ Order order = orderService.getById(id);
+ String expressResult = order.getExpressResult();
+ if(StringUtils.isNotEmpty(expressResult)){
+ MapTrackKD100Vo mapTrackKD100Vo = JSON.parseObject(expressResult, MapTrackKD100Vo.class);
+ return R.ok(mapTrackKD100Vo);
+ }
+ return R.ok();
+ }
+
+
+ /**
+ * 根据id获取订单详情
+ * @param id
+ * @return
+ */
+ @PostMapping("/getOrderById")
+ public R<Order> getOrderById(@RequestParam("id") Long id){
+ Order order = orderService.getById(id);
+ return R.ok(order);
+ }
+
+
+ /**
+ * 修改订单
+ * @param order
+ * @return
+ */
+ @PostMapping("/editOrder")
+ public R editOrder(@RequestBody Order order){
+ orderService.updateById(order);
+ return R.ok();
+ }
+
+
+ /**
+ * 导入物流信息
+ */
+ @PostMapping("/importExpress")
+ public R importExpress(@RequestParam("file") MultipartFile file){
+ orderService.importExpress(file);
+ return R.ok();
+ }
+
+ /**
+ * 导出订单信息
+ */
+ @GetMapping("/exportExpress")
+ public void exportExpress(HttpServletResponse response,OrderPageList orderPage){
+ PageInfo<OrderPageListVo> orderPageList = orderService.getOrderPageList(orderPage);
+ List<OrderPageListVo> list = orderPageList.getRecords();
+ ExcelUtil<OrderPageListVo> util = new ExcelUtil<OrderPageListVo>(OrderPageListVo.class);
+ util.exportExcel(response, list, "订单数据");
+ }
+
+
+ /**
+ * 获取用户订单数量
+ * @param appUserId
+ * @return
+ */
+ @PostMapping("/getOrderCountByAppUserId")
+ public R<Long> getOrderCountByAppUserId(@RequestParam("id") Long appUserId){
+ long count = orderService.count(new LambdaQueryWrapper<Order>().eq(Order::getDelFlag, 0)
+ .eq(Order::getAppUserId, appUserId).in(Order::getOrderStatus, Arrays.asList(1, 2, 3, 4, 7, 8))
+ .eq(Order::getPayStatus, 2));
+ return R.ok(count);
+ }
}
--
Gitblit v1.7.1