From ad60d3e63bbfe66abc4a4857099baeb1b668ff96 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 13 一月 2025 16:20:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java | 25 ++++++++++++
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java | 25 ++++++++++++
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/vo/NearbyReferrerVo.java | 2 +
ruoyi-service/ruoyi-account/src/main/resources/mapper/account/AppUserMapper.xml | 3 +
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/SeckillActivityInfoController.java | 7 ++-
5 files changed, 57 insertions(+), 5 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java
index 6fe833e..384a27e 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java
@@ -689,6 +689,31 @@
String cityCode = citycode.substring(0, 4) + "00";
PageInfo<NearbyReferrerVo> pageInfo = new PageInfo(nearbyReferrer.getPageCurr(), nearbyReferrer.getPageSize());
List<NearbyReferrerVo> list = this.baseMapper.getNearbyReferrer(pageInfo, cityCode, nearbyReferrer);
+ for (NearbyReferrerVo nearbyReferrerVo : list) {
+ switch (nearbyReferrerVo.getVip()){
+ case "1":
+ nearbyReferrerVo.setVip("普通会员");
+ break;
+ case "2":
+ nearbyReferrerVo.setVip("黄金会员");
+ break;
+ case "3":
+ nearbyReferrerVo.setVip("钻石会员");
+ break;
+ case "4":
+ nearbyReferrerVo.setVip("准代理");
+ break;
+ case "5":
+ nearbyReferrerVo.setVip("代理");
+ break;
+ case "6":
+ nearbyReferrerVo.setVip("总代");
+ break;
+ case "7":
+ nearbyReferrerVo.setVip("合伙人");
+ break;
+ }
+ }
return pageInfo.setRecords(list);
}
return null;
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/vo/NearbyReferrerVo.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/vo/NearbyReferrerVo.java
index e598dfa..b0f84a2 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/vo/NearbyReferrerVo.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/vo/NearbyReferrerVo.java
@@ -23,4 +23,6 @@
private String vip;
@ApiModelProperty("距离（m）")
private BigDecimal distance;
+ @ApiModelProperty("手机号")
+ private String phone;
}
diff --git a/ruoyi-service/ruoyi-account/src/main/resources/mapper/account/AppUserMapper.xml b/ruoyi-service/ruoyi-account/src/main/resources/mapper/account/AppUserMapper.xml
index 2bb301d..73e0486 100644
--- a/ruoyi-service/ruoyi-account/src/main/resources/mapper/account/AppUserMapper.xml
+++ b/ruoyi-service/ruoyi-account/src/main/resources/mapper/account/AppUserMapper.xml
@@ -44,7 +44,8 @@
ST_Distance_Sphere(
point(#{nearbyReferrer.longitude},#{nearbyReferrer.latitude}),
point(longitude, latitude)
- ) as distance
+ ) as distance,
+ phone
from t_app_user where city_code = #{cityCode} and del_flag = 0 and status = 1 and vip_id >= 4
<if test="null != nearbyReferrer.name and '' != nearbyReferrer.name">
and `name` like CONCAT('%', #{nearbyReferrer.name}, '%')
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java
index d96c6e6..aa8cea0 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java
@@ -144,8 +144,31 @@
//查询符合商品类型的商品数据
List<ShoppingCart> list = this.list(new LambdaQueryWrapper<ShoppingCart>().eq(ShoppingCart::getAppUserId, userid)
.in(ShoppingCart::getGoodsId, goodsIds).eq(ShoppingCart::getStatus, 1));
+ //删除过期的秒杀活动商品
+ List<ShoppingCart> list1 = new ArrayList<>();
+ for (ShoppingCart shoppingCart : list) {
+ if(shoppingCart.getType() == 2){
+ GetSeckillActivityInfo info = new GetSeckillActivityInfo();
+ info.setGoodsId(shoppingCart.getGoodsId());
+ info.setVip(appUser.getVipId());
+ GoodsSeckill data1 = seckillActivityInfoClient.getSeckillActivityInfo(info).getData();
+ if(null != data1){
+ SeckillActivityInfo seckillActivityInfo = seckillActivityInfoClient.getSeckillActivityInfoById(data1.getSeckillActivityInfoId()).getData();
+ if(null != seckillActivityInfo && (seckillActivityInfo.getIsShelves() == 1 &&
+ seckillActivityInfo.getStartTime().isBefore(LocalDateTime.now()) && seckillActivityInfo.getEndTime().isAfter(LocalDateTime.now()))){
+
+ list1.add(shoppingCart);
+ continue;
+ }
+ }
+ this.removeById(shoppingCart.getId());
+ }else{
+ list1.add(shoppingCart);
+ }
+ }
+
//构建返回数据
- List<MyShoppingCartVo> page = buildDetail(appUser, shopId, list, null);
+ List<MyShoppingCartVo> page = buildDetail(appUser, shopId, list1, null);
return page;
}
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/SeckillActivityInfoController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/SeckillActivityInfoController.java
index fcb62b8..5e750ee 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/SeckillActivityInfoController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/SeckillActivityInfoController.java
@@ -195,8 +195,9 @@
.set(SeckillActivityInfo::getIsShelves, seckillActivityVO.getShowStatus()));
return R.ok();
}
-
-
-
+
+
+
+
}
--
Gitblit v1.7.1