Merge branch 'dev' of http://175.178.51.79:3000/lzx/hanhai-a-notice-api into dev

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);
+    }
 
 
 }

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;
+    }
+}

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);
+
 }

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<CheerRecharge> page = new Page<>(bean.getPageNo(),bean.getPageSize());
+        Page<CheerRecharge> 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);
+    }
+
 }