From be7a263801a25b2f2bdff574689042abcc8f0a8c Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 16 一月 2025 17:02:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java | 10 +++++-----
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/RefundPassMapper.java | 4 +++-
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/UserCoupon.java | 1 +
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java | 5 ++++-
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/BannerController.java | 6 ++----
ruoyi-service/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml | 4 ++--
6 files changed, 17 insertions(+), 13 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-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java
index b77fcc6..1abf5ad 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java
@@ -81,7 +81,10 @@
public AjaxResult list() {
Long userid = tokenService.getLoginUser().getUserid();
SysUser sysUser = sysUserService.getById(userid);
- LambdaQueryWrapper<SysRole> wrapper = new LambdaQueryWrapper<SysRole>().eq(SysRole::getDelFlag, 0).eq(SysRole::getStatus, 0);
+ LambdaQueryWrapper<SysRole> wrapper = new LambdaQueryWrapper<SysRole>()
+ .ne(SysRole::getRoleId, 2)
+ .eq(SysRole::getDelFlag, 0)
+ .eq(SysRole::getStatus, 0);
if(sysUser.getRoleType() == 2){
wrapper.eq(SysRole::getShopId, sysUser.getObjectId());
}
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 d015b58..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
@@ -335,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);
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/RefundPassMapper.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/RefundPassMapper.java
index 6733ad4..a108989 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/RefundPassMapper.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/RefundPassMapper.java
@@ -27,7 +27,9 @@
* @param status 售后状态
* @return
*/
- List<OrderRefundPassList> getOrderRefundPassList(PageInfo<OrderRefundPassList> pageInfo, @Param("orderNumber") String orderNumber, @Param("appUserIds") List<Long> appUserIds,
+ List<OrderRefundPassList> getOrderRefundPassList(PageInfo<OrderRefundPassList> pageInfo,
+ @Param("orderNumber") String orderNumber,
+ @Param("appUserIds") List<Long> appUserIds,
@Param("shopId") Integer shopId, @Param("refundMethod") Integer refundMethod,
@Param("status") Integer status);
diff --git a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml
index 8038696..e0413d7 100644
--- a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml
+++ b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml
@@ -96,8 +96,8 @@
SUM( CASE WHEN tor.order_type = 1 and tor.order_status!=5 THEN 1 ELSE 0 END ) as serviceTotal,
SUM( CASE WHEN tor.order_type = 2 and tor.order_status!=5 THEN 1 ELSE 0 END ) as singleTotal,
SUM( tor.total_amount ) as totalMoney,
- SUM( CASE WHEN tor.order_type = 1 THEN tor.total_amount ELSE 0 END ) as serviceTotalMoney,
- SUM( CASE WHEN tor.order_type = 2 THEN tor.total_amount ELSE 0 END ) as singleTotalMoney
+ SUM( CASE WHEN tor.order_type = 1 and tor.order_status!=5 THEN tor.total_amount ELSE 0 END ) as serviceTotalMoney,
+ SUM( CASE WHEN tor.order_type = 2 and tor.order_status!=5 THEN tor.total_amount ELSE 0 END ) as singleTotalMoney
FROM
t_order tor where 1 = 1
<if test="null != shopId">
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/BannerController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/BannerController.java
index bd3ec88..16ca460 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/BannerController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/BannerController.java
@@ -83,12 +83,10 @@
//秒杀活动
if(null != jumpType1 && 4 == jumpType1){
SeckillActivityInfo activityInfo = seckillActivityInfoService.getById(banner.getContent());
- if(null == activityInfo || activityInfo.getDelFlag() == 1){
+ if(null == activityInfo || activityInfo.getDelFlag() == 1 || !activityInfo.getVipIds().contains(vipId.toString())){
banner.setJumpType(1);
}
- if(!activityInfo.getVipIds().contains(vipId.toString())){
- banner.setJumpType(1);
- }
+
}
}
return R.ok(list);
--
Gitblit v1.7.1