活动描述，发票列表

admin-web/src/views/admin/invoice/index.vue

@@ -285,7 +285,7 @@ const loadData = (refresh: boolean = false) => {
     state.pageQuery.pageNum = 1;
   }
   state.tableData.loading = true;
-  $body(`/invoice/list`, {...state.formQuery, ...state.pageQuery}).then((res: any) => {
+  $body(`/finance/list`, {...state.formQuery, ...state.pageQuery}).then((res: any) => {
     let {list, total} = res;
     state.tableData.data = list;
     state.pageQuery.total = total;

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

@@ -3,6 +3,8 @@ package com.kym.admin.controller;
 import com.kym.common.R;
 import com.kym.common.annotation.SysLog;
 import com.kym.entity.admin.queryParams.CommonQueryParam;
+import com.kym.entity.admin.queryParams.InvoiceQueryParam;
+import com.kym.service.miniapp.InvoiceService;
 import com.kym.service.miniapp.RefundLogService;
 import com.kym.service.wechat.WxPayService;
 import org.springframework.web.bind.annotation.*;
@@ -20,9 +22,12 @@ public class FinanceController {
 
     private final RefundLogService refundLogService;
 
-    public FinanceController(WxPayService wxPayService, RefundLogService refundLogService) {
+    private final InvoiceService invoiceService;
+
+    public FinanceController(WxPayService wxPayService, RefundLogService refundLogService, InvoiceService invoiceService) {
         this.wxPayService = wxPayService;
         this.refundLogService = refundLogService;
+        this.invoiceService = invoiceService;
     }
 
     @SysLog("退款申请列表")
@@ -51,4 +56,15 @@ public class FinanceController {
         return R.success(wxPayService.downloadInvoice(invoiceId));
     }
 
+    /**
+     * 发票列表
+     *
+     * @param params
+     * @return 发票列表
+     */
+    @PostMapping("/list")
+    R<?> list(@RequestBody InvoiceQueryParam params) {
+        return R.success(invoiceService.listInvoice(params));
+    }
+
 }

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

@@ -1,47 +0,0 @@
-package com.kym.admin.controller;
-
-import com.kym.common.R;
-import com.kym.entity.admin.queryParams.InvoiceQueryParam;
-import com.kym.service.miniapp.InvoiceService;
-import com.kym.service.wechat.WxPayService;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-
-/**
- * <p>
- * 发票记录表 前端控制器
- * </p>
- *
- * @author skyline
- * @since 2023-09-15
- */
-@RestController
-@RequestMapping("/invoice")
-public class InvoiceController {
-
-    private final InvoiceService invoiceService;
-
-    private final WxPayService wxPayService;
-
-    public InvoiceController(InvoiceService invoiceService, WxPayService wxPayService) {
-        this.invoiceService = invoiceService;
-        this.wxPayService = wxPayService;
-    }
-
-    /**
-     * 发票列表
-     *
-     * @param params
-     * @return 发票列表
-     */
-    @PostMapping("/list")
-    R<?> list(@RequestBody InvoiceQueryParam params) {
-        return R.success(invoiceService.listInvoice(params));
-    }
-
-
-
-}

entity/src/main/java/com/kym/entity/admin/Activity.java

@@ -43,6 +43,11 @@ public class Activity extends BaseEntity {
      */
     private String name;
 
+    /**
+     * 活动描述
+     */
+    private String activityDesc;
+
     /**
      * 开始时间
      */

entity/src/main/java/com/kym/entity/admin/vo/ActivityVo.java

@@ -27,6 +27,11 @@ public class ActivityVo extends BaseEntity {
      */
     private String name;
 
+    /**
+     * 活动描述
+     */
+    private String activityDesc;
+
     /**
      * 开始时间
      */

entity/src/main/java/com/kym/entity/miniapp/vo/UserVo.java

@@ -2,6 +2,7 @@ package com.kym.entity.miniapp.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.kym.entity.admin.RechargeRights;
+import com.kym.entity.admin.vo.ActivityVo;
 import com.kym.entity.miniapp.UserRechargeRights;
 import lombok.Data;
 import lombok.experimental.Accessors;
@@ -30,7 +31,7 @@ public class UserVo implements Serializable {
     public Integer refundableAmount;
     public String defaultPlateNo;
     public String vin;
-    public List<RechargeRights> rechargeRightsList;
+    public List<ActivityVo> activityList;
     public List<UserRechargeRights> userRechargeRightsList;
 
 }

mapper/src/main/resources/mappers/admin/ActivityMapper.xml

@@ -5,6 +5,7 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.kym.entity.admin.Activity">
         <result column="name" property="name" />
+        <result column="activityDesc" property="activity_desc" />
         <result column="start_time" property="startTime" />
         <result column="end_time" property="endTime" />
         <result column="discount_type" property="discountType" />
@@ -18,7 +19,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id,name, start_time, end_time, discount_type, target_users, apply_station, allow_stacke, quantity, status, remark,create_time,update_time
+        id,name, activity_desc,start_time, end_time, discount_type, target_users, apply_station, allow_stacke, quantity, status, remark,create_time,update_time
     </sql>
 
 </mapper>

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

@@ -1,7 +1,6 @@
 package com.kym.miniapp.controller;
 
 import com.kym.common.R;
-import com.kym.entity.admin.queryParams.InvoiceQueryParam;
 import com.kym.entity.miniapp.params.ApplyInvoiceParams;
 import com.kym.service.miniapp.InvoiceService;
 import com.kym.service.wechat.WxPayService;
@@ -55,12 +54,12 @@ public class InvoiceController {
     /**
      * 发票列表
      *
-     * @param params
+     * @param status
      * @return 发票列表
      */
     @GetMapping("/list")
-    R<?> list(@RequestBody InvoiceQueryParam params) {
-        return R.success(invoiceService.listInvoice(params));
+    R<?> listInvoiceForApp(@RequestParam(value = "status", required = false) Integer status) {
+        return R.success(invoiceService.listInvoiceForApp(status));
     }
 
 

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

@@ -77,7 +77,7 @@ public class UserController {
      * @return
      */
     @GetMapping("/me")
-    public R me() {
+    public R<?> me() {
         return R.success(userService.getMe());
     }
 

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

@@ -7,6 +7,8 @@ import com.kym.entity.miniapp.Invoice;
 import com.kym.entity.miniapp.params.ApplyInvoiceParams;
 import com.kym.entity.wechat.TitleUrl;
 
+import java.util.List;
+
 /**
  * <p>
  * 发票记录表 服务类
@@ -20,4 +22,6 @@ public interface InvoiceService extends IService<Invoice> {
     TitleUrl applyInvoice(ApplyInvoiceParams params);
 
     PageBean<Invoice> listInvoice(InvoiceQueryParam params);
+
+    List<Invoice> listInvoiceForApp(Integer status);
 }

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

@@ -23,6 +23,8 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.List;
+
 /**
  * <p>
  * 发票记录表 服务实现类
@@ -111,4 +113,9 @@ public class InvoiceServiceImpl extends ServiceImpl<InvoiceMapper, Invoice> impl
         return new PageBean<>(list);
     }
 
+    @Override
+    public List<Invoice> listInvoiceForApp(Integer status) {
+        return lambdaQuery().eq(Invoice::getUserId, StpUtil.getLoginIdAsLong()).eq(status != null, Invoice::getStatus, status).list();
+    }
+
 }

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

@@ -13,8 +13,10 @@ import com.kym.common.enums.WxApi;
 import com.kym.common.exception.BusinessException;
 import com.kym.common.utils.CommUtil;
 import com.kym.common.utils.HttpUtil;
-import com.kym.entity.admin.EquipmentInfo;
+import com.kym.entity.admin.Activity;
+import com.kym.entity.admin.RechargeRights;
 import com.kym.entity.admin.queryParams.CommonQueryParam;
+import com.kym.entity.admin.vo.ActivityVo;
 import com.kym.entity.admin.vo.CustomUserVo;
 import com.kym.entity.common.PageBean;
 import com.kym.entity.miniapp.Account;
@@ -25,6 +27,7 @@ import com.kym.entity.miniapp.params.WxLoginParams;
 import com.kym.entity.miniapp.vo.UserVo;
 import com.kym.entity.wechat.WxPhoneNum;
 import com.kym.mapper.miniapp.UserMapper;
+import com.kym.service.admin.ActivityService;
 import com.kym.service.admin.RechargeRightsService;
 import com.kym.service.miniapp.AccountService;
 import com.kym.service.miniapp.CarsService;
@@ -60,14 +63,16 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     private final CarsService carsService;
     private final UserRechargeRightsService userRechargeRightsService;
     private final RechargeRightsService rechargeRightsService;
+    private final ActivityService activityService;
 
-    public UserServiceImpl(WxConfig wxConfig, AccountService accountService, CarsService carsService, UserRechargeRightsService userRechargeRightsService, RechargeRightsService rechargeRightsService) {
+    public UserServiceImpl(WxConfig wxConfig, AccountService accountService, CarsService carsService, UserRechargeRightsService userRechargeRightsService, RechargeRightsService rechargeRightsService, ActivityService activityService) {
         this.wxConfig = wxConfig;
         this.accountService = accountService;
         this.carsService = carsService;
         this.userRechargeRightsService = userRechargeRightsService;
 
         this.rechargeRightsService = rechargeRightsService;
+        this.activityService = activityService;
     }
 
 
@@ -147,9 +152,17 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         // 可以参加的活动-充值权益
         // 手动切换数据源
         DynamicDataSourceContextHolder.push("db-admin");
-        var rechargeRight = rechargeRightsService.list();
+        var rechargeRight = rechargeRightsService.lambdaQuery().eq(RechargeRights::getStatus,Activity.STATUS_进行中).list();
+        var activityList = activityService.lambdaQuery().eq(Activity::getStatus,Activity.STATUS_进行中).list();
         DynamicDataSourceContextHolder.poll();
-        return userVo.setRechargeRightsList(rechargeRight).setUserRechargeRightsList(userRechargeRight);
+        var voList = activityList.stream().map(activity -> {
+            var vo = new ActivityVo();
+            BeanUtils.copyProperties(activity,vo);
+            vo.setRechargeRightsList(rechargeRight.stream().filter(rights -> rights.getActivityId().equals(activity.getId())).toList());
+            return vo;
+        }).toList();
+        userVo.setActivityList(voList);
+        return userVo.setUserRechargeRightsList(userRechargeRight);
     }