From 9da8eed32e6291755b2c5a23e8e067f165204daa Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 16 一月 2025 17:28:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java | 22 +++++++++++++++-------
ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java | 15 ++++++++++++++-
ruoyi-auth/pom.xml | 5 ++++-
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java | 2 +-
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/UserCoupon.java | 1 +
5 files changed, 35 insertions(+), 10 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/UserCoupon.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/UserCoupon.java
index 93c1763..58efd03 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/UserCoupon.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/UserCoupon.java
@@ -50,6 +50,7 @@
@ApiModelProperty(value = "使用时间")
@TableField("use_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime useTime;
@ApiModelProperty(value = "开始时间")
diff --git a/ruoyi-auth/pom.xml b/ruoyi-auth/pom.xml
index 275881a..1265332 100644
--- a/ruoyi-auth/pom.xml
+++ b/ruoyi-auth/pom.xml
@@ -20,7 +20,10 @@
</properties>
<dependencies>
-
+ <dependency>
+ <groupId>com.ruoyi</groupId>
+ <artifactId>ruoyi-api-other</artifactId>
+ </dependency>
<!-- SpringCloud Alibaba Nacos -->
<dependency>
<groupId>com.alibaba.cloud</groupId>
diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
index b41500b..ce5d0dc 100644
--- a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
+++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
@@ -1,5 +1,7 @@
package com.ruoyi.auth.service;
+import com.ruoyi.other.api.domain.Shop;
+import com.ruoyi.other.api.feignClient.ShopClient;
import com.ruoyi.system.api.RemoteUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -39,7 +41,8 @@
@Resource
private RedisService redisService;
-
+ @Resource
+ private ShopClient shopClient;
/**
* 登录
*/
@@ -93,6 +96,16 @@
// throw new ServiceException("对不起，您的账号：" + username + " 已停用");
throw new ServiceException("您的账号已被禁用，请联系平台");
}
+ if (user.getRoleType()==2){
+ Shop data = shopClient.getShopById(user.getObjectId()).getData();
+ if (data==null){
+ throw new ServiceException("门店不存在");
+ }else{
+ if (data.getStatus()==2){
+ throw new ServiceException("您的账号已被禁用，请联系平台");
+ }
+ }
+ }
passwordService.validate(user, password, request);
recordLogService.recordLogininfor(request, user.getUserId().intValue(), username, Constants.LOGIN_SUCCESS_STATUS, "登录成功");
return userInfo;
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
index 1d148ba..6728fc7 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
@@ -665,7 +665,7 @@
List<AppUser> list = appUserService.lambdaQuery().eq(AppUser::getInviteUserId, id).list();
byId.setBottomUsers(list);
//消费总金额
- R<List<Order>> orderR = remoteOrderGoodsClient.byShopIdAndUserId(id,sysUser.getObjectId());
+ R<List<Order>> orderR = remoteOrderGoodsClient.byShopIdAndUserId(id,byId.getShopId());
List<Order> orderList = orderR.getData();
if (!CollectionUtils.isEmpty(orderList)){
BigDecimal paymentAmount = orderList.stream().map(Order::getPaymentAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
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 a1e1094..e68d5a8 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
@@ -235,7 +235,12 @@
@PostMapping("/byUserId")
public R<List<Order>> byUserId(@RequestParam("appUserId") Long appUserId,@RequestParam("shopId") Integer shopId){
- return R.ok(orderService.lambdaQuery().eq(Order::getAppUserId, appUserId).eq(Order::getShopId, shopId).list());
+ List<Order> list = orderService.lambdaQuery()
+ .eq(Order::getAppUserId, appUserId)
+ .eq(Order::getShopId, shopId)
+ .eq(Order::getDistributionMode, 1)
+ .ne(Order::getOrderStatus,5).list();
+ return R.ok(list);
}
@PostMapping("/byShopId")
public R<List<Order>> byShopId(@RequestParam("shopId") Integer shopId){
@@ -243,7 +248,10 @@
}
@PostMapping("/byShopIdAndUserId")
public R<List<Order>> byShopIdAndUserId(@RequestParam("appUserId") Long appUserId,@RequestParam("shopId") Integer shopId){
- List<Order> list = orderService.lambdaQuery().isNotNull(Order::getEndTime).eq(Order::getShopId, shopId).eq(Order::getAppUserId, appUserId).in(Order::getOrderStatus, 4, 7, 8).list();
+ List<Order> list = orderService.lambdaQuery().isNotNull(Order::getEndTime)
+ .eq(Order::getShopId, shopId)
+ .eq(Order::getAppUserId, appUserId)
+ .in(Order::getOrderStatus, 4, 7, 8).list();
return R.ok(list);
}
@@ -327,14 +335,14 @@
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.getPaymentAmount());
- }else if (order.getOrderType().equals(2) && 1 == order.getDistributionMode()){
+ 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.getPaymentAmount());
+ totalMoney = totalMoney.add(order.getTotalAmount());
}
}
orderStatisticsDetail.setDate(key);
--
Gitblit v1.7.1