From 0d8b60c9ed72d996280688a82ffa8eac3afbbff9 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 02 六月 2023 15:28:24 +0800
Subject: [PATCH] 新增加充值和提现功能
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/CommercialController.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/CommercialController.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/CommercialController.java
index 2439c2a..3c14736 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/CommercialController.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/CommercialController.java
@@ -1,8 +1,9 @@
package com.supersavedriving.driver.modular.system.api;
+import com.netflix.eureka.ServerRequestAuthFilter;
+import com.supersavedriving.driver.modular.system.service.ICommercialService;
import com.supersavedriving.driver.core.common.annotion.ServiceLog;
import com.supersavedriving.driver.core.util.ToolUtil;
-import com.supersavedriving.driver.modular.system.service.ICommercialService;
import com.supersavedriving.driver.modular.system.service.IDriverService;
import com.supersavedriving.driver.modular.system.util.ResultUtil;
import com.supersavedriving.driver.modular.system.warpper.CommercialWarpper;
@@ -15,6 +16,9 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.context.request.RequestAttributes;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
@@ -36,14 +40,14 @@
@ResponseBody
@PostMapping("/api/commercial/queryCommercialList")
- @ServiceLog(name = "获取广告列表", url = "/api/driver/queryCommercialList")
+// @ServiceLog(name = "获取广告列表", url = "/api/driver/queryCommercialList")
@ApiOperation(value = "获取广告列表", tags = {"司机端-首页"}, notes = "")
@ApiImplicitParams({
@ApiImplicitParam(value = "广告类型（1=弹窗广告，2=底部广告）", name = "type", required = true, dataType = "int"),
@ApiImplicitParam(value = "设备类型（1=小程序，2=司机端）", name = "device", required = true, dataType = "int"),
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResponseWarpper<List<CommercialWarpper>> queryCommercialList(Integer type, Integer device, HttpServletRequest request){
+ public ResponseWarpper<List<CommercialWarpper>> queryCommercialList(Integer type, Integer device){
if(ToolUtil.isEmpty(type)){
return ResponseWarpper.success(ResultUtil.paranErr("type"));
}
@@ -51,9 +55,10 @@
return ResponseWarpper.success(ResultUtil.paranErr("device"));
}
try {
- Integer uid = driverService.getUserByRequset(request);
+
+ Integer uid = driverService.getUserByRequest();
if(null == uid){
- return ResponseWarpper.success(ResultUtil.tokenErr());
+ return ResponseWarpper.tokenErr();
}
List<CommercialWarpper> commercialWarppers = commercialService.queryCommercialList(uid, type, device);
return ResponseWarpper.success(commercialWarppers);
--
Gitblit v1.7.1