From 095021e559ebf541e46d4bee6337d70d8147cb6c Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期四, 05 十二月 2024 10:45:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java | 4 ++--
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/SystemConfigController.java | 2 +-
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/ShopDetailVO.java | 2 +-
3 files changed, 4 insertions(+), 4 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 e9f86d1..ac7e4e9 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
@@ -121,8 +121,8 @@
@PostMapping("/shopScore")
@ApiOperation(value = "门店打分", tags = {"小程序-个人中心-门店打分"})
public R<Void> shopScore(@RequestBody ShopScore shopScore) {
- LoginUser loginUser = tokenService.getLoginUser();
- shopScore.setAppUserId(loginUser.getUserid());
+ LoginUser loginUserApplet = tokenService.getLoginUserApplet();
+ shopScore.setAppUserId(loginUserApplet.getUserid());
shopScore.setCreateTime(LocalDateTime.now());
shopScoreService.save(shopScore);
return R.ok();
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/SystemConfigController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/SystemConfigController.java
index dce4da8..21a404e 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/SystemConfigController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/SystemConfigController.java
@@ -64,7 +64,7 @@
return R.ok(one);
}
- @PostMapping("/index/start")
+ @GetMapping("/index/start")
@ApiOperation(value = "宣传图片-公司简介", tags = {"小程序-启动页"})
public R<StartPageSetDto> indexstart(){
SystemConfig one = systemConfigService.lambdaQuery().eq(SystemConfig::getType, 1).one();
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/ShopDetailVO.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/ShopDetailVO.java
index 5e13e1f..02a4665 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/ShopDetailVO.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/ShopDetailVO.java
@@ -31,7 +31,7 @@
private String certification;
@ApiModelProperty(value = "营业星期：1-周一到周日 2-周一周五 3-仅周末")
- private Integer businessDate;
+ private Long businessDate;
@ApiModelProperty(value = "开始时间（HH:mm）")
private String startTime;
--
Gitblit v1.7.1