添加分页

qmjszx-admin/src/main/java/beilv/web/controller/carinformation/CardAppController.java

@@ -8,13 +8,16 @@ import beilv.carinformation.domain.CarInformation;
 import beilv.carinformation.service.ICarInformationService;
 import beilv.common.core.controller.BaseController;
 import beilv.common.core.domain.AjaxResult;
+import beilv.common.core.page.PageDomain;
 import beilv.common.core.page.TableDataInfo;
+import beilv.common.core.page.TableSupport;
 import beilv.common.utils.DateUtils;
 import beilv.common.utils.StringUtils;
 import beilv.common.utils.uuid.IdUtils;
 import beilv.competition.domain.Competition;
 import beilv.competition.domain.RedisTask;
 import beilv.competition.service.ICompetitionService;
+import beilv.system.domain.SysNotice;
 import beilv.system.service.ISysConfigService;
 import beilv.usermembershipcard.domain.UserMembershipCard;
 import beilv.usermembershipcard.service.IUserMembershipCardService;
@@ -28,15 +31,14 @@ import beilv.voucher.domain.BeilvVoucherMember;
 import beilv.voucher.service.IBeilvVoucherMemberService;
 import beilv.wx.pay.controller.WxPayController;
 import beilv.wx.pay.domain.vo.AppRefundParam;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Controller;
-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.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 
 import java.time.LocalDateTime;
 import java.time.ZoneId;
@@ -47,7 +49,7 @@ import java.util.Map;
 
 import static beilv.competition.domain.Constant.ORDER_QUEUE;
 
