From ddf3f19408fb311734218aaaa5edb49c5134b1eb Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 08 一月 2025 21:14:36 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java | 145 +++++++++++++++++++++++++++++++++++++++--------
1 files changed, 119 insertions(+), 26 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 dd4d036..bd94f8a 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
@@ -16,23 +16,26 @@
import com.ruoyi.order.model.Order;
import com.ruoyi.order.service.CommissionService;
import com.ruoyi.order.service.OrderService;
+import com.ruoyi.order.util.payment.model.RefundCallbackResult;
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 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.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -59,6 +62,8 @@
private BaseSettingClient baseSettingClient;
@Resource
private OrderMapper orderMapper;
+ @Resource
+ private SysUserClient sysUserClient;
/**
@@ -115,11 +120,11 @@
*/
@ApiOperation(value = "订单核销", tags = {"小程序-个人中心-门店管理"})
@ApiImplicitParams({
- @ApiImplicitParam(value = "订单号", name = "code", required = true, dataType = "String"),
+ @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/{id}/{shopId}")
+ public R<Void> writeOff(@PathVariable("id") String id, @PathVariable("shopId") Integer shopId){
+ orderService.writeOff(id, shopId);
return R.ok();
}
@@ -131,11 +136,8 @@
@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);
}
/**
@@ -147,13 +149,6 @@
})
@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("售后设置获取失败");
@@ -165,7 +160,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();
}
@@ -230,7 +229,7 @@
}
@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());
}
@@ -280,8 +279,10 @@
public R<OrderStatistics> getOrderStatistics(@RequestParam("startTime") String startTime,
@RequestParam("endTime") String endTime){
- List<Order> orderList = orderService.list(new LambdaQueryWrapper<Order>()
- .between(Order::getCreateTime, LocalDateTime.parse(startTime), LocalDateTime.parse(endTime)));
+ 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"))));
Map<String, List<Order>> map = orderList.stream().collect(Collectors.groupingBy(item -> item.getCreateTime()
@@ -313,11 +314,103 @@
orderStatisticsDetail.setTotal(total);
orderStatisticsDetails.add(orderStatisticsDetail);
});
- OrderStatistics orderStatistics = orderMapper.getOrderStatistics(LocalDateTime.parse(startTime), LocalDateTime.parse(endTime));
- orderStatistics.setOrderStatisticsDetailList(orderStatisticsDetails);
+ Integer shopId = null;
+ if(sysUser.getRoleType() == 2){
+ shopId = sysUser.getObjectId();
+ }
+ OrderStatistics orderStatistics = orderMapper.getOrderStatistics(startTime, endTime, shopId);
+ if(null != orderStatistics){
+ orderStatistics.setOrderStatisticsDetailList(orderStatisticsDetails);
+ }
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);
+ 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);
+ }
}
--
Gitblit v1.7.1