diff --git a/ruoyi-ui/src/api/mall/member/level.js b/ruoyi-ui/src/api/mall/member/level.js new file mode 100644 index 00000000..27b9b382 --- /dev/null +++ b/ruoyi-ui/src/api/mall/member/level.js @@ -0,0 +1,48 @@ +import request from '@/utils/request' + +// 获取会员等级列表 +export function getMemberLevelList(params) { + return request({ + url: `/mall-member/member/memberlevel/list`, + method: 'get', + params:params + }) +} + +// 删除会员等级列表 +export function delMemberLevel(ids) { + return request({ + url: `/mall-member/member/memberlevel/delete`, + method: 'delete', + data:ids + }) +} + +// 过去会员等级具体信息 +export function getMemberLevel(id) { + return request({ + url: `/mall-member/member/memberlevel/info/${id}`, + method: 'get', + }) +} + +// 保存会员等级信息 +export function saveMemberLevel(data) { + return request({ + url: `/mall-member/member/memberlevel/save`, + method: 'post', + data:data + }) +} + +// 修改会员等级信息 +export function editMemberLevel(data) { + return request({ + url: `/mall-member/member/memberlevel/update`, + method: 'put', + data:data + }) +} + + + diff --git a/ruoyi-ui/src/views/mall/member/level.vue b/ruoyi-ui/src/views/mall/member/level.vue new file mode 100644 index 00000000..3f280344 --- /dev/null +++ b/ruoyi-ui/src/views/mall/member/level.vue @@ -0,0 +1,203 @@ + + + diff --git a/ruoyi-ui/src/views/mall/member/member-add-or-update.vue b/ruoyi-ui/src/views/mall/member/member-add-or-update.vue new file mode 100644 index 00000000..b3422d96 --- /dev/null +++ b/ruoyi-ui/src/views/mall/member/member-add-or-update.vue @@ -0,0 +1,228 @@ + + + diff --git a/ruoyi-ui/src/views/mall/member/member.vue b/ruoyi-ui/src/views/mall/member/member.vue new file mode 100644 index 00000000..b0e5c130 --- /dev/null +++ b/ruoyi-ui/src/views/mall/member/member.vue @@ -0,0 +1,169 @@ + + + diff --git a/ruoyi-ui/src/views/mall/member/memberlevel-add-or-update.vue b/ruoyi-ui/src/views/mall/member/memberlevel-add-or-update.vue new file mode 100644 index 00000000..d9f6d566 --- /dev/null +++ b/ruoyi-ui/src/views/mall/member/memberlevel-add-or-update.vue @@ -0,0 +1,140 @@ + + + diff --git a/xjs-business/xjs-project-mall/mall-member/src/main/java/com/xjs/mall/member/controller/MemberLevelController.java b/xjs-business/xjs-project-mall/mall-member/src/main/java/com/xjs/mall/member/controller/MemberLevelController.java index fec2f954..95f59e8b 100644 --- a/xjs-business/xjs-project-mall/mall-member/src/main/java/com/xjs/mall/member/controller/MemberLevelController.java +++ b/xjs-business/xjs-project-mall/mall-member/src/main/java/com/xjs/mall/member/controller/MemberLevelController.java @@ -1,20 +1,18 @@ package com.xjs.mall.member.controller; -import java.util.Arrays; -import java.util.Map; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - +import com.ruoyi.common.log.annotation.Log; +import com.ruoyi.common.log.enums.BusinessType; import com.xjs.mall.member.entity.MemberLevelEntity; import com.xjs.mall.member.service.MemberLevelService; import com.xjs.utils.PageUtils; import com.xjs.utils.R; +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.Arrays; +import java.util.Map; /** @@ -22,10 +20,11 @@ import com.xjs.utils.R; * * @author xiejs * @email 1294405880@qq.com - * @date 2022-03-15 10:30:19 + * @since 2022-03-15 10:30:19 */ @RestController @RequestMapping("member/memberlevel") +@Api(tags = "商城-会员-会员等级") public class MemberLevelController { @Autowired private MemberLevelService memberLevelService; @@ -34,7 +33,8 @@ public class MemberLevelController { * 列表 */ @RequestMapping("/list") - public R list(@RequestParam Map params){ + @ApiOperation("列表") + public R list(@RequestParam Map params) { PageUtils page = memberLevelService.queryPage(params); return R.ok().put("page", page); @@ -45,8 +45,9 @@ public class MemberLevelController { * 信息 */ @RequestMapping("/info/{id}") - public R info(@PathVariable("id") Long id){ - MemberLevelEntity memberLevel = memberLevelService.getById(id); + @ApiOperation("信息") + public R info(@PathVariable("id") Long id) { + MemberLevelEntity memberLevel = memberLevelService.getById(id); return R.ok().put("memberLevel", memberLevel); } @@ -55,8 +56,10 @@ public class MemberLevelController { * 保存 */ @RequestMapping("/save") - public R save(@RequestBody MemberLevelEntity memberLevel){ - memberLevelService.save(memberLevel); + @ApiOperation("保存") + @Log(title = "会员等级", businessType = BusinessType.INSERT) + public R save(@RequestBody MemberLevelEntity memberLevel) { + memberLevelService.save(memberLevel); return R.ok(); } @@ -65,8 +68,10 @@ public class MemberLevelController { * 修改 */ @RequestMapping("/update") - public R update(@RequestBody MemberLevelEntity memberLevel){ - memberLevelService.updateById(memberLevel); + @ApiOperation("修改") + @Log(title = "会员等级", businessType = BusinessType.UPDATE) + public R update(@RequestBody MemberLevelEntity memberLevel) { + memberLevelService.updateById(memberLevel); return R.ok(); } @@ -75,8 +80,10 @@ public class MemberLevelController { * 删除 */ @RequestMapping("/delete") - public R delete(@RequestBody Long[] ids){ - memberLevelService.removeByIds(Arrays.asList(ids)); + @ApiOperation("删除") + @Log(title = "会员等级", businessType = BusinessType.DELETE) + public R delete(@RequestBody Long[] ids) { + memberLevelService.removeByIds(Arrays.asList(ids)); return R.ok(); } diff --git a/xjs-business/xjs-project-mall/mall-member/src/main/java/com/xjs/mall/member/service/impl/MemberLevelServiceImpl.java b/xjs-business/xjs-project-mall/mall-member/src/main/java/com/xjs/mall/member/service/impl/MemberLevelServiceImpl.java index 083079fe..be423a75 100644 --- a/xjs-business/xjs-project-mall/mall-member/src/main/java/com/xjs/mall/member/service/impl/MemberLevelServiceImpl.java +++ b/xjs-business/xjs-project-mall/mall-member/src/main/java/com/xjs/mall/member/service/impl/MemberLevelServiceImpl.java @@ -1,16 +1,17 @@ package com.xjs.mall.member.service.impl; -import org.springframework.stereotype.Service; -import java.util.Map; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.xjs.utils.PageUtils; -import com.xjs.utils.Query; - +import com.ruoyi.common.core.utils.StringUtils; import com.xjs.mall.member.dao.MemberLevelDao; import com.xjs.mall.member.entity.MemberLevelEntity; import com.xjs.mall.member.service.MemberLevelService; +import com.xjs.utils.PageUtils; +import com.xjs.utils.Query; +import org.springframework.stereotype.Service; + +import java.util.Map; @Service("memberLevelService") @@ -18,12 +19,14 @@ public class MemberLevelServiceImpl extends ServiceImpl params) { - IPage page = this.page( - new Query().getPage(params), - new QueryWrapper() - ); + String key = (String) params.get(Query.KEY_NAME); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + if (StringUtils.isNotEmpty(key)) { + wrapper.like(MemberLevelEntity::getName, key).or().like(MemberLevelEntity::getNote, key); + } + IPage page = this.page(new Query().getPage(params), wrapper); return new PageUtils(page); } -} \ No newline at end of file +} diff --git a/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/service/impl/AttrServiceImpl.java b/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/service/impl/AttrServiceImpl.java index 386cc979..559d27ba 100644 --- a/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/service/impl/AttrServiceImpl.java +++ b/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/service/impl/AttrServiceImpl.java @@ -62,7 +62,7 @@ public class AttrServiceImpl extends ServiceImpl implements super.save(attrEntity); //保存关联关系 - if (attr.getAttrType() == ATTR_TYPE_BASE.getCode()) { + if (attr.getAttrType() == ATTR_TYPE_BASE.getCode() && attr.getAttrGroupId()!=null) { AttrAttrgroupRelationEntity attrAttrgroupRelationEntity = new AttrAttrgroupRelationEntity(); attrAttrgroupRelationEntity.setAttrGroupId(attr.getAttrGroupId()); attrAttrgroupRelationEntity.setAttrId(attrEntity.getAttrId()); @@ -100,7 +100,7 @@ public class AttrServiceImpl extends ServiceImpl implements AttrAttrgroupRelationEntity attrId = attrAttrgroupRelationDao.selectOne(new LambdaQueryWrapper() .eq(AttrAttrgroupRelationEntity::getAttrId, attrEntity.getAttrId())); - if (attrId != null) { + if (attrId != null && attrId.getAttrGroupId()!=null) { AttrGroupEntity attrGroupEntity = attrGroupDao.selectById(attrId.getAttrGroupId()); attrResponseVo.setGroupName(attrGroupEntity.getAttrGroupName()); }