From 91e9c006a2ce431a5916b137974bd004622eb9fa Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期三, 09 四月 2025 20:15:45 +0800
Subject: [PATCH] 用户端代码调整测试
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java | 82 +++++++---------------------------------
1 files changed, 15 insertions(+), 67 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
index 6529950..07f7b79 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
@@ -16,6 +16,7 @@
import com.ruoyi.order.vo.OrderSaleNum;
import com.ruoyi.order.vo.VerifiableShopVo;
import com.ruoyi.other.api.domain.*;
+import com.ruoyi.other.enums.PhoneType;
import com.ruoyi.other.mapper.ShopMapper;
import com.ruoyi.other.mapper.ShopScoreMapper;
import com.ruoyi.other.service.*;
@@ -103,6 +104,10 @@
}
LoginUser loginUserApplet = tokenService.getLoginUserApplet();
shopScore.setAppUserId(loginUserApplet.getUserid());
+ ShopScore one1 = shopScoreService.getOne(new LambdaQueryWrapper<ShopScore>().eq(ShopScore::getAppUserId, loginUserApplet.getUserid()));
+ if (null!=one1){
+ return R.fail("不能重复评分");
+ }
shopScore.setCreateTime(LocalDateTime.now());
shopScoreService.save(shopScore);
//计算，更新到门店中
@@ -144,7 +149,7 @@
if (appUser == null){
return R.fail("该手机号未注册");
}
- shop.setShopAllPoint(0);
+ /* shop.setShopAllPoint(0);
shop.setLowerLevelSharePoint(0);
shop.setSharePoint(0);
shop.setServerPoint(0);
@@ -152,12 +157,12 @@
shop.setGiveawayAllMoney(BigDecimal.ZERO);
shop.setGiveawayMoney(BigDecimal.ZERO);
shop.setLowerLevelGiveawayMoney(BigDecimal.ZERO);
- shop.setServerGiveawayMoney(BigDecimal.ZERO);
+ shop.setServerGiveawayMoney(BigDecimal.ZERO);*/
shop.setCanWithdrawMoney(BigDecimal.ZERO);
shop.setWithdrawMoney(BigDecimal.ZERO);
shop.setOrderNumber(0);
- shop.setServerOrderNumber(0);
- shop.setCustomOrderNumber(0);
+ /* shop.setServerOrderNumber(0);
+ shop.setCustomOrderNumber(0);*/
shop.setAppUserId(appUser.getId());
String city = TencentMapUtil.inverseGeographicalAnalysis(shop.getLongitude(), shop.getLatitude(), false);
if(!StringUtils.hasLength(city)){
@@ -458,9 +463,9 @@
@ApiOperation(value = "门店列表", tags = {"管理后台-门店管理"})
public R<IPage<Shop>> list(@ApiParam("页码") @RequestParam("pageNum") Integer pageNum,@ApiParam("每一页数据大小") @RequestParam("pageSize") Integer pageSize,Shop shop){
IPage<Shop> shopIPage = shopService.getShopList(pageNum, pageSize, shop);
- for (Shop record : shopIPage.getRecords()) {
+ /*for (Shop record : shopIPage.getRecords()) {
record.setLaveUsePoint(record.getLavePoint());
- }
+ }*/
return R.ok(shopIPage);
}
@@ -531,6 +536,8 @@
@ApiParam("纬度") @RequestParam BigDecimal latitude) {
return R.ok(shopService.getShopDetail(shopId, longitude, latitude));
}
+
+
@@ -801,76 +808,17 @@
List<Shop> shopList = shopService.list(queryWrapper);
BigDecimal serverGiveawayMoney = BigDecimal.ZERO;
BigDecimal giveawayMoney = BigDecimal.ZERO;
- for (Shop shop : shopList) {
+ /* for (Shop shop : shopList) {
serverGiveawayMoney = serverGiveawayMoney.add(shop.getServerGiveawayMoney());
giveawayMoney = giveawayMoney.add(shop.getGiveawayMoney().add(shop.getLowerLevelGiveawayMoney()));
- }
+ }*/
Map<String, BigDecimal> map = new HashMap<>();
map.put("serverGiveawayMoney", serverGiveawayMoney);
map.put("giveawayMoney", giveawayMoney);
return R.ok(map);
}
- /**
- * 获取指定用户的服务商
- * @return
- */
- @GetMapping("/getServiceProvider")
- public R<Shop> getServiceProvider(@RequestParam("appUserId") Long appUserId){
- //向上找获取第一个开店的门店
- List<Shop> list = shopService.list(new LambdaQueryWrapper<Shop>().eq(Shop::getDelFlag, 0).eq(Shop::getStatus, 1));
- AppUser appUser = appUserClient.getAppUserById(appUserId);
- //上级集合，防止循环关联
- Set<Long> pid = new HashSet<>();
- Shop shop = getSuperiorStore(appUser, list, 1, 1, pid);
- return R.ok(shop);
- }
-
-
-
- public Shop getSuperiorStore(AppUser appUser, List<Shop> list, Integer hierarchy, Integer num, Set<Long> pid){
- if(null == appUser.getInviteUserId()){
- return null;
- }
- if(pid.contains(appUser.getInviteUserId())){
- return null;
- }
- AppUser appUser1 = appUserClient.getAppUserById(appUser.getInviteUserId());
- if(null != appUser1){
- Optional<Shop> first = list.stream().filter(shop -> shop.getAppUserId().equals(appUser1.getId())).findFirst();
- if(first.isPresent()){
- if(hierarchy.equals(num)){
- return first.get();
- }
- num++;
- }
- }
- return getSuperiorStore(appUser1, list, hierarchy, num, pid);
- }
-
-
-
-
-
-
-
-
-
- /**
- * 获取指定用户的高级服务商
- * @return
- */
- @GetMapping("/getSuperiorServiceProvider")
- public R<Shop> getSuperiorServiceProvider(@RequestParam("appUserId") Long appUserId){
- //向上找获取第一个开店的门店
- List<Shop> list = shopService.list(new LambdaQueryWrapper<Shop>().eq(Shop::getDelFlag, 0).eq(Shop::getStatus, 1));
- AppUser appUser = appUserClient.getAppUserById(appUserId);
- //上级集合，防止循环关联
- Set<Long> pid = new HashSet<>();
- Shop shop = getSuperiorStore(appUser, list, 2, 1, pid);
- return R.ok(shop);
- }
}
--
Gitblit v1.7.1