From 417adaa72f4ab9e5df724d9ef598faad674c9cd8 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期二, 10 十二月 2024 18:01:12 +0800
Subject: [PATCH] 1.
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java | 8 ++++++++
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java | 17 +++++++++++++++--
2 files changed, 23 insertions(+), 2 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 0d4ac5c..2a8e295 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
@@ -19,8 +19,10 @@
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.common.security.service.TokenService;
+import com.ruoyi.other.api.domain.PointSetting;
import com.ruoyi.other.api.domain.Shop;
import com.ruoyi.other.api.domain.VipSetting;
+import com.ruoyi.other.api.feignClient.PointSettingClient;
import com.ruoyi.other.api.feignClient.ShopClient;
import com.ruoyi.other.api.feignClient.VipSettingClient;
import com.ruoyi.system.api.domain.SysUser;
@@ -69,10 +71,13 @@
@Resource
private VipSettingClient vipSettingClient;
+
+ @Resource
+ private PointSettingClient pointSettingClient;
@Resource
private UserChangeLogService userChangeLogService;
-
+
@Value("${file.upload.location}")
private String filePath;
@@ -286,7 +291,15 @@
appUser.setTotalRedPacketAmount(BigDecimal.ZERO);
appUser.setTotalDistributionAmount(BigDecimal.ZERO);
appUser.setBalance(BigDecimal.ZERO);
- appUser.setLavePoint(0);
+ R<PointSetting> pointSettingR = pointSettingClient.getPointSetting(1);
+ if (R.isError(pointSettingR)){
+ throw new RuntimeException("获取积分设置失败");
+ }
+ PointSetting pointSetting = pointSettingR.getData();
+ if (pointSetting == null){
+ throw new RuntimeException("积分设置不存在");
+ }
+ appUser.setLavePoint(pointSetting.getGetRegisPoint());
appUser.setTotalPoint(0);
//根据平台的配置未达标，则标注为可修改推广人
appUser.setChangePromoter(0);
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 d8220b8..83021b4 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
@@ -55,6 +55,14 @@
+ @PostMapping
+ @ApiOperation(value = "新增门店", tags = {"后台管理-门店管理-新增门店"})
+ public R<Void> add(@RequestBody Shop shop){
+ shopService.save(shop);
+ return R.ok();
+ }
+
+
@PostMapping("/getDetailById")
public R<Shop> getDetailById(@RequestParam("id") Long id){
Shop byId = shopService.getById(id);
--
Gitblit v1.7.1