From 195a7298e08fab73cf08cd38b48c99d92e0cb77d Mon Sep 17 00:00:00 2001
From: wangh <9483>
Date: Tue, 28 Nov 2023 18:10:16 +0800
Subject: [PATCH] 1
---
.../IntegralSettingsController.java | 11 +
.../mapper/IntegralSettingsMapper.java | 1 +
.../mapper/xml/IntegralSettingsMapper.xml | 7 +
.../service/IntegralSettingsService.java | 1 +
.../impl/IntegralSettingsServiceImpl.java | 6 +
.../controller/MtInvitationController.java | 93 +++++++++
.../userManager/entity/MtInvitation.java | 67 ++++++
.../mapper/MtInvitationMapper.java | 85 ++++++++
.../mapper/xml/MtInvitationMapper.xml | 176 ++++++++++++++++
.../service/MtInvitationService.java | 58 ++++++
.../service/impl/MtInvitationServiceImpl.java | 89 ++++++++
.../java/com/fuint/common/dto/UserInfo.java | 1 +
.../service/impl/MemberServiceImpl.java | 114 +++++-----
.../service/impl/OpenGiftServiceImpl.java | 18 +-
.../service/impl/WeixinServiceImpl.java | 2 +
.../fuint/common/shiroConfig/ShiroConfig.java | 1 +
.../controller/BackendMemberController.java | 4 +-
.../controller/ClientSignController.java | 40 ++--
.../controller/ClientUserController.java | 14 +-
.../com/fuint/repository/model/MtUser.java | 20 +-
.../pagesHome/PointsMall/PointsMall.vue | 12 +-
.../pagesHome/Pointsdetail/Pointsdetail.vue | 14 ++
gasStation-uni/pagesMy/integral/integral.vue | 28 ++-
.../CardManagement/CardManagement.js.map | 2 +-
.../pagesMy/Recharge/Recharge.js.map | 2 +-
.../pagesMy/feedback/feedback.js.map | 2 +-
.../mp-weixin/pagesMy/invite/invite.js.map | 2 +-
.../pagesMy/writeOff/writeOff.js.map | 2 +-
.../pagesMy/CardManagement/CardManagement.js | 139 ++++++++-----
.../CardManagement/CardManagement.json | 3 +-
.../CardManagement/CardManagement.wxml | 2 +-
.../CardManagement/CardManagement.wxss | 26 +++
.../mp-weixin/pagesMy/Recharge/Recharge.js | 141 ++++++++-----
.../mp-weixin/pagesMy/Recharge/Recharge.json | 3 +-
.../mp-weixin/pagesMy/Recharge/Recharge.wxml | 2 +-
.../mp-weixin/pagesMy/Recharge/Recharge.wxss | 26 +++
.../mp-weixin/pagesMy/feedback/feedback.js | 194 +++++++++++-------
.../mp-weixin/pagesMy/feedback/feedback.json | 4 +-
.../mp-weixin/pagesMy/feedback/feedback.wxml | 2 +-
.../mp-weixin/pagesMy/feedback/feedback.wxss | 31 ++-
.../dev/mp-weixin/pagesMy/invite/invite.js | 106 +++++-----
.../mp-weixin/pagesMy/writeOff/writeOff.js | 142 ++++++++-----
.../mp-weixin/pagesMy/writeOff/writeOff.json | 3 +-
.../mp-weixin/pagesMy/writeOff/writeOff.wxml | 2 +-
.../mp-weixin/pagesMy/writeOff/writeOff.wxss | 26 +++
45 files changed, 1318 insertions(+), 406 deletions(-)
create mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/MtInvitationController.java
create mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/entity/MtInvitation.java
create mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/MtInvitationMapper.java
create mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/MtInvitationMapper.xml
create mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/MtInvitationService.java
create mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/MtInvitationServiceImpl.java
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/controller/IntegralSettingsController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/controller/IntegralSettingsController.java
index 58e4e2a3d..e005561ad 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/controller/IntegralSettingsController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/controller/IntegralSettingsController.java
@@ -56,6 +56,17 @@ public class IntegralSettingsController extends BaseController {
return getSuccessResult(this.integralSettingsService.queryById(id));
}
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("getByStoreId")
+ public ResponseObject getByStoreId(Integer id) {
+ return getSuccessResult(this.integralSettingsService.queryById(id));
+ }
+
/**
* 通过店铺的规则
*
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/IntegralSettingsMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/IntegralSettingsMapper.java
index 0a2b1fb28..0796c2b20 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/IntegralSettingsMapper.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/IntegralSettingsMapper.java
@@ -22,6 +22,7 @@ public interface IntegralSettingsMapper {
* @return 实例对象
*/
IntegralSettings queryById(Integer id);
+ IntegralSettings getByStoreId(Integer id);
/**
* 查询指定行数据
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralSettingsMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralSettingsMapper.xml
index c61069ce9..77d7d9fd2 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralSettingsMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralSettingsMapper.xml
@@ -36,6 +36,13 @@
where id = #{id}
+
+