From 4a45e7e14d305caa5520d4dd9936efe40caa0cd7 Mon Sep 17 00:00:00 2001 From: lin <642018748@qq.com> Date: Tue, 9 May 2023 14:29:56 +0800 Subject: [PATCH] fix --- .../controller/WxProductController.java | 24 +++++++++++++------ 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/gptCApi/src/main/java/com/iformall/controller/WxProductController.java b/gptCApi/src/main/java/com/iformall/controller/WxProductController.java index 065facb..fb95711 100644 --- a/gptCApi/src/main/java/com/iformall/controller/WxProductController.java +++ b/gptCApi/src/main/java/com/iformall/controller/WxProductController.java @@ -1,8 +1,12 @@ package com.iformall.controller; +import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; +import com.iformall.domain.po.WxCUser; +import com.iformall.domain.po.WxPayOrder; import com.iformall.service.*; -import io.swagger.annotations.ApiOperation; +import com.iformall.service.wx.WxPayService; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -19,15 +23,21 @@ public class WxProductController extends BaseController { @Autowired WxProductService wxProductService; - @GetMapping("/first") - @ApiOperation(value = "首充", notes = "") - public ResultData first() { - return new ResultData(wxProductService.getCFirstProduct(getCUser())); - } + @Autowired + WxPayService wxPayService; @GetMapping("/list") public ResultData list() { - return new ResultData(wxProductService.getCProductList(getCUser())); + WxCUser user = getCUser(); + WxPayOrder payOrder = new WxPayOrder(); + payOrder.updateTenantInfo(user); + payOrder.setcUserId(user.getId()); + PageInfo page = wxPayService.listPayOrderAsPage(payOrder, 1, 1); + if (null != page && null != page.getList() && page.getList().size() > 0 ) { + return new ResultData(wxProductService.getCProductList(user)); + }else { + return new ResultData(wxProductService.getCFirstProduct(user)); + } } }