From 38d25c7dc3a2d78c7c22a3acc8a8945a63bcef75 Mon Sep 17 00:00:00 2001 From: Augcl <17674666882@163.com> Date: Thu, 29 Aug 2024 20:49:23 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=B7=BB=E5=8A=A0=E5=85=85=E5=80=BC?= =?UTF-8?q?=E5=A5=97=E9=A4=90=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=202?= =?UTF-8?q?=E3=80=81=E6=B7=BB=E5=8A=A0=E9=85=8D=E7=BD=AE=E4=BF=A1=E6=81=AF?= =?UTF-8?q?(=E6=8A=98=E6=89=A3=E3=80=81=E7=94=B5=E8=AF=9D=E3=80=81?= =?UTF-8?q?=E5=BE=AE=E4=BF=A1)=E8=8E=B7=E5=8F=96=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/cheeroncontroller/CheerInfoController.java | 25 +++++++++++++++++++ .../jeecg/modules/apiBean/OrderRechargeBean.java | 19 +++++++++++++++ .../jeecg/modules/apiservice/InfoApiService.java | 13 ++++++---- .../apiservice/impl/InfoApiServiceImpl.java | 28 +++++++++++++++++++++- 4 files changed, 80 insertions(+), 5 deletions(-) create mode 100644 jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/OrderRechargeBean.java diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/cheeroncontroller/CheerInfoController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/cheeroncontroller/CheerInfoController.java index 7e520ae..99719b2 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/cheeroncontroller/CheerInfoController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/cheeroncontroller/CheerInfoController.java @@ -5,6 +5,8 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.apiBean.OrderPayBean; +import org.jeecg.modules.apiBean.OrderRechargeBean; import org.jeecg.modules.apiBean.OrderWaterPageBean; import org.jeecg.modules.apiservice.InfoApiService; import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; @@ -41,6 +43,8 @@ public class CheerInfoController { } + /********************************************************************************************/ + /**************************************加油小程序相关*****************************************/ //获取加油流水订单 @ApiOperation(value="小程序-获取加油流水订单", notes="小程序-获取加油流水订单") @GetMapping("/getOrderWaterPage") @@ -49,6 +53,27 @@ public class CheerInfoController { return infoApiService.getOrderWaterPage(token,bean); } + //获取加油流水订单 + @ApiOperation(value="小程序-用户输入支付创建支付订单并且支付", notes="小程序-用户输入支付创建支付订单并且支付") + @GetMapping("/createOrderPay") + public Result createOrderPay(@RequestHeader("X-Access-Token") String token, OrderPayBean bean){ + return infoApiService.createOrderPay(token, bean); + } + + //获取充值套餐列表 + @ApiOperation(value="小程序-获取充值套餐列表", notes="小程序-获取充值套餐列表") + @RequestMapping(value = "/getRechargePage", method = {RequestMethod.GET}) + public Result getRechargePage(OrderRechargeBean bean){ + + return infoApiService.getRechargePage(bean); + } + + //获取配置信息：折扣、客户电话、客户微信 + @ApiOperation(value="小程序-获取配置信息：折扣、客户电话、客户微信等", notes="小程序-获取配置信息：折扣、客户电话、客户微信等") + @RequestMapping(value = "/getConfig", method = {RequestMethod.GET}) + public Result getConfig(String keyValue){ + return infoApiService.getConfig(keyValue); + } } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/OrderRechargeBean.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/OrderRechargeBean.java new file mode 100644 index 0000000..e90690b --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/OrderRechargeBean.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.apiBean; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class OrderRechargeBean { + /**显示条数*/ + @ApiModelProperty(value = "显示条数" ) + private Integer pageSize; + /**当前页*/ + @ApiModelProperty(value = "当前页" ) + private Integer pageNo; + + public OrderRechargeBean() { + this.pageNo = 1; + this.pageSize = 1000; + } +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/InfoApiService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/InfoApiService.java index 8d4e84a..f8725dd 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/InfoApiService.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/InfoApiService.java @@ -52,17 +52,22 @@ public interface InfoApiService { //获取收益记录带分页 Result getIncomePage(String token,HanHaiWaterBean bean); - - - - //用户提现 Result withdraw(String token); + /********************************************************************************************/ + /**************************************加油小程序相关*****************************************/ //加油小程序-获取订单流水信息 Result getOrderWaterPage(String token,OrderWaterPageBean bean); //加油小程序-用户输入支付创建支付订单并且支付 Result createOrderPay(String token,OrderPayBean bean); + + //获取充值套餐列表 + Result getRechargePage(OrderRechargeBean bean); + + //获取配置信息：折扣、客户电话、客户微信 + Result getConfig(String keyValue); + } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/InfoApiServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/InfoApiServiceImpl.java index cfcb446..77abc06 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/InfoApiServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/InfoApiServiceImpl.java @@ -14,6 +14,7 @@ import org.jeecg.modules.atTrends.entity.AtTrends; import org.jeecg.modules.atTrends.service.IAtTrendsService; import org.jeecg.modules.cheerConf.entity.CheerConf; import org.jeecg.modules.cheerConf.service.ICheerConfService; +import org.jeecg.modules.cheerRecharge.entity.CheerRecharge; import org.jeecg.modules.cheerRecharge.service.ICheerRechargeService; import org.jeecg.modules.cheerWater.entity.CheerWater; import org.jeecg.modules.cheerWater.service.ICheerWaterService; @@ -74,6 +75,8 @@ public class InfoApiServiceImpl implements InfoApiService { private ICheerWaterService cheerWaterService; @Resource private ICheerConfService cheerConfService; + @Resource + private ICheerRechargeService cheerRechargeService; @@ -339,7 +342,8 @@ public class InfoApiServiceImpl implements InfoApiService { - //加油小程序相关 + /********************************************************************************************/ + /**************************************加油小程序相关*****************************************/ //加油小程序-获取订单流水信息 @Override @@ -396,4 +400,26 @@ public class InfoApiServiceImpl implements InfoApiService { return Result.OK("支付成功"); } + //获取充值套餐列表 + @Override + public Result getRechargePage(OrderRechargeBean bean) { + Page page = new Page<>(bean.getPageNo(),bean.getPageSize()); + Page page1 = cheerRechargeService + .lambdaQuery() + .orderByDesc(CheerRecharge::getCreateTime) + .page(page); + + return Result.OK("充值套餐",page1); + } + + //获取配置信息：折扣、客户电话、客户微信 + @Override + public Result getConfig(String keyValue) { + + CheerConf one = cheerConfService.lambdaQuery() + .eq(CheerConf::getKeyValue, keyValue) + .one(); + return Result.OK("配置信息", one); + } + }