From 91f82652d3a19efa3da0be659aa8954bbde2c712 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Tue, 28 Oct 2025 14:03:59 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/controller/UserApiController.java | 98 +++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 87 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/nq/controller/UserApiController.java b/src/main/java/com/nq/controller/UserApiController.java
index d5bf5ac..97d9779 100644
--- a/src/main/java/com/nq/controller/UserApiController.java
+++ b/src/main/java/com/nq/controller/UserApiController.java
@@ -1,11 +1,20 @@
package com.nq.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.nq.common.ResponseCode;
import com.nq.common.ServerResponse;
+import com.nq.dao.MoneyLogMapper;
+import com.nq.dao.StockConfigMapper;
+import com.nq.enums.EConfigKey;
+import com.nq.pojo.MoneyLog;
import com.nq.pojo.SiteSpread;
-import com.nq.service.ISiteSpreadService;
-import com.nq.service.IUserService;
+import com.nq.pojo.StockConfig;
+import com.nq.pojo.User;
+import com.nq.service.*;
import com.nq.utils.PropertiesUtil;
@@ -17,6 +26,7 @@
import com.nq.utils.redis.RedisShardedPoolUtils;
+import com.nq.utils.translate.GoogleTranslateUtil;
import com.nq.vo.user.UserLoginResultVO;
import javax.servlet.http.HttpServletRequest;
@@ -25,6 +35,8 @@
import javax.servlet.http.HttpSession;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.http.util.TextUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -33,15 +45,10 @@
import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RequestMethod;
-
-import org.springframework.web.bind.annotation.RequestParam;
-
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
import java.math.BigDecimal;
+import java.util.List;
@Controller
@@ -55,12 +62,24 @@
@Autowired
ISiteSpreadService iSiteSpreadService;
+ @Autowired
+ StockConfigMapper stockConfigMapper;
+
+ @Autowired
+ MoneyLogMapper moneyLogMapper;
+
+ @Autowired
+ IStockConfigServices stockConfigServices;
+
+ @Autowired
+ IStockBuySettingServices stockBuySettingServices;
+
//注册
@RequestMapping(value = {"reg.do"}, method = {RequestMethod.POST})
@ResponseBody
public ServerResponse reg(@RequestParam("agentCode") String agentCode, @RequestParam("phone") String phone, @RequestParam(value = "yzmCode", defaultValue = "") String yzmCode, @RequestParam("userPwd") String userPwd, HttpServletRequest httpServletRequest) {
return this.iUserService.reg(yzmCode, agentCode, phone, userPwd, httpServletRequest);
-}
+ }
//登录
@RequestMapping(value = {"login.do"}, method = {RequestMethod.POST})
@@ -76,7 +95,7 @@
UserLoginResultVO resultVO = new UserLoginResultVO();
resultVO.setKey(pc_cookie_name);
resultVO.setToken(token);
- return ServerResponse.createBySuccess("Login Success", resultVO);
+ return ServerResponse.createBySuccess("登录成功", resultVO);
}
return serverResponse;
}
@@ -122,6 +141,63 @@
return ServerResponse.createBySuccess("Success", siteSpread);
}
+ @RequestMapping({"queryStockConfig.do"})
+ @ResponseBody
+ public ServerResponse updateConfig(){
+ StockConfig stockConfig = stockConfigMapper.selectOne(new LambdaQueryWrapper<StockConfig>().eq(StockConfig::getCKey, EConfigKey.BUY_HANDLING_CHARGE.getCode()));
+ return ServerResponse.createBySuccess(stockConfig);
+ }
+ @RequestMapping({"queryStockConfigTwo.do"})
+ @ResponseBody
+ public ServerResponse queryStockConfigTwo(){
+ StockConfig stockConfig = stockConfigMapper.selectOne(new LambdaQueryWrapper<StockConfig>().eq(StockConfig::getCKey, EConfigKey.EXCHANGE_HANDLING_CHARGE.getCode()));
+ return ServerResponse.createBySuccess(stockConfig);
+ }
+
+ @RequestMapping({"queryAllStockConfig.do"})
+ @ResponseBody
+ public ServerResponse queryAllStockConfig(){
+ return stockConfigServices.queryAll(null);
+ }
+
+ @GetMapping({"queryStockBuySetting.do"})
+ @ResponseBody
+ public ServerResponse queryStockBuySetting(HttpServletRequest request, String stockType) {
+ return stockBuySettingServices.queryStockBuySetting(stockType);
+ }
+
+
+ @RequestMapping({"moneylogAll.do"})
+ @ResponseBody
+ public ServerResponse taskList(@RequestParam(value = "userId", required = false) String userId,
+ @RequestParam(value = "type", required = false) String type,
+ @RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
+ @RequestParam(value = "pageSize", defaultValue = "50") int pageSize,
+ HttpServletRequest request) {
+ Page<MoneyLog> page1 = new Page<>(pageNum, pageSize);
+ QueryWrapper<MoneyLog> queryWrapper = new QueryWrapper<>();
+
+ if(!TextUtils.isEmpty(userId)){
+ queryWrapper.eq("user_id", userId);
+ } else {
+ User user = iUserService.getCurrentUser(request);
+ if (user == null ){
+ return ServerResponse.createByErrorCodeMsg(ResponseCode.NEED_LOGIN.getCode(),"请先登录", request);
+ }
+ queryWrapper.eq("user_id", user.getId());
+ }
+ if(StringUtils.isNotEmpty(type)){
+ queryWrapper.eq("type",type);
+ }
+ queryWrapper.orderByDesc("create_time");
+ Page<MoneyLog> moneyLogPage = moneyLogMapper.selectPage(page1, queryWrapper);
+ List<MoneyLog> records = moneyLogPage.getRecords();
+ records.forEach(f->{
+ f.setDescs( new GoogleTranslateUtil().translate(f.getDescs(), request.getHeader("lang")));
+ });
+ moneyLogPage.setRecords(records);
+ return ServerResponse.createBySuccess(moneyLogPage);
+ }
}
--
Gitblit v1.9.3