充值、会员配置管理

src/main/java/com/peanut/modules/master/controller/BuyConfigController.java

@@ -1,82 +1,85 @@
 package com.peanut.modules.master.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.peanut.common.utils.PageUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.peanut.common.utils.R;
 import com.peanut.modules.common.entity.BookBuyConfigEntity;
-import com.peanut.modules.master.service.BuyConfigService;
+import com.peanut.modules.common.entity.VipBuyConfigEntity;
+import com.peanut.modules.master.service.BookBuyConfigService;
+import com.peanut.modules.master.service.VipBuyConfigService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import java.util.Arrays;
-import java.util.List;
 import java.util.Map;
 
 /**
  * 充值价格表单管理
  */
 @Slf4j
-@RestController("masterBookBuyConfig")
+@RestController("masterBuyConfig")
-@RequestMapping("master/bookBuyConfig")
+@RequestMapping("master/BuyConfig")
 public class BuyConfigController {
 
     @Autowired
-    private BuyConfigService buyConfigService;
+    private BookBuyConfigService bookBuyConfigService;
+    @Autowired
+    private VipBuyConfigService vipBuyConfigService;
 
-    /**
+    @RequestMapping("/getBookBuyConfigList")
-     * 列表
+    public R getBookBuyConfigList(@RequestBody Map<String, Object> params) {
-     */
+        LambdaQueryWrapper<BookBuyConfigEntity> wrapper = new LambdaQueryWrapper();
-    @RequestMapping("/list")
+        if (StringUtils.isNotEmpty(params.get("qudao").toString())) {
-    public R list(@RequestParam Map<String, Object> params){
+            wrapper.eq(BookBuyConfigEntity::getQudao,params.get("qudao"));
-        PageUtils page = buyConfigService.queryPage(params);
+        }
-        return R.ok().put("page", page);
+        Page<BookBuyConfigEntity> page = bookBuyConfigService.page(new Page<>(
+                Long.parseLong(params.get("page").toString()), Long.parseLong(params.get("limit").toString())), wrapper);
+        return R.ok().put("result", page);
     }
 
-    /**
+    @RequestMapping("/getBookBuyConfigById")
-     * 信息
+    public R getBookBuyConfigById(@RequestBody Map<String, Object> params) {
-     */
+        return R.ok().put("data",bookBuyConfigService.getById(params.get("id").toString()));
-    @RequestMapping("/info/{priceTypeId}")
-    public R info(@PathVariable("priceTypeId") Integer priceTypeId){
-        BookBuyConfigEntity bookBuyConfig = buyConfigService.getById(priceTypeId);
-        return R.ok().put("bookBuyConfig", bookBuyConfig);
     }
 
-    /**
+    @RequestMapping("/saveOrUpdateBookBuyConfig")
-     * 保存
+    public R addBookBuyConfig(@RequestBody BookBuyConfigEntity config){
-     */
+        bookBuyConfigService.saveOrUpdate(config);
-    @RequestMapping("/save")
-    public R save(@RequestBody BookBuyConfigEntity bookBuyConfig){
-        buyConfigService.save(bookBuyConfig);
         return R.ok();
     }
 
-    /**
+    @RequestMapping("/delBookBuyConfig")
-     * 修改
+    public R delBookBuyConfig(@RequestBody Map<String, Object> params) {
-     */
+        bookBuyConfigService.removeById(params.get("id").toString());
-    @RequestMapping("/update")
-    public R update(@RequestBody BookBuyConfigEntity bookBuyConfig){
-        buyConfigService.updateById(bookBuyConfig);
         return R.ok();
     }
 
-    /**
+    @RequestMapping("/getVipBuyConfigList")
-     * 删除
+    public R getVipBuyConfigList(@RequestBody Map<String, Object> params) {
-     */
+        LambdaQueryWrapper<VipBuyConfigEntity> wrapper = new LambdaQueryWrapper();
-    @RequestMapping("/delete")
+        Page<VipBuyConfigEntity> page = vipBuyConfigService.page(new Page<>(
-    public R delete(@RequestBody Integer[] priceTypeIds){
+                Long.parseLong(params.get("page").toString()), Long.parseLong(params.get("limit").toString())), wrapper);
-        buyConfigService.removeByIds(Arrays.asList(priceTypeIds));
+        return R.ok().put("result", page);
+    }
+
+    @RequestMapping("/getVipBuyConfigById")
+    public R getVipBuyConfigById(@RequestBody Map<String, Object> params) {
+        return R.ok().put("data",vipBuyConfigService.getById(params.get("id").toString()));
+    }
+
+    @RequestMapping("/saveOrUpdateVipBuyConfig")
+    public R addVipBuyConfig(@RequestBody VipBuyConfigEntity config){
+        vipBuyConfigService.saveOrUpdate(config);
         return R.ok();
     }
 
-    /**
+    @RequestMapping("/delVipBuyConfig")
-     * 获取VIP  金额  或者充值类型
+    public R delVipBuyConfig(@RequestBody Map<String, Object> params) {
-     */
+        vipBuyConfigService.removeById(params.get("id").toString());
-    @RequestMapping("/getVipOrPoint")
+        return R.ok();
-    public R getVipOrPoint(@RequestParam("type") String type,@RequestParam("qudao") String qudao){
-        List<BookBuyConfigEntity> bookBuyConfigEntities = buyConfigService.getBaseMapper().selectList(new QueryWrapper<BookBuyConfigEntity>().eq("type",type).eq("qudao",qudao));
-        return R.ok().put("list",bookBuyConfigEntities);
     }
 
 
 
+
 }

