update

admin/src/main/java/com/kym/admin/controller/CouponController.java

@@ -31,31 +31,6 @@ public class CouponController {
     }
 
 
-    /**
-     * 添加优惠券
-     *
-     * @param couponVo
-     * @return
-     */
-    @PostMapping("add")
-    public R<?> addCoupon(@RequestBody CouponVo couponVo) {
-        couponService.addCoupon(couponVo);
-        return R.success();
-    }
-
-
-    /**
-     * 修改优惠券
-     *
-     * @param coupon
-     * @return
-     */
-    @PostMapping("modify")
-    public R<?> modifyCoupon(@RequestBody Coupon coupon) {
-        couponService.updateById(coupon);
-        return R.success();
-    }
-
     /**
      * 优惠券列表查询
      *

miniapp/src/main/java/com/kym/miniapp/controller/AccountController.java

@@ -2,6 +2,7 @@ package com.kym.miniapp.controller;
 
 import com.kym.common.R;
 import com.kym.entity.admin.queryParams.CommonQueryParam;
+import com.kym.service.miniapp.AccountService;
 import com.kym.service.miniapp.RefundLogService;
 import com.kym.service.miniapp.WalletDetailService;
 import org.springframework.web.bind.annotation.*;
@@ -18,11 +19,14 @@ import org.springframework.web.bind.annotation.*;
 @RequestMapping("/account/")
 public class AccountController {
 
+    private final AccountService accountService;
+
     private final WalletDetailService walletDetailService;
 
     private final RefundLogService refundLogService;
 
-    public AccountController(WalletDetailService walletDetailService, RefundLogService refundLogService) {
+    public AccountController(AccountService accountService, WalletDetailService walletDetailService, RefundLogService refundLogService) {
+        this.accountService = accountService;
         this.walletDetailService = walletDetailService;
         this.refundLogService = refundLogService;
     }
@@ -43,4 +47,15 @@ public class AccountController {
         return R.success(refundLogService.listRefundLogForApp(params));
     }
 
+
+    /**
+     * 获取当前用户有效的权益和优惠券
+     *
+     * @return
+     */
+    @GetMapping("/listRightsAndCoupons")
+    public R<?> listRightsAndCoupons() {
+        return R.success(accountService.listRightsAndCoupons());
+    }
+
 }

service/src/main/java/com/kym/service/admin/CouponService.java

@@ -2,9 +2,7 @@ package com.kym.service.admin;
 
 import com.github.yulichang.base.MPJBaseService;
 import com.kym.entity.admin.Coupon;
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.kym.entity.admin.queryParams.CouponQueryParam;
-import com.kym.entity.admin.vo.CouponVo;
 import com.kym.entity.admin.vo.UserCouponsIssueVo;
 import com.kym.entity.common.PageBean;
 
@@ -17,8 +15,6 @@ import com.kym.entity.common.PageBean;
  * @since 2024-04-25
  */
 public interface CouponService extends MPJBaseService<Coupon> {
-    void addCoupon(CouponVo couponVo);
-
     PageBean<Coupon> listCoupon(CouponQueryParam params);
 
     void issueCoupons(UserCouponsIssueVo userCouponsIssue);

service/src/main/java/com/kym/service/admin/impl/CouponServiceImpl.java

@@ -51,16 +51,6 @@ public class CouponServiceImpl extends ServiceImpl<CouponMapper, Coupon> impleme
         this.userCouponSender = userCouponSender;
     }
 
-    @Override
-    @Transactional
-    public void addCoupon(CouponVo couponVo) {
-        // 新增优惠券
-        var coupon = new Coupon();
-        BeanUtils.copyProperties(couponVo, coupon);
-        coupon.setId(IDGenerator.INS().nextId());
-        save(coupon);
-        // 新增优惠券-站点关联
-    }
 
     @Override
     public PageBean<Coupon> listCoupon(CouponQueryParam params) {

service/src/main/java/com/kym/service/miniapp/UserService.java

@@ -21,13 +21,11 @@ public interface UserService extends MPJBaseService<User> {
 
     UserVo getMe();
 
-    boolean createUser(UserVo userVo);
-
     void updateUser(UserVo userVo);
 
     PageBean<UserVo> listUserVo(Integer pageNum, Integer pageSize);
 
-    R wxLogin(WxLoginParams params);
+    R<?> wxLogin(WxLoginParams params);
 
     PageBean<CustomUserVo> listCustomUser(CommonQueryParam params);
 }

service/src/main/java/com/kym/service/miniapp/impl/AccountServiceImpl.java

@@ -48,6 +48,7 @@ public class AccountServiceImpl extends MPJBaseServiceImpl<AccountMapper, Accoun
     public UserRightsAndCouponsVo listRightsAndCoupons() {
         var vo = new UserRightsAndCouponsVo();
         var userId = StpUtil.getLoginIdAsLong();
+        vo.setUserId(userId);
         // 当前用户有效的充电权益
         var userRechargeRight = userRechargeRightsService.lambdaQuery()
                 .eq(UserRechargeRights::getUserId, userId).eq(UserRechargeRights::getStatus, UserRechargeRights.STATUS_有效)

service/src/main/java/com/kym/service/miniapp/impl/UserServiceImpl.java

@@ -196,13 +196,6 @@ public class UserServiceImpl extends MPJBaseServiceImpl<UserMapper, User> implem
         return R.success(of("userId", user.getId(), "satoken", StpUtil.getTokenValue()));
     }
 
-    @Override
-    public boolean createUser(UserVo userVo) {
-        var user = new User();
-        user.setUsername(userVo.username);
-        return save(user);
-    }
-
 
     @Transactional(rollbackFor = Exception.class)
     @Override