diff --git a/.idea/workspace.xml b/.idea/workspace.xml index be244d4..a2c64c3 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,156 +2,27 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - @@ -160,9 +31,17 @@ - - - + + + + + + + + + + + @@ -343,17 +229,18 @@ - + - + @@ -362,70 +249,70 @@ - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - + @@ -439,4 +326,15 @@ + + + + + file://$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ScoreServiceImpl.java + 92 + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java index 0db44df..700d194 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: han_hai_member * @Author: jeecg-boot - * @Date: 2025-03-17 + * @Date: 2025-03-18 * @Version: V1.0 */ @Api(tags="han_hai_member") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/entity/HanHaiMember.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/entity/HanHaiMember.java index 6226a07..ca7db01 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/entity/HanHaiMember.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/entity/HanHaiMember.java @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; /** * @Description: han_hai_member * @Author: jeecg-boot - * @Date: 2025-03-17 + * @Date: 2025-03-18 * @Version: V1.0 */ @Data @@ -87,7 +87,8 @@ public class HanHaiMember implements Serializable { @ApiModelProperty(value = "店铺名称备注") private java.lang.String shopName; /**角色*/ - @Excel(name = "角色", width = 15) + @Excel(name = "角色", width = 15, dicCode = "role") + @Dict(dicCode = "role") @ApiModelProperty(value = "角色") private java.lang.String role; /**ID标识号码*/ diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/mapper/HanHaiMemberMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/mapper/HanHaiMemberMapper.java index e4e85a0..4c936e5 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/mapper/HanHaiMemberMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/mapper/HanHaiMemberMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: han_hai_member * @Author: jeecg-boot - * @Date: 2025-03-17 + * @Date: 2025-03-18 * @Version: V1.0 */ public interface HanHaiMemberMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/IHanHaiMemberService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/IHanHaiMemberService.java index 8ae124c..20e122c 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/IHanHaiMemberService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/IHanHaiMemberService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: han_hai_member * @Author: jeecg-boot - * @Date: 2025-03-17 + * @Date: 2025-03-18 * @Version: V1.0 */ public interface IHanHaiMemberService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/impl/HanHaiMemberServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/impl/HanHaiMemberServiceImpl.java index b9d9e6d..c23aff5 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/impl/HanHaiMemberServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/impl/HanHaiMemberServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: han_hai_member * @Author: jeecg-boot - * @Date: 2025-03-17 + * @Date: 2025-03-18 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/HanHaiMemberList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/HanHaiMemberList.vue index 272e9ad..6de2d4f 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/HanHaiMemberList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/HanHaiMemberList.vue @@ -99,6 +99,7 @@ import { mixinDevice } from '@/utils/mixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin' import HanHaiMemberModal from './modules/HanHaiMemberModal' + import {filterMultiDictText} from '@/components/dict/JDictSelectUtil' export default { name: 'HanHaiMemberList', @@ -165,7 +166,7 @@ { title:'角色', align:"center", - dataIndex: 'role' + dataIndex: 'role_dictText' }, { title:'ID标识号码', @@ -347,7 +348,7 @@ fieldList.push({type:'string',value:'password',text:'登录密码',dictCode:''}) fieldList.push({type:'string',value:'passwordSalt',text:'登录盐',dictCode:''}) fieldList.push({type:'string',value:'shopName',text:'店铺名称备注',dictCode:''}) - fieldList.push({type:'string',value:'role',text:'角色',dictCode:''}) + fieldList.push({type:'string',value:'role',text:'角色',dictCode:'role'}) fieldList.push({type:'string',value:'cardId',text:'ID标识号码',dictCode:''}) fieldList.push({type:'string',value:'frozenFlag',text:'是否冻结',dictCode:''}) fieldList.push({type:'string',value:'deleteFlag',text:'是否删除',dictCode:''}) diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberForm.vue index 4c4cf8e..b5f1565 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberForm.vue @@ -45,7 +45,7 @@ - + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMember.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMember.data.ts index e9f6538..44fbba7 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMember.data.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMember.data.ts @@ -48,7 +48,7 @@ export const columns: BasicColumn[] = [ { title: '角色', align:"center", - dataIndex: 'role' + dataIndex: 'role_dictText' }, { title: 'ID标识号码', @@ -239,7 +239,10 @@ export const formSchema: FormSchema[] = [ { label: '角色', field: 'role', - component: 'Input', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"role" + }, }, { label: 'ID标识号码', diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/controller/MassageScoreController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/controller/MassageScoreController.java new file mode 100644 index 0000000..f5d2e6a --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/controller/MassageScoreController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.massageScore.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.massageScore.entity.MassageScore; +import org.jeecg.modules.massageScore.service.IMassageScoreService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; + + /** + * @Description: 积分记录表 + * @Author: jeecg-boot + * @Date: 2025-03-18 + * @Version: V1.0 + */ +@Api(tags="积分记录表") +@RestController +@RequestMapping("/massageScore/massageScore") +@Slf4j +public class MassageScoreController extends JeecgController { + @Autowired + private IMassageScoreService massageScoreService; + + /** + * 分页列表查询 + * + * @param massageScore + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "积分记录表-分页列表查询") + @ApiOperation(value="积分记录表-分页列表查询", notes="积分记录表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(MassageScore massageScore, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(massageScore, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = massageScoreService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param massageScore + * @return + */ + @AutoLog(value = "积分记录表-添加") + @ApiOperation(value="积分记录表-添加", notes="积分记录表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody MassageScore massageScore) { + massageScoreService.save(massageScore); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param massageScore + * @return + */ + @AutoLog(value = "积分记录表-编辑") + @ApiOperation(value="积分记录表-编辑", notes="积分记录表-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody MassageScore massageScore) { + massageScoreService.updateById(massageScore); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "积分记录表-通过id删除") + @ApiOperation(value="积分记录表-通过id删除", notes="积分记录表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + massageScoreService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "积分记录表-批量删除") + @ApiOperation(value="积分记录表-批量删除", notes="积分记录表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.massageScoreService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "积分记录表-通过id查询") + @ApiOperation(value="积分记录表-通过id查询", notes="积分记录表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + MassageScore massageScore = massageScoreService.getById(id); + if(massageScore==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(massageScore); + } + + /** + * 导出excel + * + * @param request + * @param massageScore + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, MassageScore massageScore) { + return super.exportXls(request, massageScore, MassageScore.class, "积分记录表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, MassageScore.class); + } + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/entity/MassageScore.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/entity/MassageScore.java new file mode 100644 index 0000000..d2e0a9a --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/entity/MassageScore.java @@ -0,0 +1,67 @@ +package org.jeecg.modules.massageScore.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 积分记录表 + * @Author: jeecg-boot + * @Date: 2025-03-18 + * @Version: V1.0 + */ +@Data +@TableName("massage_score") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="massage_score对象", description="积分记录表") +public class MassageScore implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /**标题*/ + @Excel(name = "标题", width = 15) + @ApiModelProperty(value = "标题") + private java.lang.String title; + /**积分*/ + @Excel(name = "积分", width = 15) + @ApiModelProperty(value = "积分") + private java.math.BigDecimal score; + /**类型*/ + @Excel(name = "类型", width = 15, dicCode = "score_type") + @Dict(dicCode = "score_type") + @ApiModelProperty(value = "类型") + private java.lang.String type; + /**关联用户id*/ + @Excel(name = "关联用户id", width = 15) + @ApiModelProperty(value = "关联用户id") + private java.lang.String userId; +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/mapper/MassageScoreMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/mapper/MassageScoreMapper.java new file mode 100644 index 0000000..56a5c49 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/mapper/MassageScoreMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.massageScore.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.massageScore.entity.MassageScore; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 积分记录表 + * @Author: jeecg-boot + * @Date: 2025-03-18 + * @Version: V1.0 + */ +public interface MassageScoreMapper extends BaseMapper { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/mapper/xml/MassageScoreMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/mapper/xml/MassageScoreMapper.xml new file mode 100644 index 0000000..cbc010a --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/mapper/xml/MassageScoreMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/service/IMassageScoreService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/service/IMassageScoreService.java new file mode 100644 index 0000000..6f126fa --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/service/IMassageScoreService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.massageScore.service; + +import org.jeecg.modules.massageScore.entity.MassageScore; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 积分记录表 + * @Author: jeecg-boot + * @Date: 2025-03-18 + * @Version: V1.0 + */ +public interface IMassageScoreService extends IService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/service/impl/MassageScoreServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/service/impl/MassageScoreServiceImpl.java new file mode 100644 index 0000000..21e48a7 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/service/impl/MassageScoreServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.massageScore.service.impl; + +import org.jeecg.modules.massageScore.entity.MassageScore; +import org.jeecg.modules.massageScore.mapper.MassageScoreMapper; +import org.jeecg.modules.massageScore.service.IMassageScoreService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 积分记录表 + * @Author: jeecg-boot + * @Date: 2025-03-18 + * @Version: V1.0 + */ +@Service +public class MassageScoreServiceImpl extends ServiceImpl implements IMassageScoreService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/vue/MassageScoreList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/vue/MassageScoreList.vue new file mode 100644 index 0000000..07a2fdd --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/vue/MassageScoreList.vue @@ -0,0 +1,190 @@ + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/vue/modules/MassageScoreForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/vue/modules/MassageScoreForm.vue new file mode 100644 index 0000000..0dff407 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/vue/modules/MassageScoreForm.vue @@ -0,0 +1,119 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/vue/modules/MassageScoreModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/vue/modules/MassageScoreModal.Style#Drawer.vue new file mode 100644 index 0000000..e8dc2bd --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/vue/modules/MassageScoreModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/vue/modules/MassageScoreModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/vue/modules/MassageScoreModal.vue new file mode 100644 index 0000000..eeb2ba4 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/vue/modules/MassageScoreModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/vue3/MassageScore.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/vue3/MassageScore.api.ts new file mode 100644 index 0000000..42603eb --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/vue3/MassageScore.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/massageScore/massageScore/list', + save='/massageScore/massageScore/add', + edit='/massageScore/massageScore/edit', + deleteOne = '/massageScore/massageScore/delete', + deleteBatch = '/massageScore/massageScore/deleteBatch', + importExcel = '/massageScore/massageScore/importExcel', + exportXls = '/massageScore/massageScore/exportXls', +} +/** + * 导出api + * @param params + */ +export const getExportUrl = Api.exportXls; +/** + * 导入api + */ +export const getImportUrl = Api.importExcel; +/** + * 列表接口 + * @param params + */ +export const list = (params) => + defHttp.get({url: Api.list, params}); + +/** + * 删除单个 + */ +export const deleteOne = (params,handleSuccess) => { + return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); +} +/** + * 批量删除 + * @param params + */ +export const batchDelete = (params, handleSuccess) => { + Modal.confirm({ + title: '确认删除', + content: '是否删除选中数据', + okText: '确认', + cancelText: '取消', + onOk: () => { + return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); + } + }); +} +/** + * 保存或者更新 + * @param params + */ +export const saveOrUpdate = (params, isUpdate) => { + let url = isUpdate ? Api.edit : Api.save; + return defHttp.post({url: url, params}); +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/vue3/MassageScore.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/vue3/MassageScore.data.ts new file mode 100644 index 0000000..86fdd4c --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/vue3/MassageScore.data.ts @@ -0,0 +1,56 @@ +import {BasicColumn} from '/@/components/Table'; +import {FormSchema} from '/@/components/Table'; +import { rules} from '/@/utils/helper/validator'; +import { render } from '/@/utils/common/renderUtils'; +//列表数据 +export const columns: BasicColumn[] = [ + { + title: '标题', + align:"center", + dataIndex: 'title' + }, + { + title: '积分', + align:"center", + dataIndex: 'score' + }, + { + title: '类型', + align:"center", + dataIndex: 'type_dictText' + }, + { + title: '关联用户id', + align:"center", + dataIndex: 'userId' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '标题', + field: 'title', + component: 'Input', + }, + { + label: '积分', + field: 'score', + component: 'InputNumber', + }, + { + label: '类型', + field: 'type', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"score_type" + }, + }, + { + label: '关联用户id', + field: 'userId', + component: 'Input', + }, +]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/vue3/MassageScoreList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/vue3/MassageScoreList.vue new file mode 100644 index 0000000..19d5511 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/vue3/MassageScoreList.vue @@ -0,0 +1,162 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/vue3/components/MassageScoreModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/vue3/components/MassageScoreModal.vue new file mode 100644 index 0000000..0d678f8 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageScore/vue3/components/MassageScoreModal.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/controller/MassageShopController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/controller/MassageShopController.java index 9f9e7df..cfb58c0 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/controller/MassageShopController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/controller/MassageShopController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 商户信息表 * @Author: jeecg-boot - * @Date: 2025-03-17 + * @Date: 2025-03-18 * @Version: V1.0 */ @Api(tags="商户信息表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/entity/MassageShop.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/entity/MassageShop.java index b289e84..ca1cdc5 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/entity/MassageShop.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/entity/MassageShop.java @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; /** * @Description: 商户信息表 * @Author: jeecg-boot - * @Date: 2025-03-17 + * @Date: 2025-03-18 * @Version: V1.0 */ @Data @@ -79,6 +79,15 @@ public class MassageShop implements Serializable { @Excel(name = "纬度", width = 15) @ApiModelProperty(value = "纬度") private java.lang.Double latitude; + /**审核状态*/ + @Excel(name = "审核状态", width = 15, dicCode = "audit_status") + @Dict(dicCode = "audit_status") + @ApiModelProperty(value = "审核状态") + private java.lang.String status; + /**审核备注*/ + @Excel(name = "审核备注", width = 15) + @ApiModelProperty(value = "审核备注") + private java.lang.String remark; /**关联用户id*/ @Excel(name = "关联用户id", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") @Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/mapper/MassageShopMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/mapper/MassageShopMapper.java index 2762baa..e6edd98 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/mapper/MassageShopMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/mapper/MassageShopMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 商户信息表 * @Author: jeecg-boot - * @Date: 2025-03-17 + * @Date: 2025-03-18 * @Version: V1.0 */ public interface MassageShopMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/service/IMassageShopService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/service/IMassageShopService.java index 4510b14..73b0b0c 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/service/IMassageShopService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/service/IMassageShopService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 商户信息表 * @Author: jeecg-boot - * @Date: 2025-03-17 + * @Date: 2025-03-18 * @Version: V1.0 */ public interface IMassageShopService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/service/impl/MassageShopServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/service/impl/MassageShopServiceImpl.java index c159821..84c40c1 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/service/impl/MassageShopServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/service/impl/MassageShopServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 商户信息表 * @Author: jeecg-boot - * @Date: 2025-03-17 + * @Date: 2025-03-18 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/vue/MassageShopList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/vue/MassageShopList.vue index f27924e..1f8da71 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/vue/MassageShopList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/vue/MassageShopList.vue @@ -163,6 +163,16 @@ align:"center", dataIndex: 'latitude' }, + { + title:'审核状态', + align:"center", + dataIndex: 'status_dictText' + }, + { + title:'审核备注', + align:"center", + dataIndex: 'remark' + }, { title:'关联用户id', align:"center", @@ -210,6 +220,8 @@ fieldList.push({type:'string',value:'address',text:'详细地址',dictCode:''}) fieldList.push({type:'double',value:'longitude',text:'经度',dictCode:''}) fieldList.push({type:'double',value:'latitude',text:'纬度',dictCode:''}) + fieldList.push({type:'string',value:'status',text:'审核状态',dictCode:'audit_status'}) + fieldList.push({type:'string',value:'remark',text:'审核备注',dictCode:''}) fieldList.push({type:'string',value:'userId',text:'关联用户id',dictCode:"han_hai_member,nick_name,id"}) this.superFieldList = fieldList } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/vue/modules/MassageShopForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/vue/modules/MassageShopForm.vue index 0ac85e2..bdd5ef2 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/vue/modules/MassageShopForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/vue/modules/MassageShopForm.vue @@ -43,6 +43,16 @@ + + + + + + + + + + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/vue3/MassageShop.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/vue3/MassageShop.data.ts index 19973b9..7a235dd 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/vue3/MassageShop.data.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageShop/vue3/MassageShop.data.ts @@ -45,6 +45,16 @@ export const columns: BasicColumn[] = [ align:"center", dataIndex: 'latitude' }, + { + title: '审核状态', + align:"center", + dataIndex: 'status_dictText' + }, + { + title: '审核备注', + align:"center", + dataIndex: 'remark' + }, { title: '关联用户id', align:"center", @@ -101,6 +111,19 @@ export const formSchema: FormSchema[] = [ field: 'latitude', component: 'InputNumber', }, + { + label: '审核状态', + field: 'status', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"audit_status" + }, + }, + { + label: '审核备注', + field: 'remark', + component: 'Input', + }, { label: '关联用户id', field: 'userId', diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/ScoreController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/ScoreController.java new file mode 100644 index 0000000..b7308a3 --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/ScoreController.java @@ -0,0 +1,44 @@ +package org.jeecg.modules.api.massageController; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.apiBean.PageBean; +import org.jeecg.modules.apiService.ScoreService; +import org.jeecg.modules.apiService.ShopService; +import org.jeecg.modules.massageScore.entity.MassageScore; +import org.jeecg.modules.massageShop.entity.MassageShop; +import org.springframework.web.bind.annotation.RequestHeader; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +@Api(tags="积分-积分相关接口") +@RestController +@RequestMapping("/massage/score") +@Slf4j +public class ScoreController { + /******************************************************************************************************************/ + //积分 + @Resource + private ScoreService scoreService; + /******************************************************************************************************************/ + + //查看积分列表 + @ApiOperation(value="积分-查询积分列表", notes="积分-查询积分列表") + @RequestMapping(value = "/queryScoreList", method = {RequestMethod.GET}) + public Result queryScoreList(@RequestHeader("X-Access-Token") String token, MassageScore massageScore, PageBean pageBean){ + return scoreService.queryScoreList(token, massageScore, pageBean); + } + + //签到获取积分 + @ApiOperation(value="积分-签到获取积分", notes="积分-签到获取积分") + @RequestMapping(value = "/sign", method = {RequestMethod.POST}) + public Result sign(@RequestHeader("X-Access-Token") String token){ + return scoreService.sign(token); + } + +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/ShopController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/ShopController.java new file mode 100644 index 0000000..eddce69 --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/ShopController.java @@ -0,0 +1,59 @@ +package org.jeecg.modules.api.massageController; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.apiBean.PageBean; +import org.jeecg.modules.apiService.OrderService; +import org.jeecg.modules.apiService.ShopService; +import org.jeecg.modules.massageOrder.entity.MassageOrder; +import org.jeecg.modules.massageShop.entity.MassageShop; +import org.springframework.web.bind.annotation.RequestHeader; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +@Api(tags="商家合作-商家相关接口") +@RestController +@RequestMapping("/massage/shop") +@Slf4j +public class ShopController { + /******************************************************************************************************************/ + //商家 + @Resource + private ShopService shopService; + /******************************************************************************************************************/ + + //查看商家列表 + @ApiOperation(value="商家-查询商家列表", notes="商家-查询商家列表") + @RequestMapping(value = "/queryShopList", method = {RequestMethod.GET}) + public Result queryShopList(@RequestHeader("X-Access-Token") String token, MassageShop massageShop, PageBean pageBean){ + return shopService.queryShopList(token, massageShop, pageBean); + } + + //查看商家详情 + @ApiOperation(value="商家-查询商家详情", notes="商家-查询商家详情") + @RequestMapping(value = "/queryShopById", method = {RequestMethod.GET}) + public Result queryShopById(@RequestHeader("X-Access-Token") String token, String id){ + return shopService.queryShopById(token, id); + } + + //新增商家信息 + @ApiOperation(value="商家-新增商家信息", notes="商家-新增商家信息") + @RequestMapping(value = "/addShop", method = {RequestMethod.POST}) + public Result addShop(@RequestHeader("X-Access-Token") String token, MassageShop massageShop){ + return shopService.addShop(token, massageShop); + } + + //修改商家信息 + @ApiOperation(value="商家-修改商家信息", notes="商家-修改商家信息") + @RequestMapping(value = "/updateShop", method = {RequestMethod.POST}) + public Result updateShop(@RequestHeader("X-Access-Token") String token, MassageShop massageShop){ + return shopService.updateShop(token, massageShop); + } + + +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/UserInfoController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/UserInfoController.java index 2c1df2b..be0f25c 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/UserInfoController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/UserInfoController.java @@ -36,4 +36,11 @@ public class UserInfoController { return userInfoService.updateUserInfo(token, nickName, phone, headImage); } + //获取个人中心基础数据信息 + @ApiOperation(value="获取个人中心基础数据信息", notes="获取个人中心基础数据信息") + @RequestMapping(value = "/getUserCenterData", method = {RequestMethod.GET}) + public Result getUserCenterData(@RequestHeader("X-Access-Token") String token){ + return userInfoService.getUserCenterData(token); + } + } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ScoreService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ScoreService.java new file mode 100644 index 0000000..0cb802f --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ScoreService.java @@ -0,0 +1,18 @@ +package org.jeecg.modules.apiService; + +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.apiBean.PageBean; +import org.jeecg.modules.massageScore.entity.MassageScore; +import org.jeecg.modules.massageShop.entity.MassageShop; +import org.springframework.web.bind.annotation.RequestHeader; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; + +public interface ScoreService { + //查看积分列表 + public Result queryScoreList(@RequestHeader("X-Access-Token") String token, MassageScore massageScore, PageBean pageBean); + + //签到获取积分 + public Result sign(@RequestHeader("X-Access-Token") String token); +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ShopService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ShopService.java new file mode 100644 index 0000000..1793f14 --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ShopService.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.apiService; + +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.apiBean.PageBean; +import org.jeecg.modules.massageShop.entity.MassageShop; + +public interface ShopService { + //查看商家列表 + public Result queryShopList(String token, MassageShop massageShop, PageBean pageBean); + + //查看商家详情 + public Result queryShopById(String token, String id); + + //新增商家信息 + public Result addShop(String token, MassageShop massageShop); + + //修改商家信息 + public Result updateShop(String token, MassageShop massageShop); +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/UserInfoService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/UserInfoService.java index 0a92420..9cd0cff 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/UserInfoService.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/UserInfoService.java @@ -8,4 +8,7 @@ public interface UserInfoService { //修改个人信息接口 Result updateUserInfo(String token,String nickName,String phone,String headImage); + + //获取个人中心基础数据信息 + Result getUserCenterData(String token); } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ScoreServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ScoreServiceImpl.java new file mode 100644 index 0000000..ffbfb72 --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ScoreServiceImpl.java @@ -0,0 +1,130 @@ +package org.jeecg.modules.apiService.impl; + +import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.commons.lang.StringUtils; +import org.jeecg.common.api.vo.Result; +import org.jeecg.config.shiro.ShiroRealm; +import org.jeecg.modules.apiBean.PageBean; +import org.jeecg.modules.apiService.ScoreService; +import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; +import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService; +import org.jeecg.modules.massageConfig.entity.MassageConfig; +import org.jeecg.modules.massageConfig.service.IMassageConfigService; +import org.jeecg.modules.massageScore.entity.MassageScore; +import org.jeecg.modules.massageScore.service.IMassageScoreService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.math.BigDecimal; + +@Service +public class ScoreServiceImpl implements ScoreService { + /******************************************************************************************************************/ + //权限验证 + @Resource + private ShiroRealm shiroRealm; + //积分信息 + @Resource + private IMassageScoreService massageScoreService; + //配置信息 + @Resource + private IMassageConfigService massageConfigService; + //配置信息 + @Resource + private IHanHaiMemberService hanHaiMemberService; + /******************************************************************************************************************/ + + //查看积分列表 + @Override + public Result queryScoreList(String token, MassageScore massageScore, PageBean pageBean) { + //权限验证 + //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + HanHaiMember hanHaiMember = hanHaiMemberService.getById("1898983659468853250"); + //返回信息 + String massege = ""; + //分页信息 + Page page = null; + //查询信息 + LambdaQueryChainWrapper query = null; + //返回信息 + Page pageList = null; + + try{ + //分页 + page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + query = massageScoreService + .lambdaQuery(); + + //组装查询条件 + if(StringUtils.isNotBlank(massageScore.getType())){ + //积分类型 + query.eq(MassageScore::getType, massageScore.getType()); + } + + //积分所属 + query.eq(MassageScore::getUserId, hanHaiMember.getId()); + //按照排序编号降序排列 + query.orderByDesc(MassageScore::getCreateTime); + + //获取商家信息 + pageList = query.page(page); + + return Result.OK("积分列表", pageList); + }catch (Exception e){ + e.printStackTrace(); + return Result.error("积分列表查询失败"); + } + } + + //签到获取积分 + @Override + public Result sign(String token) { + //权限验证 + //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + HanHaiMember hanHaiMember = hanHaiMemberService.getById("1898983659468853250"); + //返回信息 + String massege = ""; + + try{ + //获取签到积分数量 + MassageConfig config = massageConfigService + .lambdaQuery() + .eq(MassageConfig::getParamCode, "config_sign_score") + .one(); + + //积分对象 + MassageScore score = new MassageScore(); + score.setUserId(hanHaiMember.getId()); + score.setTitle("签到积分"); + score.setType("0"); + int configScore = Integer.parseInt(config.getParamValueText()); + BigDecimal addScore = BigDecimal.valueOf(configScore); + score.setScore(addScore); + + //新增积分记录 + boolean result1 = massageScoreService.save(score); + + //判断是否新增成功 + if(!result1){ + return Result.error("签到失败"); + } + + //修改用户积分 + BigDecimal oldScore = hanHaiMember.getIntegerPrice(); + BigDecimal newScore = oldScore.add(addScore); + hanHaiMember.setIntegerPrice(newScore); + boolean result2 = hanHaiMemberService.updateById(hanHaiMember); + + if(result2){ + return Result.OK("签到成功"); + }else { + return Result.error("签到失败"); + } + + }catch (Exception e){ + e.printStackTrace(); + return Result.error("签到失败"); + } + } +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ShopServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ShopServiceImpl.java new file mode 100644 index 0000000..43a393d --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ShopServiceImpl.java @@ -0,0 +1,133 @@ +package org.jeecg.modules.apiService.impl; + +import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.commons.lang.StringUtils; +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.apiBean.PageBean; +import org.jeecg.modules.apiService.ShopService; +import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; +import org.jeecg.modules.massageItem.entity.MassageItem; +import org.jeecg.modules.massageItem.service.IMassageItemService; +import org.jeecg.modules.massageOrder.entity.MassageOrder; +import org.jeecg.modules.massageShop.entity.MassageShop; +import org.jeecg.modules.massageShop.service.IMassageShopService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + +@Service +public class ShopServiceImpl implements ShopService { + /******************************************************************************************************************/ + //推拿项目信息 + @Resource + private IMassageShopService massageShopService; + /******************************************************************************************************************/ + + //查看商家列表 + @Override + public Result queryShopList(String token, MassageShop massageShop, PageBean pageBean) { + //返回信息 + String massege = ""; + //分页信息 + Page page = null; + //查询信息 + LambdaQueryChainWrapper query = null; + //返回信息 + Page pageList = null; + + try{ + //分页 + page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + query = massageShopService + .lambdaQuery(); + + //组装查询条件 + if(StringUtils.isNotBlank(massageShop.getShop())){ + //店铺名称 + query.like(MassageShop::getShop, massageShop.getShop()); + } + if(StringUtils.isNotBlank(massageShop.getStatus())){ + //审核状态 + query.eq(MassageShop::getStatus, massageShop.getStatus()); + } + + //按照排序编号升序排列 + query.orderByDesc(MassageShop::getCreateTime); + + //获取商家信息 + pageList = query.page(page); + + return Result.OK("商家列表", pageList); + }catch (Exception e){ + e.printStackTrace(); + return Result.error("商家列表查询失败"); + } + } + + //查看商家详情 + @Override + public Result queryShopById(String token, String id) { + //返回信息 + String massege = ""; + + try{ + MassageShop one = massageShopService + .lambdaQuery() + .eq(MassageShop::getId, id) + .one(); + + return Result.OK("商家详情", one); + }catch (Exception e){ + e.printStackTrace(); + return Result.error("商家详情查询失败"); + } + } + + //新增商家信息 + @Override + public Result addShop(String token, MassageShop massageShop) { + //返回信息 + String massege = ""; + + try{ + //执行新增操作 + boolean result = massageShopService.save(massageShop); + + //判断是否新增成功 + if(result){ + return Result.OK("商家信息添加成功"); + }else { + return Result.OK("商家信息添加失败"); + } + + }catch (Exception e){ + e.printStackTrace(); + return Result.error("商家信息添加失败"); + } + } + + //修改商家信息 + @Override + public Result updateShop(String token, MassageShop massageShop) { + //返回信息 + String massege = ""; + + try{ + //执行新增操作 + boolean result = massageShopService.updateById(massageShop); + + //判断是否新增成功 + if(result){ + return Result.OK("商家信息修改成功"); + }else { + return Result.OK("商家信息修改失败"); + } + + }catch (Exception e){ + e.printStackTrace(); + return Result.error("商家信息修改失败"); + } + } + +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/UserInfoServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/UserInfoServiceImpl.java index 02c20b7..150e3df 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/UserInfoServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/UserInfoServiceImpl.java @@ -9,6 +9,8 @@ import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.HashMap; +import java.util.Map; @Service public class UserInfoServiceImpl implements UserInfoService { @@ -62,4 +64,31 @@ public class UserInfoServiceImpl implements UserInfoService { return Result.error("修改失败"); } } + + //获取个人中心基础数据信息 + @Override + public Result getUserCenterData(String token){ + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //返回信息 + Map map = new HashMap(); + + try{ + + //组装个人基础数据 + map.put("member",hanHaiMember);//用户基础信息 + + map.put("score",hanHaiMember.getIntegerPrice());//积分 + map.put("balance",hanHaiMember.getPrice());//余额 + + //推广佣金 + //优惠券 + + return Result.OK("获取个人中心基础数据信息",map); + }catch (Exception e){ + e.printStackTrace(); + return Result.error("获取个人中心基础数据信息失败",map); + } + } + }