src/main/java/com/peanut/modules/master/service/BookBuyConfigService.java

@@ -6,9 +6,6 @@ import com.peanut.modules.common.entity.BookBuyConfigEntity;
 
 import java.util.Map;
 
-public interface BuyConfigService extends IService<BookBuyConfigEntity> {
+public interface BookBuyConfigService extends IService<BookBuyConfigEntity> {
-
-    PageUtils queryPage(Map<String, Object> params);
-
 }
 

src/main/java/com/peanut/modules/master/service/VipBuyConfigService.java

@@ -0,0 +1,7 @@
+package com.peanut.modules.master.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.peanut.modules.common.entity.VipBuyConfigEntity;
+
+public interface VipBuyConfigService extends IService<VipBuyConfigEntity> {
+}

src/main/java/com/peanut/modules/master/service/impl/BookBuyConfigServiceImpl.java

@@ -0,0 +1,13 @@
+package com.peanut.modules.master.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.peanut.modules.common.dao.BookBuyConfigDao;
+import com.peanut.modules.common.entity.BookBuyConfigEntity;
+import com.peanut.modules.master.service.BookBuyConfigService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service("masterBookBuyConfigService")
+public class BookBuyConfigServiceImpl extends ServiceImpl<BookBuyConfigDao, BookBuyConfigEntity> implements BookBuyConfigService {
+}

src/main/java/com/peanut/modules/master/service/impl/BuyConfigServiceImpl.java

@@ -1,29 +0,0 @@
-package com.peanut.modules.master.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.peanut.common.utils.PageUtils;
-import com.peanut.common.utils.Query;
-import com.peanut.modules.common.dao.BookBuyConfigDao;
-import com.peanut.modules.common.entity.BookBuyConfigEntity;
-import com.peanut.modules.master.service.BuyConfigService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-import java.util.Map;
-
-@Slf4j
-@Service("masterBuyConfigService")
-public class BuyConfigServiceImpl extends ServiceImpl<BookBuyConfigDao, BookBuyConfigEntity> implements BuyConfigService {
-
-    @Override
-    public PageUtils queryPage(Map<String, Object> params) {
-        IPage<BookBuyConfigEntity> page = this.page(
-                new Query<BookBuyConfigEntity>().getPage(params),
-                new QueryWrapper<BookBuyConfigEntity>()
-        );
-        return new PageUtils(page);
-    }
-
-}

src/main/java/com/peanut/modules/master/service/impl/VipBuyConfigServiceImpl.java

@@ -0,0 +1,13 @@
+package com.peanut.modules.master.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.peanut.modules.common.dao.VipBuyConfigDao;
+import com.peanut.modules.common.entity.VipBuyConfigEntity;
+import com.peanut.modules.master.service.VipBuyConfigService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service("masterVipBuyConfigService")
+public class VipBuyConfigServiceImpl extends ServiceImpl<VipBuyConfigDao, VipBuyConfigEntity> implements VipBuyConfigService {
+}