123

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/MemberPriceController.java

@@ -42,7 +42,7 @@ public class MemberPriceController extends BaseController {
     @SaCheckPermission("cai:memberPrice:list")
     @GetMapping("/list")
     public TableDataInfo<MemberPrice> list(MemberPrice bo, PageQuery pageQuery) {
-        Page<MemberPrice> page = memberPriceService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
+        Page<MemberPrice> page = memberPriceService.page(pageQuery.build(), Wrappers.lambdaQuery(bo).orderByAsc(MemberPrice::getPrice));
         return TableDataInfo.build(page);
     }
 

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserMemberController.java

@@ -2,17 +2,18 @@ package com.ruoyi.cai.controller.admin;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.cai.domain.User;
 import com.ruoyi.cai.domain.UserMember;
 import com.ruoyi.cai.dto.admin.vo.UserMemberAdminVo;
 import com.ruoyi.cai.service.UserMemberService;
+import com.ruoyi.cai.service.UserService;
+import com.ruoyi.cai.service.VipOrderService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.core.validate.AddGroup;
-import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.enums.BusinessType;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
@@ -35,6 +36,8 @@ import java.util.Arrays;
 public class UserMemberController extends BaseController {
 
     private final UserMemberService userMemberService;
+    private final VipOrderService vipOrderService;
+    private final UserService userService;
 
     /**
      * 查询会员管理列表
@@ -65,32 +68,24 @@ public class UserMemberController extends BaseController {
     @SaCheckPermission("cai:userMember:add")
     @Log(title = "会员管理", businessType = BusinessType.INSERT)
     @RepeatSubmit()
-    @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody UserMember bo) {
-        return toAjax(userMemberService.save(bo));
-    }
-
-    /**
-     * 修改会员管理
-     */
-    @SaCheckPermission("cai:userMember:edit")
-    @Log(title = "会员管理", businessType = BusinessType.UPDATE)
-    @RepeatSubmit()
-    @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody UserMember bo) {
-        return toAjax(userMemberService.updateById(bo));
+    @GetMapping("/addVip")
+    public R<Void> add(Long memberPriceId, String usercode) {
+        User user = userService.getByUserCode(usercode);
+        if(user == null){
+            return R.fail("用户不存在!");
+        }
+        vipOrderService.updateVipOrderAdmin(memberPriceId,user.getId());
+        return toAjax(true);
     }
 
     /**
      * 删除会员管理
-     *
-     * @param ids 主键串
      */
     @SaCheckPermission("cai:userMember:remove")
     @Log(title = "会员管理", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public R<Void> remove(@NotEmpty(message = "主键不能为空")
-                          @PathVariable Integer[] ids) {
-        return toAjax(userMemberService.removeBatchByIds(Arrays.asList(ids)));
+    @DeleteMapping("/{id}")
+    public R<Void> remove(@NotNull(message = "主键不能为空") @PathVariable Long id) {
+        userMemberService.relieveMember(id);
+        return R.ok();
     }
 }

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/VipOrderController.java

@@ -2,7 +2,10 @@ package com.ruoyi.cai.controller.admin;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.cai.domain.User;
 import com.ruoyi.cai.domain.VipOrder;
+import com.ruoyi.cai.dto.admin.vo.VipOrderAdminVo;
+import com.ruoyi.cai.service.UserService;
 import com.ruoyi.cai.service.VipOrderService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
@@ -13,7 +16,9 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.BeanConvertUtil;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.BeanUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -34,14 +39,15 @@ import java.util.Arrays;
 public class VipOrderController extends BaseController {
 
     private final VipOrderService vipOrderService;
+    private final UserService userService;
 
     /**
      * 查询VIP订单列表
      */
     @SaCheckPermission("cai:vipOrder:list")
     @GetMapping("/list")
-    public TableDataInfo<VipOrder> list(VipOrder bo, PageQuery pageQuery) {
-        Page<VipOrder> page = vipOrderService.page(pageQuery.build());
+    public TableDataInfo<VipOrderAdminVo> list(VipOrderAdminVo bo, PageQuery pageQuery) {
+        Page<VipOrderAdminVo> page = vipOrderService.pageAdmin(pageQuery,bo);
         return TableDataInfo.build(page);
     }
 
@@ -52,9 +58,15 @@ public class VipOrderController extends BaseController {
      */
     @SaCheckPermission("cai:vipOrder:query")
     @GetMapping("/{id}")
-    public R<VipOrder> getInfo(@NotNull(message = "主键不能为空")
+    public R<VipOrderAdminVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {
-        return R.ok(vipOrderService.getById(id));
+        VipOrder vipOrder = vipOrderService.getById(id);
+        VipOrderAdminVo res = BeanConvertUtil.convertTo(vipOrder, VipOrderAdminVo::new);
+        User user = userService.getById(res.getUserId());
+        if(user != null){
+            BeanUtils.copyProperties(user,res);
+        }
+        return R.ok(res);
     }
 
     /**