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 | 370 ++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 328 insertions(+), 42 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 3a6b22c..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,29 +1,51 @@
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;
import com.ruoyi.common.security.service.TokenService;
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;
+import com.ruoyi.system.api.domain.SysUser;
+import com.ruoyi.system.api.feignClient.SysUserClient;
import com.ruoyi.system.api.model.LoginUser;
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;
+import javax.validation.constraints.NotBlank;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.math.BigDecimal;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
-import java.util.List;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* <p>
@@ -47,6 +69,12 @@
private CommissionService commissionService;
@Resource
private BaseSettingClient baseSettingClient;
+ @Resource
+ private OrderMapper orderMapper;
+ @Resource
+ private SysUserClient sysUserClient;
+ @Resource
+ private RefundPassService refundPassService;
/**
@@ -54,7 +82,7 @@
*/
@ApiOperation(value = "我的订单列表", tags = {"小程序-个人中心-我的订单"})
@ApiImplicitParams({
- @ApiImplicitParam(value = "订单状态", name = "status", required = true, dataType = "int", paramType="query"),
+ @ApiImplicitParam(value = "订单状态", name = "status", required = true, dataType = "int"),
})
@GetMapping("/getMyOrderList")
public TableDataInfo<OrderVO> getMyOrderList(@ApiParam("订单状态") Integer status){
@@ -76,7 +104,7 @@
*/
@ApiOperation(value = "订单详情", tags = {"小程序-个人中心-我的订单-订单详情"})
@ApiImplicitParams({
- @ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int", paramType="query"),
+ @ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"),
})
@GetMapping("/detail/{orderId}")
public R<OrderDetailVO> detail(@PathVariable("orderId") Long orderId){
@@ -103,11 +131,11 @@
*/
@ApiOperation(value = "订单核销", tags = {"小程序-个人中心-门店管理"})
@ApiImplicitParams({
- @ApiImplicitParam(value = "订单号", name = "code", required = true, dataType = "String", paramType="query"),
+ @ApiImplicitParam(value = "订单id", name = "id", required = true, dataType = "String"),
})
- @GetMapping("/writeOff/{code}/{shopId}")
- public R<Void> writeOff(@PathVariable("code") String code, @PathVariable("shopId") Integer shopId){
- orderService.writeOff(code, shopId);
+ @GetMapping("/writeOff")
+ public R<Void> writeOff(String code, Integer shopId, String technicianId){
+ orderService.writeOff(code, shopId, technicianId);
return R.ok();
}
@@ -116,14 +144,11 @@
*/
@ApiOperation(value = "取消订单", tags = {"小程序-个人中心-我的订单"})
@ApiImplicitParams({
- @ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int", paramType="query"),
+ @ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"),
})
@GetMapping("/cancel/{orderId}")
- public R<Void> cancel(@PathVariable("orderId") Long orderId){
- orderService.update(new LambdaUpdateWrapper<Order>()
- .eq(Order::getId, orderId)
- .set(Order::getOrderStatus, OrderStatus.CANCELLED.getCode()));
- return R.ok();
+ public R cancel(@PathVariable("orderId") Long orderId){
+ return orderService.cancel(orderId);
}
/**
@@ -131,17 +156,10 @@
*/
@ApiOperation(value = "确认收货", tags = {"小程序-个人中心-我的订单"})
@ApiImplicitParams({
- @ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int", paramType="query"),
+ @ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"),
})
@GetMapping("/confirm/{orderId}")
public R<Void> confirm(@PathVariable("orderId") Long orderId){
- boolean update = orderService.update(new LambdaUpdateWrapper<Order>()
- .eq(Order::getId, orderId)
- .eq(Order::getOrderStatus, OrderStatus.PENDING_RECEIPT.getCode())
- .set(Order::getOrderStatus, OrderStatus.COMPLETED.getCode()));
- if(!update){
- return R.fail("订单状态异常");
- }
R<BaseSetting> baseSettingR = baseSettingClient.getBaseSetting(5);
if (R.isError(baseSettingR)) {
return R.fail("售后设置获取失败");
@@ -153,7 +171,11 @@
String content = baseSetting.getContent();
JSONObject jsonObject = JSONObject.parseObject(content);
Long days = jsonObject.getLong("days");
- commissionService.addToCommissionDelayQueue(orderId, LocalDateTime.now().plusDays(days));
+ Order order = orderService.getById(orderId);
+ order.setAfterSaleTime(LocalDateTime.now().plusDays(days));
+ order.setIsCommission(0);
+ order.setOrderStatus(OrderStatus.COMPLETED.getCode());
+ orderService.updateById(order);
return R.ok();
}
@@ -162,7 +184,7 @@
*/
@ApiOperation(value = "更换收货地址", tags = {"小程序-个人中心-我的订单"})
@ApiImplicitParams({
- @ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int", paramType="query"),
+ @ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"),
})
@GetMapping("/changeAddress")
public R<Void> changeAddress(@RequestParam("orderId") Long orderId, @RequestParam("addressId") Long addressId){
@@ -182,10 +204,14 @@
* 更新订单状态
*/
@ApiOperation(value = "更新订单状态", tags = {"后台-订单管理"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "订单对象", name = "order", required = true, dataType = "Order"),
+ })
@PostMapping("/updateOrderStatus")
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();
}
@@ -195,7 +221,7 @@
* 预约技师
*/
@PostMapping("/subscribe")
- public R<Void> subscribe(@RequestParam("id") Long id ,@RequestParam("technicianId") Integer technicianId){
+ public R<Void> subscribe(@RequestParam(value = "id", required = false) Long id ,@RequestParam(value = "technicianId", required = false) Integer technicianId){
Order order = orderService.getById(id);
order.setTechnicianId(technicianId);
orderService.updateById(order);
@@ -210,42 +236,51 @@
@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).groupBy(Order::getAppUserId).list());
+ 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);
}
- @ResponseBody
- @GetMapping("/getOrderPageList")
- @ApiOperation(value = "获取订单列表", tags = {"管理后台-订单管理", "门店后台-订单管理"})
- public TableDataInfo<OrderPageListVo> getOrderPageList(OrderPageList orderPageList){
- startPage();
- List<OrderPageListVo> list = orderService.getOrderPageList(orderPageList);
- return getDataTable(list);
- }
- @ResponseBody
- @PutMapping("/confirmDelivery/{orderId}")
+
+ @PostMapping("/confirmDelivery")
@ApiOperation(value = "已发货操作", tags = {"管理后台-订单管理"})
- public R confirmDelivery(@PathVariable("orderId") String orderId, String code){
- return orderService.confirmDelivery(orderId, code);
+ public R confirmDelivery(@RequestBody ConfirmDelivery confirmDelivery){
+ return orderService.confirmDelivery(confirmDelivery);
}
- @ResponseBody
@PutMapping("/cancelOrder/{orderId}")
@ApiOperation(value = "取消订单操作", tags = {"管理后台-订单管理"})
public R cancelOrder(@PathVariable("orderId") Long orderId){
return orderService.cancelOrder(orderId);
}
- @ResponseBody
@PutMapping("/receivingOperation/{orderId}")
@ApiOperation(value = "收货操作", tags = {"管理后台-订单管理"})
public R receivingOperation(@PathVariable("orderId") Long orderId){
@@ -253,15 +288,266 @@
}
- @ResponseBody
@GetMapping("/getOrderInfo/{orderId}")
@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);
}
+ @GetMapping("/getOrderPageList")
+// @ApiOperation(value = "获取订单列表", tags = {"管理后台-订单管理", "门店后台-订单管理"})
+ public R<PageInfo<OrderPageListVo>> getOrderPageList(OrderPageList orderPageList){
+ return R.ok(orderService.getOrderPageList(orderPageList));
+ }
+
+ /**
+ * 订单统计
+ */
+ @GetMapping("/getOrderStatistics")
+ @ApiOperation(value = "订单统计", tags = {"管理后台-首页统计"})
+ public R<OrderStatistics> getOrderStatistics(@RequestParam("startTime") String startTime,
+ @RequestParam("endTime") String endTime){
+
+ Long userid = tokenService.getLoginUser().getUserid();
+ SysUser sysUser = sysUserClient.getSysUser(userid).getData();
+ 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")),
+ TreeMap::new, // 使用 TreeMap 按键排序
+ Collectors.toList()
+ ));
+
+ List<OrderStatisticsDetail> orderStatisticsDetails = new ArrayList<>();
+ map.forEach((key, value) -> {
+ int serviceTotal = 0;
+ int singleTotal = 0;
+ int total = 0;
+ BigDecimal totalMoney = BigDecimal.ZERO;
+ BigDecimal serviceTotalMoney = BigDecimal.ZERO;
+ BigDecimal singleTotalMoney = BigDecimal.ZERO;
+ OrderStatisticsDetail orderStatisticsDetail = new OrderStatisticsDetail();
+ for (Order order : value) {
+ if (order.getOrderType().equals(1)) {
+ serviceTotal++;
+ serviceTotalMoney = serviceTotalMoney.add(order.getTotalAmount());
+ total++;
+ totalMoney = totalMoney.add(order.getTotalAmount());
+ }else if (order.getOrderType().equals(2)){
+ singleTotal++;
+ singleTotalMoney = singleTotalMoney.add(order.getTotalAmount());
+ total++;
+ totalMoney = totalMoney.add(order.getTotalAmount());
+ }
+ }
+ orderStatisticsDetail.setDate(key);
+ orderStatisticsDetail.setServiceTotal(serviceTotal);
+ orderStatisticsDetail.setSingleTotal(singleTotal);
+ orderStatisticsDetail.setTotal(total);
+
+ orderStatisticsDetail.setServiceTotalMoney(serviceTotalMoney);
+ orderStatisticsDetail.setSingleTotalMoney(singleTotalMoney);
+ orderStatisticsDetail.setTotalMoney(totalMoney);
+ orderStatisticsDetails.add(orderStatisticsDetail);
+ });
+ Integer shopId = null;
+ if(sysUser.getRoleType() == 2){
+ shopId = sysUser.getObjectId();
+ }
+ OrderStatistics orderStatistics = orderMapper.getOrderStatistics(startTime, endTime, shopId);
+ if(null != orderStatistics){
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+ List<OrderStatisticsDetail> sortedDetails = orderStatisticsDetails.stream()
+ .sorted(Comparator.comparing((OrderStatisticsDetail detail) -> {
+ try {
+ return dateFormat.parse(detail.getDate());
+ } catch (ParseException e) {
+ throw new RuntimeException(e);
+ }
+ }))
+ .collect(Collectors.toList());
+ orderStatistics.setOrderStatisticsDetailList(sortedDetails);
+ }
+ return R.ok(orderStatistics);
+ }
+
+
+ /**
+ * 订单取消支付回退
+ * @param refundCallbackResult
+ * @param response
+ * @return
+ */
+ @ResponseBody
+ @GetMapping("/refundPayMoneyCallback")
+ public void refundPayMoneyCallback(RefundCallbackResult refundCallbackResult, HttpServletResponse response){
+ R callback = orderService.refundPayMoneyCallback(refundCallbackResult);
+ if(callback.getCode() == 200){
+ response.setStatus(200);
+ PrintWriter out = null;
+ try {
+ out = response.getWriter();
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ out.println("success");
+ out.flush();
+ out.close();
+ }
+ }
+
+
+ /**
+ * 取消订单快递费回退
+ * @param refundCallbackResult
+ * @param response
+ */
+ @ResponseBody
+ @GetMapping("/refundExpressPayMoneyCallback")
+ public void refundExpressPayMoneyCallback(RefundCallbackResult refundCallbackResult, HttpServletResponse response){
+ R callback = orderService.refundExpressPayMoneyCallback(refundCallbackResult);
+ if(callback.getCode() == 200){
+ response.setStatus(200);
+ PrintWriter out = null;
+ try {
+ out = response.getWriter();
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ out.println("success");
+ out.flush();
+ out.close();
+ }
+ }
+
+
+ /**
+ * 获取商品销售数量
+ * @param goodsId
+ * @return
+ */
+ @PostMapping("/getGoodsSaleNum")
+ public R<Integer> getGoodsSaleNum(@RequestParam("goodsId") Integer goodsId, @RequestParam("type") Integer type){
+ Integer goodsSaleNum = orderService.getGoodsSaleNum(goodsId, type, null);
+ return R.ok(goodsSaleNum);
+ }
+
+
+
+ /**
+ * 获取门店销售订单数量
+ * @param shopId 门店id
+ * @param type 1：服务订单，2：单品订单
+ * @return
+ */
+ @PostMapping("/getShopSaleNum")
+ public R<Integer> getShopSaleNum(@RequestParam("shopId") Integer shopId, @RequestParam("type") Integer type){
+ Integer shopSaleNum = orderService.getShopSaleNum(shopId, type);
+ return R.ok(shopSaleNum);
+ }
+
+
+ /**
+ * 获取所有在指定门店消费的用户id
+ * @param shopId
+ * @return
+ */
+ @PostMapping("/getAppUserByShoppingShop")
+ public R<Set<Long>> getAppUserByShoppingShop(@RequestParam("shopId") Integer shopId){
+ List<Order> list = orderService.list(new LambdaQueryWrapper<Order>().eq(Order::getShopId, shopId).eq(Order::getDelFlag, 0)
+ .eq(Order::getPayStatus, 2).in(Order::getOrderStatus, Arrays.asList(1, 2, 3, 4, 7, 8)));
+ 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