-@Controller
+@RestController
 @Slf4j
 @RequestMapping("/app-api/cardApp")
 public class CardAppController extends BaseController {
@@ -192,10 +194,11 @@ public class CardAppController extends BaseController {
     /**
      * 查询我的订单
      */
-    @PostMapping("/selectOrderList")
-    @ResponseBody
-    public AjaxResult selectOrderList(@RequestBody VipCardLog vipCardLog) {
-        return AjaxResult.success(vipCardLogService.selectVipCardLogList(vipCardLog));
+    @GetMapping("/selectOrderList")
+    public AjaxResult selectOrderList(VipCardLog vipCardLog) {
+        startPage();
+        List<VipCardLog> list = vipCardLogService.selectVipCardLogList(vipCardLog);
+        return AjaxResult.success(getDataTable(list).getRows());
     }
 
     /**
@@ -225,10 +228,11 @@ public class CardAppController extends BaseController {
     /**
      * 查询卡种信息列表
      */
-    @PostMapping("/cardInformationlist")
-    @ResponseBody
-    public AjaxResult cardInformationlist(@RequestBody CarInformation carInformation) {
-        return AjaxResult.success(carInformationService.selectCarInformationList(carInformation));
+    @GetMapping("/cardInformationlist")
+    public AjaxResult cardInformationlist(CarInformation carInformation) {
+        startPage();
+        List<CarInformation> list = carInformationService.selectCarInformationList(carInformation);
+        return AjaxResult.success(getDataTable(list).getRows());
     }
 
     @PostMapping("/getVipCardInfo")
@@ -240,32 +244,32 @@ public class CardAppController extends BaseController {
     /**
      * 查询用户会员卡列表
      */
-    @PostMapping("/getUserCardList")
-    @ResponseBody
-    public AjaxResult getUserCardList(@RequestBody UserMembershipCard userMembershipCard) {
-        return AjaxResult.success(userMembershipCardService.selectUserMembershipCardList(userMembershipCard));
+    @GetMapping("/getUserCardList")
+    public AjaxResult getUserCardList(UserMembershipCard userMembershipCard) {
+        startPage();
+        List<UserMembershipCard> list = userMembershipCardService.selectUserMembershipCardList(userMembershipCard);
+        return AjaxResult.success(getDataTable(list).getRows());
     }
 
     /**
      * 查询约场记录
      */
-    @PostMapping("/selectYueQiuList")
-    @ResponseBody
-    public AjaxResult selectYueChangList(@RequestBody VipCardLog vipCardLog) {
+    @GetMapping("/selectYueQiuList")
+    public AjaxResult selectYueChangList(VipCardLog vipCardLog) {
         startPage();
-        TableDataInfo dataTable = getDataTable(vipCardLogService.selectYueQiuList(vipCardLog));
-        return AjaxResult.success(dataTable.getRows());
+        List<Map<String, Object>> list = vipCardLogService.selectYueQiuList(vipCardLog);
+        return AjaxResult.success(getDataTable(list).getRows());
     }
 
     /**
      * 查询参赛记录  orderType = cansai
      * 查询购买门票记录 orderType = menpiao
      */
-    @PostMapping("/selectCompetitionList")
-    @ResponseBody
-    public AjaxResult selectCanSaiList(@RequestBody VipCardLog vipCardLog) {
+    @GetMapping("/selectCompetitionList")
+    public AjaxResult selectCanSaiList(VipCardLog vipCardLog) {
         startPage();
-        return AjaxResult.success(getDataTable(vipCardLogService.selectCanSaiList(vipCardLog)));
+        List<Map<String, Object>> list = vipCardLogService.selectCanSaiList(vipCardLog);
+        return AjaxResult.success(getDataTable(list).getRows());
     }
 
     /**
@@ -416,16 +420,16 @@ public class CardAppController extends BaseController {
      * userId
      * amount_type
      */
-    @PostMapping("/selectPointsTransactionHistory")
-    @ResponseBody
-    public AjaxResult selectPointsTransactionHistory(@RequestBody VipCardAmountLog amountLog){
+    @GetMapping("/selectPointsTransactionHistory")
+    public AjaxResult selectPointsTransactionHistory(VipCardAmountLog amountLog){
+        startPage();
         HashMap<String, Object> result = new HashMap<>();
         List<Map<String, Object>> maps = amountLogService.selectVipCardAmountLogListAndOrderInfo(amountLog);
         maps.forEach(map->{
             map.put("createTime", MapUtils.getString(map,"createTime").replace("T", " "));
         });
 
-        result.put("historyList",amountLogService.selectVipCardAmountLogListAndOrderInfo(amountLog));
+        result.put("historyList",maps);
         if("1".equals(amountLog.getAmountType())){
             result.put("balance", vipCardService.selectVipCardByUserId(amountLog.getUserId()).getBalance());
         }else if("2".equals(amountLog.getAmountType())){

qmjszx-admin/src/main/java/beilv/web/controller/stadium/StadiumController.java

@@ -3,7 +3,9 @@ package beilv.web.controller.stadium;
 import beilv.common.core.controller.BaseController;
 import beilv.common.core.domain.AjaxResult;
 import beilv.common.core.domain.entity.SysDictData;
+import beilv.common.core.page.PageDomain;
 import beilv.common.core.page.TableDataInfo;
+import beilv.common.core.page.TableSupport;
 import beilv.common.utils.DictUtils;
 import beilv.common.utils.StringUtils;
 import beilv.common.utils.uuid.IdUtils;
@@ -12,12 +14,16 @@ import beilv.competition.service.ICompetitionService;
 import beilv.stadium.domain.Stadium;
 import beilv.stadium.domain.StadiumBO;
 import beilv.stadium.service.IStadiumService;
+import beilv.system.domain.SysNotice;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -35,12 +41,11 @@ public class StadiumController extends BaseController {
      * 查询赛事发布列表
      */
     @GetMapping("/getCompetitionList")
-    @ResponseBody
     public AjaxResult getCompetitionList(Competition competition) {
         startPage();
         competition.setCompetitionState("competiton_state_2");
         List<Competition> list = competitionService.selectCompetitionList(competition);
-        return AjaxResult.success(getDataTable(list));
+        return AjaxResult.success(getDataTable(list).getRows());
     }
 
 

qmjszx-admin/src/main/java/beilv/web/controller/system/SysNoticeAppController.java

@@ -66,7 +66,7 @@ public class SysNoticeAppController extends BaseController {
         Map<String, Object> data = new HashMap<>();
         data.put("total", pageInfo.getTotal());
         data.put("rows", pageInfo.getList());
-        response.put("data", data);
+        response.put("data", pageInfo.getList());
         return response;
     }
 }

qmjszx-business/src/main/java/beilv/shopping/controller/QmjsShoppingMallAppController.java

@@ -36,25 +36,10 @@ public class QmjsShoppingMallAppController extends BaseController
      * 小程序商城列表
      */
     @GetMapping("/shoppingList")
-    public Map<String, Object> shoppingList(QmjsShoppingMall qmjsShoppingMall) {
-        // 获取分页参数
-        PageDomain pageDomain = TableSupport.buildPageRequest();
-        Integer pageNum = pageDomain.getPageNum();
-        Integer pageSize = pageDomain.getPageSize();
-        // 设置分页
-        PageHelper.startPage(pageNum, pageSize);
-        // 查询数据
+    public AjaxResult shoppingList(QmjsShoppingMall qmjsShoppingMall) {
+        startPage();
         List<QmjsShoppingMall> list = qmjsShoppingMallService.selectQmjsShoppingMallList(qmjsShoppingMall);
-        // 获取分页信息
-        PageInfo<QmjsShoppingMall> pageInfo = new PageInfo<>(list);
-        Map<String, Object> response = new HashMap<>();
-        response.put("msg", "操作成功");
-        response.put("code", 200);
-        Map<String, Object> data = new HashMap<>();
-        data.put("total", pageInfo.getTotal());
-        data.put("rows", pageInfo.getList());
-        response.put("data", data);
-        return response;
+        return AjaxResult.success(getDataTable(list).getRows());
     }
 
     /**

qmjszx-business/src/main/java/beilv/vipCardLog/domain/VipCardLog.java

@@ -51,18 +51,36 @@ public class VipCardLog extends BaseEntity {
     private String orderType;
 
     /**
+     * 订单类型
+     */
+    @Excel(name = "订单类型")
+    private String orderTypeText;
+
+    /**
      * 支付状态
      */
     @Excel(name = "支付状态")
     private String paymentStatus;
 
     /**
+     * 支付状态
+     */
+    @Excel(name = "支付状态")
+    private String paymentStatusText;
+
+    /**
      * 支付类型
      */
     @Excel(name = "支付类型")
     private String paymentType;
 
     /**
+     * 支付类型
+     */
+    @Excel(name = "支付类型")
+    private String paymentTypeText;
+
+    /**
      * 支付时间
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")

qmjszx-business/src/main/java/beilv/vipCardLog/service/impl/VipCardLogServiceImpl.java

@@ -23,6 +23,7 @@ import beilv.vipCardAmountLog.mapper.VipCardAmountLogMapper;
 import beilv.vipCardLog.domain.VipCardLog;
 import beilv.vipCardLog.mapper.VipCardLogMapper;
 import beilv.vipCardLog.service.IVipCardLogService;
+import beilv.voucher.domain.BeilvVoucherMember;
 import org.apache.commons.collections4.MapUtils;
 import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -95,7 +96,16 @@ public class VipCardLogServiceImpl implements IVipCardLogService {
      */
     @Override
     public List<VipCardLog> selectVipCardLogList(VipCardLog vipCardLog) {
-        return vipCardLogMapper.selectVipCardLogList(vipCardLog);
+        List<VipCardLog> list = vipCardLogMapper.selectVipCardLogList(vipCardLog);
+        Map<String, String> orderType = DictUtils.getDictCacheToMap("order_type");
+        Map<String, String> paymentStatus = DictUtils.getDictCacheToMap("payment_status");
+        Map<String, String> paymentType = DictUtils.getDictCacheToMap("payment_type");
+        for (VipCardLog var : list) {
+            var.setOrderTypeText(MapUtils.getString(orderType, var.getOrderType()));
+            var.setPaymentStatusText(MapUtils.getString(paymentStatus, var.getPaymentStatus()));
+            var.setPaymentTypeText(MapUtils.getString(paymentType, var.getPaymentType()));
+        }
+        return list;
     }
 
     /**

qmjszx-business/src/main/java/beilv/voucher/controller/AppVoucherController.java

@@ -20,7 +20,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-@Controller
+@RestController
 @RequestMapping("/app-api/voucher")
 public class AppVoucherController extends BaseController {
 
@@ -45,10 +45,7 @@ public class AppVoucherController extends BaseController {
         Map<String, Object> response = new HashMap<>();
         response.put("msg", "操作成功");
         response.put("code", 200);
-        Map<String, Object> data = new HashMap<>();
-        data.put("total", pageInfo.getTotal());
-        data.put("rows", pageInfo.getList());
-        response.put("data", data);
+        response.put("data", pageInfo.getList());
         return response;
     }
 }

qmjszx-business/src/main/resources/mapper/vipCardLog/VipCardLogMapper.xml

@@ -212,7 +212,7 @@
         b.competition_state competitionState,
         b.publish_time publishTime,
         b.competition_img competitionImg,
-        a.voucher_price voucherPrice
+        a.voucher_price voucherPrice,
         COALESCE(a.competition_name, c.username) AS competitionName,
         COALESCE(a.competition_mobile, c.mobile) AS competitionMobile
         from beilv_vip_card_log a