From af495911ed2b8bbc65ca45e70e74681cad2e648b Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 10 十二月 2024 18:36:02 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java | 8 ++++++++
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/GoodsEvaluate.java | 4 +++-
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java | 20 ++++++++++++++------
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/UserSignRecord.java | 4 ++--
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserSignRecordController.java | 2 +-
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/dto/SignBackRDto.java | 2 +-
6 files changed, 29 insertions(+), 11 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/UserSignRecord.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/UserSignRecord.java
index a1d6e36..6003545 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/UserSignRecord.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/UserSignRecord.java
@@ -45,9 +45,9 @@
@TableField("red_amount")
private BigDecimal redAmount;
- @ApiModelProperty(value = "红包金额")
+ @ApiModelProperty(value = "积分")
@TableField("point")
- private BigDecimal point;
+ private Integer point;
@ApiModelProperty(value = "删除（0=否，1=是）")
@TableField("del_flag")
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/GoodsEvaluate.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/GoodsEvaluate.java
index a2e609d..a9a133b 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/GoodsEvaluate.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/GoodsEvaluate.java
@@ -92,6 +92,8 @@
public void setId(Long id) {
this.id = id;
- this.idStr = String.valueOf(id);
+ if (id != null){
+ this.idStr = String.valueOf(id);
+ }
}
}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserSignRecordController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserSignRecordController.java
index 053388f..e0f26c8 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserSignRecordController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserSignRecordController.java
@@ -60,7 +60,7 @@
if (pointSetting.getData() != null) {
userSignRecord.setPoint(pointSetting.getData().getSignPoint());
}else {
- userSignRecord.setPoint(BigDecimal.ZERO);
+ userSignRecord.setPoint(0);
}
R<BigDecimal> bigDecimalR = systemConfigClient.redPackegeSet();
userSignRecord.setRedAmount(bigDecimalR.getData());
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/dto/SignBackRDto.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/dto/SignBackRDto.java
index 0f3fb03..4e2adac 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/dto/SignBackRDto.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/dto/SignBackRDto.java
@@ -7,6 +7,6 @@
@Data
public class SignBackRDto {
- private BigDecimal point;
+ private Integer point;
private BigDecimal redAmount;
}
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 a5a8b35..02715d9 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
@@ -74,19 +74,19 @@
@Resource
private VipSettingClient vipSettingClient;
+
+ @Resource
+ private PointSettingClient pointSettingClient;
@Resource
private UserChangeLogService userChangeLogService;
-
+
@Value("${file.upload.location}")
private String filePath;
@Value("${file.upload.accessPath}")
private String accessPath;
-
- @Resource
- private PointSettingClient pointSettingClient;
-
+
@Resource
private UserPointService userPointService;
@@ -297,7 +297,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