ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartMemberController.java
@@ -2,12 +2,14 @@ import com.ruoyi.common.core.domain.R; import com.ruoyi.system.api.domain.dto.CustomConfigDTO; import com.ruoyi.system.api.domain.dto.MemberDTO; import com.ruoyi.member.service.IMemberService; import com.ruoyi.system.api.domain.AppMiniLoginVO; import com.ruoyi.system.api.domain.Member; import com.ruoyi.system.api.domain.dto.AppMiniLoginDTO; import com.ruoyi.system.api.domain.dto.AppMiniRegisterDTO; import com.ruoyi.system.api.feignClient.SysUserClient; import com.ruoyi.system.api.util.HuaWeiOBSUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -34,6 +36,9 @@ public class ForepartMemberController { @Resource private IMemberService iMemberService; @Resource private SysUserClient sysUserClient; @PostMapping("/miniLogin") @ApiOperation(value = "用户端-第三方登陸") @@ -91,4 +96,20 @@ iMemberService.authentificationMembe(memberDTO); return R.ok(); } @PostMapping("/customConfig") @ApiOperation(value = "获取配置") public R<String> customConfig(@RequestBody CustomConfigDTO customConfigDTO) { String string=""; if(customConfigDTO.getType()==1){ string=sysUserClient.getconfig("PLATFORM_SERVICE_PHONE").getData().getConfigValue(); } if(customConfigDTO.getType()==2){ string=sysUserClient.getconfig("MALL_ORDER_DESCRIPTION").getData().getConfigValue(); } if(customConfigDTO.getType()==3){ string=sysUserClient.getconfig("RETURN_CYCLE").getData().getConfigValue(); } return R.ok(string); } } ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartMemberPointsController.java
@@ -3,7 +3,7 @@ import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.utils.page.PageDTO; import com.ruoyi.member.domain.MemberPoints; import com.ruoyi.system.api.domain.MemberPoints; import com.ruoyi.system.api.domain.dto.MemberDTO; import com.ruoyi.member.service.IMemberPointsService; import io.swagger.annotations.Api; @@ -31,4 +31,5 @@ public R<PageDTO<MemberPoints>> getMemberPoints(@RequestBody MemberDTO memberDTO) { return R.ok(iMemberPointsService.getMemberPoints(memberDTO)); } } ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/inner/MemberPointsController.java
New file @@ -0,0 +1,42 @@ package com.ruoyi.member.controller.inner; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.utils.page.PageDTO; import com.ruoyi.system.api.domain.MemberPoints; import com.ruoyi.member.service.IMemberPointsService; import com.ruoyi.system.api.domain.dto.MemberDTO; import com.ruoyi.system.api.domain.dto.MemberPointsDTO; import io.swagger.annotations.ApiOperation; 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 javax.annotation.Resource; /** * <p> * 会员积分表 前端控制器 * </p> * * @author mitao * @since 2024-05-23 */ @RestController @RequestMapping("/member-points") public class MemberPointsController { @Resource private IMemberPointsService iMemberPointsService; @PostMapping("/addMemberPoints") @ApiOperation(value = "用户端-添加或减少用户积分") public R addMemberPoints(@RequestBody MemberPointsDTO memberPointsDTO) { MemberPoints points=new MemberPoints(); points.setMemberId(memberPointsDTO.getMemberId()); points.setPointsType(memberPointsDTO.getPointsType()); points.setPoints(memberPointsDTO.getPoints()); iMemberPointsService.save(points); return R.ok(); } } ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/MemberPointsMapper.java
@@ -1,7 +1,7 @@ package com.ruoyi.member.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.member.domain.MemberPoints; import com.ruoyi.system.api.domain.MemberPoints; /** * <p> ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/IMemberPointsService.java
@@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.common.core.utils.page.PageDTO; import com.ruoyi.member.domain.MemberPoints; import com.ruoyi.system.api.domain.MemberPoints; import com.ruoyi.system.api.domain.dto.MemberDTO; /** ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberPointsServiceImpl.java
@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.core.utils.page.PageDTO; import com.ruoyi.member.domain.MemberPoints; import com.ruoyi.system.api.domain.MemberPoints; import com.ruoyi.system.api.domain.dto.MemberDTO; import com.ruoyi.member.mapper.MemberPointsMapper; import com.ruoyi.member.service.IMemberPointsService; ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/RegionServiceImpl.java
@@ -109,11 +109,6 @@ */ @Override public List<RegionVo> listRegionVo() { if (redisService.hasKey(CacheConstants.REGION_LIST)) { // 如果存在,则直接从缓存中获取并返回 List<RegionVo> result = redisService.getCacheList(CacheConstants.REGION_LIST); return result; } else { // 如果不存在,则从数据库中查询并进行处理 List<RegionVo> regionVoList = regionMapper.listRegionVo(); List<RegionVo> regionVoList1 = new ArrayList<>(); @@ -162,10 +157,7 @@ } } } // 将处理后的地区列表存入缓存中 redisService.setCacheList(CacheConstants.REGION_LIST, regionVoList1); // 返回处理后的地区列表 return regionVoList1; } } } ruoyi-modules/ruoyi-system/target/classes/mapper/system/SysConfigMapper.xml
@@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.ruoyi.system.mapper.SysConfigMapper"> <resultMap type="com.ruoyi.system.domain.SysConfig" id="SysConfigResult"> <resultMap type="com.ruoyi.system.api.domain.SysConfig" id="SysConfigResult"> <id property="configId" column="config_id" /> <result property="configName" column="config_name" /> <result property="configKey" column="config_key" /> @@ -33,12 +33,12 @@ </where> </sql> <select id="selectConfig" parameterType="com.ruoyi.system.domain.SysConfig" resultMap="SysConfigResult"> <select id="selectConfig" parameterType="com.ruoyi.system.api.domain.SysConfig" resultMap="SysConfigResult"> <include refid="selectConfigVo"/> <include refid="sqlwhereSearch"/> </select> <select id="selectConfigList" parameterType="com.ruoyi.system.domain.SysConfig" resultMap="SysConfigResult"> <select id="selectConfigList" parameterType="com.ruoyi.system.api.domain.SysConfig" resultMap="SysConfigResult"> <include refid="selectConfigVo"/> <where> <if test="configName != null and configName != ''"> @@ -69,7 +69,7 @@ where config_key = #{configKey} limit 1 </select> <insert id="insertConfig" parameterType="com.ruoyi.system.domain.SysConfig"> <insert id="insertConfig" parameterType="com.ruoyi.system.api.domain.SysConfig"> insert into sys_config ( <if test="configName != null and configName != '' ">config_name,</if> <if test="configKey != null and configKey != '' ">config_key,</if> @@ -89,7 +89,7 @@ ) </insert> <update id="updateConfig" parameterType="com.ruoyi.system.domain.SysConfig"> <update id="updateConfig" parameterType="com.ruoyi.system.api.domain.SysConfig"> update sys_config <set> <if test="configName != null and configName != ''">config_name = #{configName},</if>