| @@ -1,8 +1,12 @@ | |||||
| package com.iformall.controller; | package com.iformall.controller; | ||||
| import com.github.pagehelper.PageInfo; | |||||
| import com.iformall.common.ResultData; | import com.iformall.common.ResultData; | ||||
| import com.iformall.domain.po.WxCUser; | |||||
| import com.iformall.domain.po.WxPayOrder; | |||||
| import com.iformall.service.*; | import com.iformall.service.*; | ||||
| import io.swagger.annotations.ApiOperation; | |||||
| import com.iformall.service.wx.WxPayService; | |||||
| import org.slf4j.Logger; | import org.slf4j.Logger; | ||||
| import org.slf4j.LoggerFactory; | import org.slf4j.LoggerFactory; | ||||
| import org.springframework.beans.factory.annotation.Autowired; | import org.springframework.beans.factory.annotation.Autowired; | ||||
| @@ -19,15 +23,21 @@ public class WxProductController extends BaseController { | |||||
| @Autowired | @Autowired | ||||
| WxProductService wxProductService; | WxProductService wxProductService; | ||||
| @GetMapping("/first") | |||||
| @ApiOperation(value = "首充", notes = "") | |||||
| public ResultData first() { | |||||
| return new ResultData(wxProductService.getCFirstProduct(getCUser())); | |||||
| } | |||||
| @Autowired | |||||
| WxPayService wxPayService; | |||||
| @GetMapping("/list") | @GetMapping("/list") | ||||
| public ResultData 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<WxPayOrder> 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)); | |||||
| } | |||||
| } | } | ||||
| } | } | ||||