From 6cb5cf8f6a442eef4040d0592e4d213df6aa132b Mon Sep 17 00:00:00 2001
From: lzx_win <2602107437@qq.com>
Date: Thu, 27 Mar 2025 15:17:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
CatmDogd-Mall-Front-test/.env.development | 5 +-
CatmDogd-Mall-Front-test/.env.production | 2 +-
.../src/views/oms/order/index.vue | 6 +-
ruoyi-admin/pom.xml | 11 +
.../src/main/resources/application-druid.yml | 46 ++++
ruoyi-admin/src/main/resources/application.yml | 4 +-
ruoyi-catdog/pom.xml | 11 +
.../contoller/ApiAppletHhrWorkInController.java | 91 +++++++
.../contoller/ApiAppletHhrWorkOutController.java | 70 +++++
.../applet/contoller/ApiAppletInfoController.java | 28 ++
.../applet/contoller/ApiAppletLoginController.java | 53 ++++
.../contoller/ApiAppletWalletController.java | 59 ++++
.../applet/contoller/AppletBannerController.java | 58 ++--
.../contoller/AppletIndexIconController.java | 43 ---
.../AppletIndexPartnerConfigController.java | 55 ++--
.../applet/contoller/AppletLoginController.java | 39 ---
.../applet/contoller/AppletWalletController.java | 59 ----
.../ruoyi/applet/pojo/dto/ApiAppletLoginDTO.java | 27 ++
.../com/ruoyi/applet/pojo/dto/ApiQueryIIdDTO.java | 14 +
.../applet/pojo/dto/ApiQueryIIdMyUserDTO.java | 21 ++
.../com/ruoyi/applet/utils/conf/AppletUtil.java | 15 +
.../ruoyi/applet/utils/wechat/WechatHttpConf.java | 33 +++
.../main/java/com/ruoyi/model/domain/AppUsers.java | 303 +++++++++++----------
.../com/ruoyi/model/domain/TransactionDetails.java | 4 +-
.../com/ruoyi/model/mapper/AppUsersMapper.java | 16 ++
.../ruoyi/model/mapper/IndexconfigIconMapper.java | 3 +-
.../com/ruoyi/model/mapper/IndexconfigMapper.java | 2 +-
.../model/mapper/TransactionDetailsMapper.java | 2 +-
.../service/IAApiAppletHhrWorkOutService.java | 25 ++
.../model/service/IAApiAppletLoginService.java | 23 ++
.../ruoyi/model/service/IApiAppletInfoService.java | 4 +
.../com/ruoyi/model/service/IAppUsersService.java | 13 +
.../model/service/IIndexconfigIconService.java | 3 +-
.../ruoyi/model/service/IIndexconfigService.java | 2 +-
.../model/service/ITransactionDetailsService.java | 2 +-
.../impl/AApiAppletHhrWorkOutServiceImpl.java | 135 +++++++++
.../service/impl/AApiAppletLoginServiceImpl.java | 203 ++++++++++++++
.../service/impl/ApiAppletInfoServiceImpl.java | 8 +
.../model/service/impl/AppUsersServiceImpl.java | 12 +
.../service/impl/IndexconfigIconServiceImpl.java | 4 +-
.../model/service/impl/IndexconfigServiceImpl.java | 4 +-
.../impl/TransactionDetailsServiceImpl.java | 4 +-
.../main/resources/mapper/model/AppUsersMapper.xml | 11 +
.../mapper/model/IndexconfigIconMapper.xml | 7 +-
.../resources/mapper/model/IndexconfigMapper.xml | 4 +-
.../mapper/model/TransactionDetailsMapper.xml | 1 +
.../java/com/ruoyi/common/constant/Constants.java | 2 +
.../common/core/domain/model/LoginApplet.java | 20 ++
ruoyi-framework/pom.xml | 8 +-
.../ruoyi/framework/web/service/TokenService.java | 51 ++++
50 files changed, 1252 insertions(+), 374 deletions(-)
create mode 100644 ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletHhrWorkInController.java
create mode 100644 ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletHhrWorkOutController.java
create mode 100644 ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletInfoController.java
create mode 100644 ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletLoginController.java
create mode 100644 ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletWalletController.java
delete mode 100644 ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/AppletIndexIconController.java
delete mode 100644 ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/AppletLoginController.java
delete mode 100644 ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/AppletWalletController.java
create mode 100644 ruoyi-catdog/src/main/java/com/ruoyi/applet/pojo/dto/ApiAppletLoginDTO.java
create mode 100644 ruoyi-catdog/src/main/java/com/ruoyi/applet/pojo/dto/ApiQueryIIdDTO.java
create mode 100644 ruoyi-catdog/src/main/java/com/ruoyi/applet/pojo/dto/ApiQueryIIdMyUserDTO.java
create mode 100644 ruoyi-catdog/src/main/java/com/ruoyi/applet/utils/conf/AppletUtil.java
create mode 100644 ruoyi-catdog/src/main/java/com/ruoyi/applet/utils/wechat/WechatHttpConf.java
create mode 100644 ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAApiAppletHhrWorkOutService.java
create mode 100644 ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAApiAppletLoginService.java
create mode 100644 ruoyi-catdog/src/main/java/com/ruoyi/model/service/IApiAppletInfoService.java
create mode 100644 ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AApiAppletHhrWorkOutServiceImpl.java
create mode 100644 ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AApiAppletLoginServiceImpl.java
create mode 100644 ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/ApiAppletInfoServiceImpl.java
create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginApplet.java
diff --git a/CatmDogd-Mall-Front-test/.env.development b/CatmDogd-Mall-Front-test/.env.development
index 3e7cad2..4b3df53 100644
--- a/CatmDogd-Mall-Front-test/.env.development
+++ b/CatmDogd-Mall-Front-test/.env.development
@@ -4,8 +4,9 @@ VUE_APP_TITLE = 猫妈狗爸商城管理平台
# 开发环境配置
ENV = 'development'
-# 若依管理系统/开发环境 https://api-test.catmdogd.com/test-api
-VUE_APP_BASE_API = 'http://localhost:8081'
+# 若依管理系统/开发环境 https://pet-admin.hhlm1688.com/api
+#VUE_APP_BASE_API = 'https://pet-admin.hhlm1688.com/api/prod-api'
+VUE_APP_BASE_API = 'http://localhost:8001'
# 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/CatmDogd-Mall-Front-test/.env.production b/CatmDogd-Mall-Front-test/.env.production
index fa884cb..186d2ea 100644
--- a/CatmDogd-Mall-Front-test/.env.production
+++ b/CatmDogd-Mall-Front-test/.env.production
@@ -5,5 +5,5 @@ VUE_APP_TITLE = 猫妈狗爸商城管理平台测试环境
ENV = 'production'
# 若依管理系统/生产环境
-VUE_APP_BASE_API = '/test-api'
+VUE_APP_BASE_API = '/api/prod-api'
VUE_APP_JUDGE_STAR = 0
diff --git a/CatmDogd-Mall-Front-test/src/views/oms/order/index.vue b/CatmDogd-Mall-Front-test/src/views/oms/order/index.vue
index 9955eb6..141839f 100644
--- a/CatmDogd-Mall-Front-test/src/views/oms/order/index.vue
+++ b/CatmDogd-Mall-Front-test/src/views/oms/order/index.vue
@@ -145,7 +145,7 @@
{{ scope.row.merchantNote }}
-
+
@@ -277,7 +277,9 @@
-
+
{{ getLogEvent(item.orderStatus) }}
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 4a473df..b86fb7a 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -69,6 +69,17 @@
ruoyi-mall
${ruoyi.version}
+
+
+
+ com.ruoyi
+ ruoyi-catdog
+ ${ruoyi.version}
+
+
+
+
+
org.junit.vintage
junit-vintage-engine
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index cb662c8..43cd9da 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -101,3 +101,49 @@ aes:
key: 1111111111123456
+
+
+
+
+
+# 伴宠师-相关配置信息
+wechat-admin:
+ enabled: true
+ appId: wx01f0f43759922fda
+ secret: b0a5617e6e4c387262a32af2b355c8b6
+ merchantId: 1665639691
+ privateKeyPath: ruoyi-admin/src/main/resources/apiclient_cert.p12
+ #privateKeyPath: /Users/daixiande/Work/杂七杂八/1665639691_20240111_cert/apiclient_key.pem
+ merchantSerialNumber: 6050244FC18200362585F1F9FD6557A1B291E8C0
+ apiV3key: 19971022197001121966060120240731
+ apiV2key: 19961022196901121965060120230731
+ notifyUrl: https://api.catmdogd.com/prod-api/no-auth/wechat/notify
+ notifyUrlForBCHSH: https://api.catmdogd.com/prod-api/no-auth/wechat/notifyForBCHSH
+ miniProgramAppId: wxd1a6ba7b5e17a5b6
+ miniProgramSecret: 06e946a2c9010f8eb9e306018a779a7f
+ staffAppId: wx01f0f43759922fda
+ staffSecret: b0a5617e6e4c387262a32af2b355c8b6
+ pay:
+ v3:
+ # 租户id
+ miniapp:
+ # 应用appId 服务商模式下为服务商的appid 必填
+ app-id: wxd1a6ba7b5e17a5b6
+ # v2 api 密钥 1.0.5版本以后如果用到V2的接口时必填
+ app-secret: 06e946a2c9010f8eb9e306018a779a7f
+ # api v3 密钥 必填
+ app-v3-secret: 19971022197001121966060120240731
+ # 微信支付商户号 服务商模式下为服务商的mchid 必填
+ mch-id: 1665639691
+ # 商户服务器域名 用于回调 需要放开回调接口的安全策略 必填
+ domain: https://api-test.catmdogd.com
+ # 商户 api 证书路径 必填 填写classpath路径 位于 maven项目的resources文件下
+ cert-path: apiclient_cert.p12
+ #cert-path: /data/software/app/key/apiclient_cert.p12
+
+
+
+
+
+
+
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 376f316..aeb256e 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -17,13 +17,13 @@ ruoyi:
# 前端请求的 跟踪 header name
traceIdName: x-web-trace-id
-# 开发环境配置
+# 开发环境配置.0
server:
# 服务器的HTTP端口，默认为8080
port: 8081
servlet:
# 应用的访问路径
- context-path: /
+ context-path: /prod-api
tomcat:
# tomcat的URI编码
uri-encoding: UTF-8
diff --git a/ruoyi-catdog/pom.xml b/ruoyi-catdog/pom.xml
index 4fabfff..2db25e3 100644
--- a/ruoyi-catdog/pom.xml
+++ b/ruoyi-catdog/pom.xml
@@ -68,6 +68,17 @@
com.ruoyi
ruoyi-common
+
+ com.ruoyi
+ ruoyi-framework
+ ${ruoyi.version}
+
+
+ com.vaadin.external.google
+ android-json
+ 0.0.20131108.vaadin1
+ compile
+
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletHhrWorkInController.java b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletHhrWorkInController.java
new file mode 100644
index 0000000..3156d6c
--- /dev/null
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletHhrWorkInController.java
@@ -0,0 +1,91 @@
+package com.ruoyi.applet.contoller;
+
+import com.ruoyi.applet.pojo.dto.ApiQueryIIdDTO;
+import com.ruoyi.applet.utils.conf.AppletUtil;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.model.domain.*;
+import com.ruoyi.model.service.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@Api(description = "伴宠师-工作台外部")
+@RestController
+@RequestMapping("/applet/workIn")
+public class ApiAppletHhrWorkInController extends BaseController {
+
+ @Autowired
+ private IIndexconfigIconService indexconfigIconService;
+
+ @Autowired
+ private IIndexconfigService indexConfigService;
+
+ @Autowired
+ private IAppUsersService appUsersService;
+
+ @Autowired
+ private IIndexPartnerConfigService iIndexPartnerConfigService;
+
+
+ //1.查询轮播图接口
+ @Autowired
+ private IAppBannerService iAppBannerService;
+
+ @ApiOperation("轮播图列表")
+ @GetMapping("/bannerList")
+ public AjaxResult bannerList(){
+ List bannerList = iAppBannerService.getBannerList();
+ return AjaxResult.success("轮播图列表",bannerList);
+ }
+
+ @ApiOperation("未加入的工作台图标配置查询")
+ @GetMapping("/indexConfigIco")
+ public AjaxResult getIndexConfigIcon(){
+ List indexconfigIconByIdentity = indexconfigIconService.getIndexconfigIconByIdentity();
+ return AjaxResult.success(indexconfigIconByIdentity);
+ }
+
+ @ApiOperation("已加入的工作台图标配置查询")
+ @GetMapping("/indexConfig")
+ public TableDataInfo getIndexConfig(){
+ return getDataTable(indexConfigService.getIndexconfigList());
+ }
+
+
+ @ApiOperation("查询加入合伙人提示配置列表")
+ @GetMapping("/list")
+ public TableDataInfo list(){
+ List indexPartnerConfigList = iIndexPartnerConfigService.getIndexPartnerConfigList();
+ return getDataTable(indexPartnerConfigList);
+ }
+
+
+ @ApiOperation("申请加入合伙人-需要token")
+ @PostMapping("/joinHh")
+ public AjaxResult joinHh(@RequestBody ApiQueryIIdDTO dto){
+// AppUsers localAppletUser = AppletUtil.getLocalAppletUser();
+ AppUsers localAppletUser = new AppUsers();
+ localAppletUser.setUserId(dto.getAppUserId());
+ localAppletUser.setUserHh(1);
+ appUsersService.updateAppUsers(localAppletUser);
+ return AjaxResult.success("申请成功合伙人");
+ }
+
+ @ApiOperation("申请加入伴宠师-需要token")
+ @PostMapping("/joiBcs")
+ public AjaxResult joiBcs(@RequestBody ApiQueryIIdDTO dto){
+// AppUsers localAppletUser = AppletUtil.getLocalAppletUser();
+ AppUsers localAppletUser = new AppUsers();
+ localAppletUser.setUserId(dto.getAppUserId());
+ localAppletUser.setUserBcs(1);
+ appUsersService.updateAppUsers(localAppletUser);
+ return AjaxResult.success("申请成功伴宠师");
+ }
+
+
+}
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletHhrWorkOutController.java b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletHhrWorkOutController.java
new file mode 100644
index 0000000..3354ecc
--- /dev/null
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletHhrWorkOutController.java
@@ -0,0 +1,70 @@
+package com.ruoyi.applet.contoller;
+
+
+import com.ruoyi.applet.pojo.dto.ApiQueryIIdDTO;
+import com.ruoyi.applet.pojo.dto.ApiQueryIIdMyUserDTO;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.model.service.IAApiAppletHhrWorkOutService;
+import com.ruoyi.model.service.IAApiAppletLoginService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Pageable;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+@Api(description = "伴宠师-合伙人工作台内部流程")
+@RestController
+@RequestMapping("/applet/workOut")
+public class ApiAppletHhrWorkOutController {
+
+ //伴宠师-登录相关问题
+ @Resource
+ private IAApiAppletHhrWorkOutService apiAppletHhrWorkOutService;
+
+
+ //合伙人工作台 - 绑定用户基础信息
+ @ApiOperation("合伙人工作台 - 绑定用户基础信息")
+ @GetMapping("/hhrInfo/{appUserId}")
+ public AjaxResult HhrInfo(@PathVariable("appUserId") Long appUserId){
+ return apiAppletHhrWorkOutService.HhrInfo(appUserId);
+ }
+
+
+
+ //合伙人工作台 - 绑定二维码
+ @ApiOperation("合伙人工作台 - 绑定二维码")
+ @GetMapping("/hhrCode/{appUserId}")
+ public AjaxResult HhrCode(@PathVariable("appUserId") Long appUserId){
+ return apiAppletHhrWorkOutService.HhrCode(appUserId);
+ }
+
+
+ //合伙人工作台 - 我的用户列表 0 未下单 1已下单
+ @ApiOperation("合伙人工作台 - 我的用户列表 0 未下单 1已下单")
+ @PostMapping("/hhrMyUserList")
+ public AjaxResult HhrMyUserList(@RequestBody ApiQueryIIdMyUserDTO dto, Pageable page){
+ return apiAppletHhrWorkOutService.HhrMyUserList(dto.getAppUserId(),dto.getState(),page);
+ }
+
+
+ //合伙人工作台 - 根据用户标识查询用户下单详细信息
+ @ApiOperation("合伙人工作台 - 根据用户标识查询用户下单详细信息")
+ @GetMapping("/hhrMyUserGetById/{appUserId}")
+ public AjaxResult HhrMyUserGetById(@PathVariable("appUserId") Long appUserId){
+ return apiAppletHhrWorkOutService.HhrMyUserGetById(appUserId);
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+}
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletInfoController.java b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletInfoController.java
new file mode 100644
index 0000000..5c3b5a9
--- /dev/null
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletInfoController.java
@@ -0,0 +1,28 @@
+package com.ruoyi.applet.contoller;
+
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Api(description = "伴宠师-我的流程")
+@RestController
+@RequestMapping("/applet/info")
+public class ApiAppletInfoController {
+
+
+
+
+
+
+
+
+
+
+
+
+}
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletLoginController.java b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletLoginController.java
new file mode 100644
index 0000000..da74608
--- /dev/null
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletLoginController.java
@@ -0,0 +1,53 @@
+package com.ruoyi.applet.contoller;
+
+import com.ruoyi.applet.pojo.dto.ApiAppletLoginDTO;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.model.service.IAApiAppletLoginService;
+import com.ruoyi.model.service.IAddValueServiceService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+@Api(description = "伴宠师-登录流程")
+@RestController
+@RequestMapping("/applet/login")
+public class ApiAppletLoginController {
+
+ //伴宠师-登录相关问题
+ @Autowired
+ private IAApiAppletLoginService apiAppletLoginService;
+
+
+ //伴宠师-微信授权登录
+ @ApiOperation("伴宠师-微信授权登录")
+ @PostMapping("/wechatLogin")
+ public AjaxResult wechatLogin(@RequestBody ApiAppletLoginDTO params){
+ return apiAppletLoginService.wechatLogin(params);
+ }
+
+
+ //伴宠师-获取手机号码
+ @ApiOperation("伴宠师-获取手机号码")
+ @PostMapping("/bindPhone")
+ public AjaxResult bindPhone(@RequestBody ApiAppletLoginDTO params){
+ return apiAppletLoginService.bindPhone(params);
+ }
+
+
+ //伴宠师-登录页基础信息
+ @ApiOperation("伴宠师-登录页基础信息")
+ @GetMapping("/loginConf")
+ public AjaxResult loginConf(){
+ return apiAppletLoginService.loginConf();
+ }
+
+
+
+ //伴宠师-获取用户基本能信息
+ @ApiOperation("伴宠师-获取用户基本能信息")
+ @GetMapping("/getAppletUserInfo/{appUserId}")
+ public AjaxResult getAppletUserInfo(@PathVariable("appUserId") Long appUserId){
+ return apiAppletLoginService.getAppletUserInfo(appUserId);
+ }
+}
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletWalletController.java b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletWalletController.java
new file mode 100644
index 0000000..19ad907
--- /dev/null
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletWalletController.java
@@ -0,0 +1,59 @@
+package com.ruoyi.applet.contoller;
+
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.model.domain.AppTransactionDetails;
+import com.ruoyi.model.service.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+
+@Api(description = "伴宠师-钱包相关接口")
+@RestController
+@RequestMapping("/applet/wallet")
+public class ApiAppletWalletController extends BaseController {
+
+ //钱包
+ @Autowired
+ private IAppWalletService appWalletService;
+
+ //钱包提现配置
+ @Autowired
+ private IAppWithdrawalConfigService appWithdrawalConfigService;
+
+ @Autowired
+ private IAppTransactionDetailsService appTransactionDetailsService;
+
+ @Autowired
+ private ITransactionDetailsService transactionDetailsService;
+
+
+ @ApiOperation("交易明细记录列表-这里还要改成带分页的")
+ @GetMapping("/getTransactionDetailsList/{transactionType}")
+ public TableDataInfo getTransactionDetailsList(@PathVariable Long transactionType){
+ return getDataTable(transactionDetailsService.getTransactionDetailsList(transactionType));
+ }
+
+ @ApiOperation("交易明细记录")
+ @GetMapping("/getTransactionDetails/{id}")
+ public TableDataInfo getAppTransactionDetailsByWid(@PathVariable Long id){
+ return getDataTable(appTransactionDetailsService.getAppTransactionDetailsByWid(id));
+ }
+
+ //伴宠师-用户提现
+ @ApiOperation("伴宠师-用户提现")
+ @PostMapping("/saveMoney")
+ public AjaxResult saveMoney(@PathVariable BigDecimal money){
+ AppTransactionDetails appTransactionDetails = new AppTransactionDetails();
+ appTransactionDetails.setDetailsName("提现测试");
+ appTransactionDetails.setDetailsPrice(100L);
+ appTransactionDetailsService.insertAppTransactionDetails(appTransactionDetails);
+ return AjaxResult.success("提现成功");
+ }
+
+}
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/AppletBannerController.java b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/AppletBannerController.java
index f002f9a..1f564a0 100644
--- a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/AppletBannerController.java
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/AppletBannerController.java
@@ -1,29 +1,29 @@
-package com.ruoyi.applet.contoller;
-
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.model.domain.AppBanner;
-import com.ruoyi.model.service.IAppBannerService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-@Api(description = "轮播图")
-@RestController
-@RequestMapping("/applet/banner")
-public class AppletBannerController extends BaseController {
- //1.查询轮播图接口
- @Autowired
- private IAppBannerService iAppBannerService;
-
- @ApiOperation("轮播图列表")
- @GetMapping("/list")
- public TableDataInfo list(){
- return getDataTable(iAppBannerService.getBannerList());
- }
-}
+//package com.ruoyi.applet.contoller;
+//
+//import com.ruoyi.common.core.controller.BaseController;
+//import com.ruoyi.common.core.page.TableDataInfo;
+//import com.ruoyi.model.domain.AppBanner;
+//import com.ruoyi.model.service.IAppBannerService;
+//import io.swagger.annotations.Api;
+//import io.swagger.annotations.ApiOperation;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.web.bind.annotation.GetMapping;
+//import org.springframework.web.bind.annotation.RequestMapping;
+//import org.springframework.web.bind.annotation.RestController;
+//
+//import java.util.List;
+//
+//@Api(description = "伴宠师-轮播图")
+//@RestController
+//@RequestMapping("/applet/banner")
+//public class AppletBannerController extends BaseController {
+//// //1.查询轮播图接口
+//// @Autowired
+//// private IAppBannerService iAppBannerService;
+////
+//// @ApiOperation("轮播图列表")
+//// @GetMapping("/list")
+//// public TableDataInfo list(){
+//// return getDataTable(iAppBannerService.getBannerList());
+//// }
+//}
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/AppletIndexIconController.java b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/AppletIndexIconController.java
deleted file mode 100644
index 7e91129..0000000
--- a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/AppletIndexIconController.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.ruoyi.applet.contoller;
-
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.model.domain.Indexconfig;
-import com.ruoyi.model.domain.IndexconfigIcon;
-import com.ruoyi.model.service.IIndexconfigIconService;
-import com.ruoyi.model.service.IIndexconfigService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-@Api(description = "工作台图标")
-@RestController
-@RequestMapping("/applet/indexIcon")
-public class AppletIndexIconController extends BaseController {
-
- @Autowired
- private IIndexconfigIconService indexconfigIconService;
-
- @Autowired
- private IIndexconfigService indexConfigService;
-
- @ApiOperation("未加入的工作台图标配置查询")
- @GetMapping("/indexConfigIcon/{identity}")
- public AjaxResult getIndexConfigIcon(@PathVariable Long identity){
- IndexconfigIcon indexconfigIconByIdentity = indexconfigIconService.getIndexconfigIconByIdentity(identity);
- return AjaxResult.success(indexconfigIconByIdentity);
- }
-
- @ApiOperation("已加入的工作台图标配置查询")
- @GetMapping("/indexConfig/{indexType}")
- public TableDataInfo getIndexConfig(@PathVariable Long indexType){
- return getDataTable(indexConfigService.getIndexconfigList(indexType));
- }
-}
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/AppletIndexPartnerConfigController.java b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/AppletIndexPartnerConfigController.java
index d9e083d..bfe380b 100644
--- a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/AppletIndexPartnerConfigController.java
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/AppletIndexPartnerConfigController.java
@@ -1,30 +1,25 @@
-package com.ruoyi.applet.contoller;
-
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.model.domain.IndexPartnerConfig;
-import com.ruoyi.model.service.IIndexPartnerConfigService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-@Api(description = "加入合伙人提示配置")
-@RestController
-@RequestMapping("/applet/indexPartnerConfig")
-public class AppletIndexPartnerConfigController extends BaseController {
-
- @Autowired
- private IIndexPartnerConfigService iIndexPartnerConfigService;
-
- @ApiOperation("查询加入合伙人提示配置列表")
- @GetMapping("/list")
- public TableDataInfo list(){
- List indexPartnerConfigList = iIndexPartnerConfigService.getIndexPartnerConfigList();
- return getDataTable(indexPartnerConfigList);
- }
-}
+//package com.ruoyi.applet.contoller;
+//
+//import com.ruoyi.common.core.controller.BaseController;
+//import com.ruoyi.common.core.page.TableDataInfo;
+//import com.ruoyi.model.domain.IndexPartnerConfig;
+//import com.ruoyi.model.service.IIndexPartnerConfigService;
+//import io.swagger.annotations.Api;
+//import io.swagger.annotations.ApiOperation;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.web.bind.annotation.GetMapping;
+//import org.springframework.web.bind.annotation.RequestMapping;
+//import org.springframework.web.bind.annotation.RestController;
+//
+//import java.util.List;
+//
+//@Api(description = "伴宠师-合伙人已绑定工作台")
+//@RestController
+//@RequestMapping("/applet/hhr")
+//public class AppletIndexPartnerConfigController extends BaseController {
+//
+//
+//
+//
+//
+//}
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/AppletLoginController.java b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/AppletLoginController.java
deleted file mode 100644
index ace4c88..0000000
--- a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/AppletLoginController.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.ruoyi.applet.contoller;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageImpl;
-import org.springframework.data.domain.Pageable;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Api(description = "伴宠师登录")
-@RestController
-@RequestMapping("/applet/login")
-public class AppletLoginController {
-// @Autowired
-
- //1.微信授权登录接口
- //2.获取微信手机号接口
- //3.获取用户协议和隐私政策（用一个config拉取）
- // @Aonymous
-// @ApiOperation("登录接口")
-// @PostMapping("/login")
-// public ResponseEntity login(@RequestBody AppletLoginRequest appletLoginRequest){
-// Map hashMap = new HashMap();
-// hashMap.put("userInfo",appletLoginRequest);
-// hashMap.put("token",123);
-// return ResponseEntity.ok(hashMap);
-// }
-}
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/AppletWalletController.java b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/AppletWalletController.java
deleted file mode 100644
index 75e1ead..0000000
--- a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/AppletWalletController.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.ruoyi.applet.contoller;
-
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.model.service.IAppTransactionDetailsService;
-import com.ruoyi.model.service.IAppWalletService;
-import com.ruoyi.model.service.IAppWithdrawalConfigService;
-import com.ruoyi.model.service.ITransactionDetailsService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@Api(description = "钱包")
-@RestController
-@RequestMapping("/applet/wallet")
-public class AppletWalletController extends BaseController {
-
- //钱包
- @Autowired
- private IAppWalletService appWalletService;
-
- //钱包提现配置
- @Autowired
- private IAppWithdrawalConfigService appWithdrawalConfigService;
-
- @Autowired
- private IAppTransactionDetailsService appTransactionDetailsService;
-
- @ApiOperation("钱包列表")
- @GetMapping("/getWalletList/{userId}")
- public TableDataInfo getAppWalletByUserId(@PathVariable Long userId){
- return getDataTable(appWalletService.getAppWalletByUserId(userId));
- }
- @Autowired
- private ITransactionDetailsService transactionDetailsService;
-
- @ApiOperation("交易明细记录列表")
- @GetMapping("/getTransactionDetailsList")
- public TableDataInfo getTransactionDetailsList(){
- return getDataTable(transactionDetailsService.getTransactionDetailsList());
- }
-
- @ApiOperation("钱包提现规则")
- @GetMapping("/getAppWithdrawal")
- public AjaxResult getAppWithdrawalConfig(){
- return AjaxResult.success(appWithdrawalConfigService.getAppWithdrawalConfig());
- }
-
- @ApiOperation("交易明细记录")
- @GetMapping("/getTransactionDetails/{wid}")
- public TableDataInfo getAppTransactionDetailsByWid(@PathVariable Long wid){
- return getDataTable(appTransactionDetailsService.getAppTransactionDetailsByWid(wid));
- }
-}
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/applet/pojo/dto/ApiAppletLoginDTO.java b/ruoyi-catdog/src/main/java/com/ruoyi/applet/pojo/dto/ApiAppletLoginDTO.java
new file mode 100644
index 0000000..93eecb0
--- /dev/null
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/applet/pojo/dto/ApiAppletLoginDTO.java
@@ -0,0 +1,27 @@
+package com.ruoyi.applet.pojo.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class ApiAppletLoginDTO {
+
+ /**
+ * 参数信息
+ */
+ @ApiModelProperty(value = "参数信息")
+ private String code;
+
+ /**
+ * 用户唯一标识
+ */
+ @ApiModelProperty(value = "用户唯一标识")
+ private String openid;
+
+ /**
+ * 邀请者标识
+ */
+ @ApiModelProperty(value = "邀请者销售标识")
+ private String shareId;
+
+}
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/applet/pojo/dto/ApiQueryIIdDTO.java b/ruoyi-catdog/src/main/java/com/ruoyi/applet/pojo/dto/ApiQueryIIdDTO.java
new file mode 100644
index 0000000..0b289ed
--- /dev/null
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/applet/pojo/dto/ApiQueryIIdDTO.java
@@ -0,0 +1,14 @@
+package com.ruoyi.applet.pojo.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class ApiQueryIIdDTO {
+
+ /**
+ * 用户标识
+ */
+ @ApiModelProperty(value = "用户标识")
+ private Long appUserId;
+}
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/applet/pojo/dto/ApiQueryIIdMyUserDTO.java b/ruoyi-catdog/src/main/java/com/ruoyi/applet/pojo/dto/ApiQueryIIdMyUserDTO.java
new file mode 100644
index 0000000..daaa007
--- /dev/null
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/applet/pojo/dto/ApiQueryIIdMyUserDTO.java
@@ -0,0 +1,21 @@
+package com.ruoyi.applet.pojo.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class ApiQueryIIdMyUserDTO {
+
+ /**
+ * 用户标识
+ */
+ @ApiModelProperty(value = "用户标识")
+ private Long appUserId;
+
+
+ /**
+ * 状态0未下单1已下单
+ */
+ @ApiModelProperty(value = "状态0未下单1已下单")
+ private Integer state;
+}
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/applet/utils/conf/AppletUtil.java b/ruoyi-catdog/src/main/java/com/ruoyi/applet/utils/conf/AppletUtil.java
new file mode 100644
index 0000000..6bacb82
--- /dev/null
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/applet/utils/conf/AppletUtil.java
@@ -0,0 +1,15 @@
+package com.ruoyi.applet.utils.conf;
+
+import com.ruoyi.common.constant.Constants;
+import com.ruoyi.framework.config.LocalDataUtil;
+import com.ruoyi.model.domain.AppUsers;
+import org.springframework.stereotype.Service;
+
+@Service
+public class AppletUtil {
+
+ public static AppUsers getLocalAppletUser() {
+ AppUsers user = (AppUsers) LocalDataUtil.getVar(Constants.LOGIN_APPLET_TOKEN_KEY);
+ return user;
+ }
+}
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/applet/utils/wechat/WechatHttpConf.java b/ruoyi-catdog/src/main/java/com/ruoyi/applet/utils/wechat/WechatHttpConf.java
new file mode 100644
index 0000000..437a797
--- /dev/null
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/applet/utils/wechat/WechatHttpConf.java
@@ -0,0 +1,33 @@
+package com.ruoyi.applet.utils.wechat;
+
+import com.alibaba.fastjson.JSONObject;
+import org.apache.http.HttpEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.util.EntityUtils;
+import org.springframework.stereotype.Component;
+
+@Component
+public class WechatHttpConf {
+
+ public JSONObject getJSONObject(String url){
+ String jsonObjectStr = null;
+ try {
+ CloseableHttpClient client = null;
+ CloseableHttpResponse response = null;
+ HttpGet httpGet = new HttpGet(url);
+ client = HttpClients.createDefault();
+ response = client.execute(httpGet);
+ HttpEntity entity = response.getEntity();
+ jsonObjectStr = EntityUtils.toString(entity);
+ } catch (Exception e) {
+ throw new RuntimeException("服务繁忙，稍后再试");
+ }
+ JSONObject jsonObject = JSONObject.parseObject(jsonObjectStr);
+ return jsonObject;
+ }
+
+
+}
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppUsers.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppUsers.java
index 7d6fa6d..f8d1407 100644
--- a/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppUsers.java
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppUsers.java
@@ -1,7 +1,11 @@
package com.ruoyi.model.domain;
+import java.math.BigDecimal;
import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
@@ -13,6 +17,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
* @author ruoyi
* @date 2025-03-08
*/
+@Data
public class AppUsers extends BaseEntity
{
private static final long serialVersionUID = 1L;
@@ -68,144 +73,162 @@ public class AppUsers extends BaseEntity
@Excel(name = "过期时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date expireTime;
- public void setUserId(Long userId)
- {
- this.userId = userId;
- }
-
- public Long getUserId()
- {
- return userId;
- }
- public void setDelFlag(Integer delFlag)
- {
- this.delFlag = delFlag;
- }
-
- public Integer getDelFlag()
- {
- return delFlag;
- }
- public void setUpdatorBy(String updatorBy)
- {
- this.updatorBy = updatorBy;
- }
-
- public String getUpdatorBy()
- {
- return updatorBy;
- }
- public void setUserImage(String userImage)
- {
- this.userImage = userImage;
- }
-
- public String getUserImage()
- {
- return userImage;
- }
- public void setUserName(String userName)
- {
- this.userName = userName;
- }
-
- public String getUserName()
- {
- return userName;
- }
- public void setUserState(Long userState)
- {
- this.userState = userState;
- }
-
- public Long getUserState()
- {
- return userState;
- }
- public void setUserTelephone(String userTelephone)
- {
- this.userTelephone = userTelephone;
- }
-
- public String getUserTelephone()
- {
- return userTelephone;
- }
- public void setUnionid(String unionid)
- {
- this.unionid = unionid;
- }
-
- public String getUnionid()
- {
- return unionid;
- }
- public void setOpenid(String openid)
- {
- this.openid = openid;
- }
-
- public String getOpenid()
- {
- return openid;
- }
- public void setAccessToken(String accessToken)
- {
- this.accessToken = accessToken;
- }
-
- public String getAccessToken()
- {
- return accessToken;
- }
- public void setExpiresIn(Long expiresIn)
- {
- this.expiresIn = expiresIn;
- }
-
- public Long getExpiresIn()
- {
- return expiresIn;
- }
- public void setRefreshToken(String refreshToken)
- {
- this.refreshToken = refreshToken;
- }
-
- public String getRefreshToken()
- {
- return refreshToken;
- }
- public void setExpireTime(Date expireTime)
- {
- this.expireTime = expireTime;
- }
-
- public Date getExpireTime()
- {
- return expireTime;
- }
-
- @Override
- public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("userId", getUserId())
- .append("createBy", getCreateBy())
- .append("createTime", getCreateTime())
- .append("delFlag", getDelFlag())
- .append("remark", getRemark())
- .append("updateTime", getUpdateTime())
- .append("updatorBy", getUpdatorBy())
- .append("userImage", getUserImage())
- .append("userName", getUserName())
- .append("userState", getUserState())
- .append("userTelephone", getUserTelephone())
- .append("unionid", getUnionid())
- .append("openid", getOpenid())
- .append("accessToken", getAccessToken())
- .append("expiresIn", getExpiresIn())
- .append("refreshToken", getRefreshToken())
- .append("expireTime", getExpireTime())
- .toString();
- }
+ /** 是否合伙人 */
+ @Excel(name = "是否合伙人")
+ private Integer userHh;
+ /** 是否伴宠师 */
+ @Excel(name = "是否伴宠师")
+ private Integer userBcs;
+
+ @TableField(exist = false)
+ private Date recentlyPayTime;
+ @TableField(exist = false)
+ private BigDecimal accumulate_money = new BigDecimal(100) ;
+ @TableField(exist = false)
+ private BigDecimal reward_money = new BigDecimal(99) ;
+
+
+
+
+
+// public void setUserId(Long userId)
+// {
+// this.userId = userId;
+// }
+//
+// public Long getUserId()
+// {
+// return userId;
+// }
+// public void setDelFlag(Integer delFlag)
+// {
+// this.delFlag = delFlag;
+// }
+//
+// public Integer getDelFlag()
+// {
+// return delFlag;
+// }
+// public void setUpdatorBy(String updatorBy)
+// {
+// this.updatorBy = updatorBy;
+// }
+//
+// public String getUpdatorBy()
+// {
+// return updatorBy;
+// }
+// public void setUserImage(String userImage)
+// {
+// this.userImage = userImage;
+// }
+//
+// public String getUserImage()
+// {
+// return userImage;
+// }
+// public void setUserName(String userName)
+// {
+// this.userName = userName;
+// }
+//
+// public String getUserName()
+// {
+// return userName;
+// }
+// public void setUserState(Long userState)
+// {
+// this.userState = userState;
+// }
+//
+// public Long getUserState()
+// {
+// return userState;
+// }
+// public void setUserTelephone(String userTelephone)
+// {
+// this.userTelephone = userTelephone;
+// }
+//
+// public String getUserTelephone()
+// {
+// return userTelephone;
+// }
+// public void setUnionid(String unionid)
+// {
+// this.unionid = unionid;
+// }
+//
+// public String getUnionid()
+// {
+// return unionid;
+// }
+// public void setOpenid(String openid)
+// {
+// this.openid = openid;
+// }
+//
+// public String getOpenid()
+// {
+// return openid;
+// }
+// public void setAccessToken(String accessToken)
+// {
+// this.accessToken = accessToken;
+// }
+//
+// public String getAccessToken()
+// {
+// return accessToken;
+// }
+// public void setExpiresIn(Long expiresIn)
+// {
+// this.expiresIn = expiresIn;
+// }
+//
+// public Long getExpiresIn()
+// {
+// return expiresIn;
+// }
+// public void setRefreshToken(String refreshToken)
+// {
+// this.refreshToken = refreshToken;
+// }
+//
+// public String getRefreshToken()
+// {
+// return refreshToken;
+// }
+// public void setExpireTime(Date expireTime)
+// {
+// this.expireTime = expireTime;
+// }
+//
+// public Date getExpireTime()
+// {
+// return expireTime;
+// }
+//
+// @Override
+// public String toString() {
+// return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+// .append("userId", getUserId())
+// .append("createBy", getCreateBy())
+// .append("createTime", getCreateTime())
+// .append("delFlag", getDelFlag())
+// .append("remark", getRemark())
+// .append("updateTime", getUpdateTime())
+// .append("updatorBy", getUpdatorBy())
+// .append("userImage", getUserImage())
+// .append("userName", getUserName())
+// .append("userState", getUserState())
+// .append("userTelephone", getUserTelephone())
+// .append("unionid", getUnionid())
+// .append("openid", getOpenid())
+// .append("accessToken", getAccessToken())
+// .append("expiresIn", getExpiresIn())
+// .append("refreshToken", getRefreshToken())
+// .append("expireTime", getExpireTime())
+// .toString();
+// }
}
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/TransactionDetails.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/TransactionDetails.java
index d8ea3e0..4d6862a 100644
--- a/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/TransactionDetails.java
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/TransactionDetails.java
@@ -26,8 +26,8 @@ public class TransactionDetails extends BaseEntity
@Excel(name = "金额")
private Long detailsPrice;
- /** 交易类型: 1为收入明细，2为支出明细 */
- @Excel(name = "交易类型: 1为收入明细，2为支出明细")
+ /** 交易类型: 0为收入明细，1为支出明细 */
+ @Excel(name = "交易类型: 0为收入明细，1为支出明细")
private Long transactionType;
public void setId(Long id)
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppUsersMapper.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppUsersMapper.java
index aa245c4..301b247 100644
--- a/ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppUsersMapper.java
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppUsersMapper.java
@@ -58,4 +58,20 @@ public interface AppUsersMapper
* @return 结果
*/
public int deleteAppUsersByUserIds(Long[] userIds);
+
+
+
+
+
+
+
+
+
+
+ /**
+ * 根据微信标识查询用户信息
+ * @param openid
+ * @return
+ */
+ public AppUsers selectAppUsersByOpenId(String openid);
}
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/IndexconfigIconMapper.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/IndexconfigIconMapper.java
index 9f0d69d..6a577c9 100644
--- a/ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/IndexconfigIconMapper.java
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/IndexconfigIconMapper.java
@@ -61,8 +61,7 @@ public interface IndexconfigIconMapper
/**
* 根据identity查询图标信息
- * @param identity
* @return
*/
- IndexconfigIcon getIndexconfigIconByIdentity(Long identity);
+ public List getIndexconfigIconByIdentity();
}
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/IndexconfigMapper.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/IndexconfigMapper.java
index 8be2b37..8b1d043 100644
--- a/ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/IndexconfigMapper.java
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/IndexconfigMapper.java
@@ -64,5 +64,5 @@ public interface IndexconfigMapper
*
* @return 主页工作台配置集合
*/
- public List getIndexconfigList(Long indexType);
+ public List getIndexconfigList();
}
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/TransactionDetailsMapper.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/TransactionDetailsMapper.java
index 1837842..f0876b5 100644
--- a/ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/TransactionDetailsMapper.java
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/TransactionDetailsMapper.java
@@ -64,5 +64,5 @@ public interface TransactionDetailsMapper
*
* @return 交易明细记录集合
*/
- public List getTransactionDetailsList();
+ public List getTransactionDetailsList(Long transactionType);
}
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAApiAppletHhrWorkOutService.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAApiAppletHhrWorkOutService.java
new file mode 100644
index 0000000..3394420
--- /dev/null
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAApiAppletHhrWorkOutService.java
@@ -0,0 +1,25 @@
+package com.ruoyi.model.service;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import org.springframework.data.domain.Pageable;
+
+public interface IAApiAppletHhrWorkOutService {
+
+ //合伙人工作台 - 绑定用户基础信息
+ AjaxResult HhrInfo(Long appUserId);
+
+
+ //合伙人工作台 - 绑定二维码
+ AjaxResult HhrCode(Long appUserId);
+
+
+ //合伙人工作台 - 我的用户列表 0 未下单 1已下单
+ AjaxResult HhrMyUserList(Long appUserId,Integer state, Pageable page);
+
+
+ //合伙人工作台 - 根据用户标识查询用户下单详细信息
+ AjaxResult HhrMyUserGetById(Long appUserId);
+
+
+
+}
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAApiAppletLoginService.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAApiAppletLoginService.java
new file mode 100644
index 0000000..587b6a7
--- /dev/null
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAApiAppletLoginService.java
@@ -0,0 +1,23 @@
+package com.ruoyi.model.service;
+
+import com.ruoyi.applet.pojo.dto.ApiAppletLoginDTO;
+import com.ruoyi.common.core.domain.AjaxResult;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PathVariable;
+
+public interface IAApiAppletLoginService {
+
+
+ //伴宠师-微信授权登录
+ AjaxResult wechatLogin(ApiAppletLoginDTO params);
+
+ //伴宠师-获取手机号码
+ AjaxResult bindPhone(ApiAppletLoginDTO params);
+
+ //伴宠师-登录页基础信息
+ AjaxResult loginConf();
+
+ //伴宠师-获取用户基本能信息
+ AjaxResult getAppletUserInfo(Long appUserId);
+
+}
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/IApiAppletInfoService.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/IApiAppletInfoService.java
new file mode 100644
index 0000000..6cf6e79
--- /dev/null
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/IApiAppletInfoService.java
@@ -0,0 +1,4 @@
+package com.ruoyi.model.service;
+
+public interface IApiAppletInfoService {
+}
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAppUsersService.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAppUsersService.java
index 3d013e0..9ba6e07 100644
--- a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAppUsersService.java
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAppUsersService.java
@@ -58,4 +58,17 @@ public interface IAppUsersService
* @return 结果
*/
public int deleteAppUsersByUserId(Long userId);
+
+
+
+
+ /**
+ * 根据微信标识查询用户信息
+ * @param openid
+ * @return
+ */
+ public AppUsers selectAppUsersByOpenId(String openid);
+
+
+// public int updateAppUsersByOpenId(AppUsers appUsers);
}
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/IIndexconfigIconService.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/IIndexconfigIconService.java
index b4f550a..0aeb22d 100644
--- a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/IIndexconfigIconService.java
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/IIndexconfigIconService.java
@@ -62,8 +62,7 @@ public interface IIndexconfigIconService
/**
* 查询工作台图标
*
- * @param identity 工作台图标身份
* @return 工作台图标
*/
- public IndexconfigIcon getIndexconfigIconByIdentity(Long identity);
+ public List getIndexconfigIconByIdentity();
}
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/IIndexconfigService.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/IIndexconfigService.java
index 5f2c5a5..f44e540 100644
--- a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/IIndexconfigService.java
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/IIndexconfigService.java
@@ -64,5 +64,5 @@ public interface IIndexconfigService
*
* @return 主页工作台配置集合
*/
- public List getIndexconfigList(Long indexType);
+ public List getIndexconfigList();
}
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/ITransactionDetailsService.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/ITransactionDetailsService.java
index 82f71bd..e9870af 100644
--- a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/ITransactionDetailsService.java
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/ITransactionDetailsService.java
@@ -64,5 +64,5 @@ public interface ITransactionDetailsService
*
* @return 交易明细记录集合
*/
- public List getTransactionDetailsList();
+ public List getTransactionDetailsList(Long transactionType);
}
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AApiAppletHhrWorkOutServiceImpl.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AApiAppletHhrWorkOutServiceImpl.java
new file mode 100644
index 0000000..ebdd914
--- /dev/null
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AApiAppletHhrWorkOutServiceImpl.java
@@ -0,0 +1,135 @@
+package com.ruoyi.model.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.applet.utils.conf.AppletUtil;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.framework.web.service.TokenService;
+import com.ruoyi.model.domain.AppUsers;
+import com.ruoyi.model.service.IAApiAppletHhrWorkOutService;
+import com.ruoyi.model.service.IAppUsersService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.Pageable;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Slf4j
+@Service
+public class AApiAppletHhrWorkOutServiceImpl implements IAApiAppletHhrWorkOutService {
+
+ @Resource
+ private IAppUsersService appUsersService;
+ @Resource
+ private TokenService tokenService;
+
+ //合伙人工作台 - 绑定用户基础信息
+ @Override
+ public AjaxResult HhrInfo(Long appUserId){
+// AppUsers localAppletUser = AppletUtil.getLocalAppletUser();
+ AppUsers localAppletUser = new AppUsers();
+ localAppletUser.setUserId(appUserId);
+ AppUsers appUsers = appUsersService.selectAppUsersByUserId(localAppletUser.getUserId());
+
+ Map map = new HashMap<>();
+ map.put("info",appUsers); //用户信息
+ map.put("partner_level","初级合伙人"); //合伙人等级
+ map.put("partner_day","138天"); //合伙人加入天数
+ map.put("partner_new_num","25"); //合伙人当前合伙人比例
+ map.put("partner_upgrade_num","30"); //合伙人晋级之后的合伙人比例
+ map.put("user_code","jsk66623"); //邀请码
+ map.put("user_code_bj","https://image.hhlm1688.com/img/work/log/indexInfo/11.png"); //邀请码背景图
+ map.put("user_code_fx","https://image.hhlm1688.com/img/work/log/indexInfo/11.png"); //分享海报背景图
+ map.put("user_code_url","https://image.hhlm1688.com/img/work/log/indexInfo/11.png"); //分销链接背景图
+
+
+ map.put("register_users","100"); //当月注册用户
+ map.put("order_users","200"); //当月下单用户
+ map.put("use_users","200"); //当月有效用户
+
+ map.put("order_users_money","288.98"); //本月订单金额
+ map.put("use_users_money","288.98"); //本月有效订单金额
+
+
+ map.put("register_users_sum","999"); //累积注册用户
+ map.put("order_users_sum","998"); //累积下单用户
+ map.put("use_users_sum","999"); //累积有效用户
+
+
+ map.put("order_users_sum_money","288.98"); //累积订单金额
+ map.put("use_users_sum_money","288.98"); //累积有效订单金额
+
+
+
+ map.put("money","998.98"); //钱包金额
+ map.put("new_money","288.98"); //本月分成
+ map.put("old_money","288.98"); //累积分成
+
+
+
+
+
+ map.put("upgrade_register_num","5"); //距离下一个等级需要注册多少人
+ map.put("upgrade_order_num","20"); //距离下一个等级需要下单人数
+ map.put("upgrade_image","https://image.hhlm1688.com/img/work/log/indexInfo/11.png"); //背景图
+ map.put("upgrade_details","合伙人权益说明：富文本"); //合伙人权益说明：富文本
+
+
+
+ map.put("user_details","*累计报酬:当该用户订单完成时，才会纳入报酬计算：这是一个富文本"); //我的用户说明
+ map.put("level_details","累积数据:即注册至今的累计数据:这是一个富文本"); //我的等级说明
+ map.put("withdrawal_details","提现说明:这是一个富文本提现说明:这是一个富文本提现说明:这是一个富文本提现说明:这是一个富文本"); //提现说明
+
+
+
+ return AjaxResult.success(map);
+ }
+
+
+
+ //合伙人工作台 - 绑定二维码
+ @Override
+ public AjaxResult HhrCode(Long appUserId){
+ AppUsers localAppletUser = new AppUsers();
+ localAppletUser.setUserId(appUserId);
+ AppUsers appUsers = appUsersService.selectAppUsersByUserId(localAppletUser.getUserId());
+
+ Map map = new HashMap<>();
+ map.put("code","666666");//邀请码
+ map.put("url","https://image.hhlm1688.com/img/work/log/headImage.png");//二维码地址
+ map.put("bj_url","https://image.hhlm1688.com/img/work/log/headImage.png");//海报背景图
+ map.put("title","欢迎来到宠物小程序二维码部分");//说明
+
+ return AjaxResult.success(map);
+ }
+
+
+ //合伙人工作台 - 我的用户列表 0 未下单 1已下单
+ @Override
+ public AjaxResult HhrMyUserList(Long appUserId,Integer state, Pageable page){
+ AppUsers localAppletUser = new AppUsers();
+ localAppletUser.setUserId(appUserId);
+ List pageRes = appUsersService.selectAppUsersList(new AppUsers());
+// PageImpl appUsers = new PageImpl<>(pageRes, page, ((Page) pageRes).getTotal());
+ return AjaxResult.success("查询分页成功",pageRes);
+ }
+
+
+ //合伙人工作台 - 根据用户标识查询用户下单详细信息
+ @Override
+ public AjaxResult HhrMyUserGetById(Long appUserId){
+ Map map = new HashMap<>();
+ map.put("createTime",new Date());//注册时间
+ map.put("recently_pay_time",new Date());//最近下单时间
+ map.put("accumulate_money","9999.99");//海报背景图
+ map.put("reward_money","100");//累积报酬
+ return AjaxResult.success("用户下单详细信息成功",map);
+ }
+
+
+}
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AApiAppletLoginServiceImpl.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AApiAppletLoginServiceImpl.java
new file mode 100644
index 0000000..2065687
--- /dev/null
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AApiAppletLoginServiceImpl.java
@@ -0,0 +1,203 @@
+package com.ruoyi.model.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.ruoyi.applet.pojo.dto.ApiAppletLoginDTO;
+import com.ruoyi.applet.utils.wechat.WechatHttpConf;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.model.LoginApplet;
+import com.ruoyi.common.core.domain.model.LoginMember;
+import com.ruoyi.model.domain.AppUsers;
+import com.ruoyi.model.service.IAApiAppletLoginService;
+import com.ruoyi.model.service.IAppUsersService;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.ResponseEntity;
+import com.ruoyi.framework.web.service.TokenService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+
+import java.io.BufferedReader;
+import java.io.DataOutputStream;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.time.LocalDateTime;
+import java.util.*;
+
+import static org.bouncycastle.asn1.x500.style.RFC4519Style.member;
+
+@Slf4j
+@Service
+public class AApiAppletLoginServiceImpl implements IAApiAppletLoginService {
+
+
+ @Value("${wechat-admin.appId}")
+ private String appId;
+ @Value("${wechat-admin.secret}")
+ private String secret;
+ private static final String TOKEN_URL = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=%s&secret=%s";
+ private static final String API_URL = "https://api.weixin.qq.com/wxa/business/getuserphonenumber";
+ @Resource
+ private WechatHttpConf wechatHttpConf;
+ @Resource
+ private IAppUsersService appUsersService;
+ @Resource
+ private TokenService tokenService;
+
+
+
+
+
+ //伴宠师-微信授权登录
+ @Transactional(rollbackFor = {Exception.class})
+ @Override
+ public AjaxResult wechatLogin(ApiAppletLoginDTO params){
+ if(StringUtils.isEmpty(params.getCode())){
+ throw new RuntimeException("参数错误");
+ }
+ String loginUrl = "https://api.weixin.qq.com/sns/jscode2session?appid="
+ + appId + "&secret="
+ + secret+ "&js_code="
+ + params.getCode()
+ + "&grant_type=authorization_code";
+ JSONObject wx_json = wechatHttpConf.getJSONObject(loginUrl);
+ String wxOpenid = wx_json.getString("openid");
+ if (StringUtils.isBlank(wxOpenid)) {
+ throw new RuntimeException("服务繁忙，稍后再试");
+ }
+ AppUsers appUsers = appUsersService.selectAppUsersByOpenId(wxOpenid);
+ if (appUsers == null) {
+ //用户信息为空的情况下说明是新的用户
+ appUsers = new AppUsers();
+ long appletId = System.currentTimeMillis();
+ appUsers.setUserId(appletId);
+ appUsers.setOpenid(wxOpenid);
+ appUsers.setUserName("伴宠师"+System.currentTimeMillis());//lzx需要修改到conf中的配置获取
+ appUsers.setUserImage("https://image.hhlm1688.com/img/work/log/headImage.png"); //lzx需要修改到conf中的配置获取
+ appUsers.setCreateTime(LocalDateTime.now());
+ appUsersService.insertAppUsers(appUsers);
+
+ LoginApplet loginApplet = new LoginApplet();
+ loginApplet.setAppletId(appletId);
+ String appletToken = tokenService.createAppletToken(loginApplet);
+ Map map = new HashMap();
+ map.put("token",appletToken);
+ map.put("userInfo",appUsers);
+ return AjaxResult.success("登录成功",map);
+ }else{
+ LoginApplet loginApplet = new LoginApplet();
+ loginApplet.setAppletId(appUsers.getUserId());
+ String appletToken = tokenService.createAppletToken(loginApplet);
+ Map map = new HashMap();
+ map.put("token",appletToken);
+ map.put("userInfo",appUsers);
+ return AjaxResult.success("登录成功",map);
+ }
+ }
+
+
+
+ //伴宠师-获取手机号码
+ @Override
+ public AjaxResult bindPhone(ApiAppletLoginDTO params){
+ try {
+ String phoneNumber = this.getPhoneNumber(params.getCode());
+ AppUsers appUsers = appUsersService.selectAppUsersByOpenId(params.getOpenid());
+ //如果对象存在
+ if (appUsers!=null){
+ appUsers.setUserTelephone(phoneNumber);
+ appUsersService.updateAppUsers(appUsers);
+ }
+ return AjaxResult.success(phoneNumber);
+ }catch (Exception e){
+ return AjaxResult.error(e.getMessage());
+ }
+ }
+
+
+
+ //伴宠师-登录页基础信息
+ @Override
+ public AjaxResult loginConf(){
+ Map map = new HashMap();
+ map.put("appletName","伴宠师");
+ map.put("appletLogoImg","https://image.hhlm1688.com/img/Group%20213084%402x.png");
+ map.put("user_xy","用户协议富文本");
+ map.put("user_zc","隐私政策富文本");
+ return AjaxResult.success("查询成功",map);
+ }
+
+
+
+ //伴宠师-获取用户基本能信息
+ @Override
+ public AjaxResult getAppletUserInfo(Long appUserId){
+ AppUsers appUsers = appUsersService.selectAppUsersByUserId(appUserId);
+ return AjaxResult.success("用户信息",appUsers);
+ }
+
+
+
+
+ public String getAccessToken() throws Exception {
+ String requestUrl = String.format(TOKEN_URL, appId, secret);
+ URL url = new URL(requestUrl);
+ HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+ conn.setRequestMethod("GET");
+
+ try (BufferedReader br = new BufferedReader(
+ new InputStreamReader(conn.getInputStream(), "UTF-8"))) {
+ StringBuilder response = new StringBuilder();
+ String responseLine;
+ while ((responseLine = br.readLine()) != null) {
+ response.append(responseLine.trim());
+ }
+
+ org.json.JSONObject jsonResponse = new org.json.JSONObject(response.toString());
+ return jsonResponse.getString("access_token");
+ }
+ }
+
+
+
+ public String getPhoneNumber(String code) throws Exception {
+ URL url = new URL(API_URL + "?access_token=" + this.getAccessToken());
+ HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+ conn.setRequestMethod("POST");
+ conn.setRequestProperty("Content-Type", "application/json; utf-8");
+ conn.setRequestProperty("Accept", "application/json");
+ conn.setDoOutput(true);
+
+ JSONObject jsonInput = new JSONObject();
+ jsonInput.put("code", code);
+
+ try (DataOutputStream os = new DataOutputStream(conn.getOutputStream())) {
+ byte[] input = jsonInput.toString().getBytes(StandardCharsets.UTF_8);
+ os.write(input, 0, input.length);
+ }
+
+ try (BufferedReader br = new BufferedReader(
+ new InputStreamReader(conn.getInputStream(), StandardCharsets.UTF_8))) {
+ StringBuilder response = new StringBuilder();
+ String responseLine;
+ while ((responseLine = br.readLine()) != null) {
+ response.append(responseLine.trim());
+ }
+ //获取手机号码
+ return response.toString();
+ }
+ }
+
+
+
+
+
+
+
+}
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/ApiAppletInfoServiceImpl.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/ApiAppletInfoServiceImpl.java
new file mode 100644
index 0000000..cf5e580
--- /dev/null
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/ApiAppletInfoServiceImpl.java
@@ -0,0 +1,8 @@
+package com.ruoyi.model.service.impl;
+
+import com.ruoyi.model.service.IApiAppletInfoService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class ApiAppletInfoServiceImpl implements IApiAppletInfoService {
+}
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppUsersServiceImpl.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppUsersServiceImpl.java
index 3ea26cb..f7f7c39 100644
--- a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppUsersServiceImpl.java
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppUsersServiceImpl.java
@@ -93,4 +93,16 @@ public class AppUsersServiceImpl implements IAppUsersService
{
return appUsersMapper.deleteAppUsersByUserId(userId);
}
+
+
+
+ /**
+ * 根据微信标识查询用户信息
+ * @param openid
+ * @return
+ */
+ @Override
+ public AppUsers selectAppUsersByOpenId(String openid){
+ return appUsersMapper.selectAppUsersByOpenId(openid);
+ }
}
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/IndexconfigIconServiceImpl.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/IndexconfigIconServiceImpl.java
index e56a9db..f58b7bd 100644
--- a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/IndexconfigIconServiceImpl.java
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/IndexconfigIconServiceImpl.java
@@ -92,7 +92,7 @@ public class IndexconfigIconServiceImpl implements IIndexconfigIconService
}
@Override
- public IndexconfigIcon getIndexconfigIconByIdentity(Long identity) {
- return indexconfigIconMapper.getIndexconfigIconByIdentity(identity);
+ public List getIndexconfigIconByIdentity() {
+ return indexconfigIconMapper.getIndexconfigIconByIdentity();
}
}
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/IndexconfigServiceImpl.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/IndexconfigServiceImpl.java
index 5f4485f..fd530d6 100644
--- a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/IndexconfigServiceImpl.java
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/IndexconfigServiceImpl.java
@@ -95,8 +95,8 @@ public class IndexconfigServiceImpl implements IIndexconfigService
}
@Override
- public List getIndexconfigList(Long indexType){
- return indexconfigMapper.getIndexconfigList(indexType);
+ public List getIndexconfigList(){
+ return indexconfigMapper.getIndexconfigList();
}
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/TransactionDetailsServiceImpl.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/TransactionDetailsServiceImpl.java
index ee29187..33189f2 100644
--- a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/TransactionDetailsServiceImpl.java
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/TransactionDetailsServiceImpl.java
@@ -99,7 +99,7 @@ public class TransactionDetailsServiceImpl implements ITransactionDetailsService
* @return 交易明细记录集合
*/
@Override
- public List getTransactionDetailsList() {
- return transactionDetailsMapper.getTransactionDetailsList();
+ public List getTransactionDetailsList(Long transactionType) {
+ return transactionDetailsMapper.getTransactionDetailsList(transactionType);
}
}
diff --git a/ruoyi-catdog/src/main/resources/mapper/model/AppUsersMapper.xml b/ruoyi-catdog/src/main/resources/mapper/model/AppUsersMapper.xml
index 18386e8..a848d01 100644
--- a/ruoyi-catdog/src/main/resources/mapper/model/AppUsersMapper.xml
+++ b/ruoyi-catdog/src/main/resources/mapper/model/AppUsersMapper.xml
@@ -50,6 +50,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where user_id = #{userId}
+
+
+
+
+
+
+
+
insert into app_users
diff --git a/ruoyi-catdog/src/main/resources/mapper/model/IndexconfigIconMapper.xml b/ruoyi-catdog/src/main/resources/mapper/model/IndexconfigIconMapper.xml
index 6281103..df455f5 100644
--- a/ruoyi-catdog/src/main/resources/mapper/model/IndexconfigIconMapper.xml
+++ b/ruoyi-catdog/src/main/resources/mapper/model/IndexconfigIconMapper.xml
@@ -28,11 +28,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where id = #{id}
-
-
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
index 7b895d9..cfe74f3 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
@@ -69,6 +69,7 @@ public class Constants
*/
public static final String LOGIN_TOKEN_KEY = "login_tokens:";
public static final String LOGIN_MEMBER_TOKEN_KEY = "login_member_tokens:";
+ public static final String LOGIN_APPLET_TOKEN_KEY = "login_applet_tokens:"; //伴宠师-小程序登录
public static final String MEMBER_INFO = "member_info";
public static final String STAFF_INFO = "staff_info";
@@ -102,6 +103,7 @@ public class Constants
*/
public static final String LOGIN_USER_KEY = "login_user_key";
public static final String LOGIN_MEMBER_KEY = "login_member_key";
+ public static final String LOGIN_APPLET_KEY = "login_applet_key";
/**
* 用户ID
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginApplet.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginApplet.java
new file mode 100644
index 0000000..760a9c0
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginApplet.java
@@ -0,0 +1,20 @@
+package com.ruoyi.common.core.domain.model;
+
+import lombok.Data;
+
+/**
+ * 伴宠师-小程序登录
+ */
+@Data
+public class LoginApplet {
+
+ private Long appletId;
+ private String token;
+ private Long loginTime;
+ private Long expireTime;
+
+ /**
+ * 登录类型（1伴宠师端）
+ */
+ private Integer sourceType;
+}
diff --git a/ruoyi-framework/pom.xml b/ruoyi-framework/pom.xml
index fd7fc50..99e7d62 100644
--- a/ruoyi-framework/pom.xml
+++ b/ruoyi-framework/pom.xml
@@ -69,9 +69,9 @@
ruoyi-system
-
- com.ruoyi
- ruoyi-catdog
-
+
+
+
+
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java
index 844f779..9f5c0a0 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java
@@ -5,6 +5,7 @@ import java.util.Map;
import java.util.concurrent.TimeUnit;
import javax.servlet.http.HttpServletRequest;
+import com.ruoyi.common.core.domain.model.LoginApplet;
import com.ruoyi.common.core.domain.model.LoginMember;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -98,6 +99,24 @@ public class TokenService
return null;
}
+
+
+ public LoginMember getLoginAppletUser(HttpServletRequest request) {
+ // 获取请求携带的令牌
+ String token = getToken(request);
+ if (StringUtils.isNotEmpty(token)) {
+ try {
+ Claims claims = parseToken(token);
+ // 解析对应的权限以及用户信息
+ String uuid = (String) claims.get(Constants.LOGIN_APPLET_KEY);
+ String userKey = Constants.LOGIN_APPLET_KEY + uuid;
+ return redisCache.getCacheObject(userKey);
+ } catch (Exception e) {
+ }
+ }
+ return null;
+ }
+
/**
* 设置用户身份信息
*/
@@ -148,6 +167,21 @@ public class TokenService
return createToken(claims);
}
+
+ /**
+ * 伴宠师-小程序登录
+ * @param loginApplet
+ * @return
+ */
+ public String createAppletToken(LoginApplet loginApplet){
+ String token = IdUtils.fastUUID();
+ loginApplet.setToken(token);
+ refreshAppletToken(loginApplet);
+ Map claims = new HashMap<>();
+ claims.put(Constants.LOGIN_APPLET_KEY, token);
+ return createToken(claims);
+ }
+
/**
* 验证令牌有效期，相差不足20分钟，自动刷新缓存
*
@@ -194,6 +228,23 @@ public class TokenService
redisCache.setCacheObject(userKey, loginUser, memberExpireTime, TimeUnit.DAYS);
}
+
+ /**
+ * 伴宠师-小程序登录
+ * @param loginApplet
+ */
+ public void refreshAppletToken(LoginApplet loginApplet) {
+ loginApplet.setLoginTime(System.currentTimeMillis());
+ loginApplet.setExpireTime(loginApplet.getLoginTime() + memberExpireTime * 24 * 60 * MILLIS_MINUTE);
+ // 根据uuid将loginUser缓存
+ String userKey = Constants.LOGIN_APPLET_TOKEN_KEY + loginApplet.getToken();
+ redisCache.setCacheObject(userKey, loginApplet, memberExpireTime, TimeUnit.DAYS);
+ }
+
+
+
+
+
/**
* 设置用户代理信息
*