trading-order-admin/src/main/java/com/yami/trading/admin/controller/loan/AdminLoanController.java
@@ -249,7 +249,7 @@ }else { // modelAndView.addObject("code", "1"); // modelAndView.addObject("message","借贷申请提交失败!"); return Result.failed("1","借贷申请提交成功!"); return Result.failed("1","借贷申请提交成功"); } }catch(Throwable e) { // modelAndView.addObject("code", "1"); trading-order-admin/src/main/java/com/yami/trading/admin/controller/loan/AdminLoanParamController.java
New file @@ -0,0 +1,47 @@ package com.yami.trading.admin.controller.loan; import com.yami.trading.bean.loan.LoanParam; import com.yami.trading.common.domain.Result; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @RestController @CrossOrigin @Api(tags = "后台借贷配置管理") @RequestMapping("loanParam") @Slf4j public class AdminLoanParamController { @Autowired private LoanService loanService; @ApiOperation("获取配置列表") @PostMapping({"getLoanParamList.do"}) public Result getLoanParamList(@RequestParam(value = "pageNum", defaultValue = "1") int pageNum, @RequestParam(value = "pageSize", defaultValue = "5") int pageSize) { return loanService.getLoanParamList(pageNum, pageSize); } @ApiOperation("新增或修改配置") @PostMapping({"saveLoanParam.do"}) public Result saveLoanParam(@RequestBody LoanParam model) { return loanService.saveLoanParam(model); } /** * 删除大宗 */ @ApiOperation("删除配置") @PostMapping({"delLoanParam.do"}) public Result delLoanParam(@RequestParam(value = "id") String id) { return loanService.delLoanParam(id); } } trading-order-admin/src/main/java/com/yami/trading/admin/controller/loan/LoanService.java
@@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yami.trading.bean.loan.LoanParam; import com.yami.trading.bean.loan.SimpleLoanOrder; import com.yami.trading.common.domain.Result; import java.util.HashMap; import java.util.List; @@ -80,4 +81,9 @@ public void setParamMap(HashMap<String,Object> params); public HashMap<String,Object> getParamMap(); Result getLoanParamList(int pageNum, int pageSize); Result saveLoanParam(LoanParam model); Result delLoanParam(String id); } trading-order-admin/src/main/java/com/yami/trading/admin/controller/loan/internal/LoanServiceImpl.java
@@ -18,9 +18,12 @@ import com.yami.trading.bean.loan.SimpleLoanOrder; import com.yami.trading.bean.model.User; import com.yami.trading.common.constants.Constants; import com.yami.trading.common.domain.Result; import com.yami.trading.common.exception.BusinessException; import com.yami.trading.dao.loan.LoanParamMapper; import com.yami.trading.service.user.UserService; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -36,6 +39,7 @@ * @author JORGE * @description 借贷服务接口实现类 */ @Slf4j @Service @Transactional public class LoanServiceImpl implements LoanService { @@ -45,6 +49,9 @@ @Autowired UserService userService; @Autowired LoanParamMapper loanParamMapper; @Getter HashMap<String,Object> paramMap = new HashMap<>(); @@ -571,4 +578,51 @@ this.paramMap = params; } @Override public Result getLoanParamList(int pageNum, int pageSize) { try { Page page = new Page(pageNum, pageSize); page = loanParamMapper.getLoanParamList(page); return Result.succeed(page); } catch (Exception e) { log.error(e.getMessage()); } return Result.failed("获取失败"); } @Override public Result saveLoanParam(LoanParam model) { try { if (model.getLending_institution() == null || model.getLending_institution().isEmpty()) { model.setLending_institution("1"); } if (model.getUuid() != 0) { System.out.println(model); if (loanParamMapper.updateById(model) > 0) { return Result.succeed("修改成功"); } } else { if (loanParamMapper.insert(model) > 0) { return Result.succeed("添加成功"); } } } catch (Exception e) { log.error(e.getMessage()); } return Result.failed("操作失败"); } @Override public Result delLoanParam(String id) { try { if (loanParamMapper.deleteById(id) > 0) { return Result.succeed("删除成功"); } } catch (Exception e) { log.error(e.getMessage()); } return Result.failed("操作失败"); } } trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiMoneyLogController.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yami.trading.bean.item.domain.Item; import com.yami.trading.bean.item.dto.Symbol2DTO; import com.yami.trading.bean.model.MoneyLog; import com.yami.trading.common.constants.Constants; import com.yami.trading.common.domain.Result; @@ -43,13 +44,19 @@ public Result list(HttpServletRequest request) throws IOException { String partyId = SecurityUtils.getUser().getUserId(); String page_no = request.getParameter("page_no"); String page_size = request.getParameter("page_size"); String symbolType = request.getParameter("symbolType"); if (StringUtils.isNullOrEmpty(page_no) || !StringUtils.isInteger(page_no) || Integer.valueOf(page_no) <= 0) { page_no = "1"; } if (StringUtils.isNullOrEmpty(page_size) || !StringUtils.isInteger(page_size) || Integer.valueOf(page_size) <= 0) { page_size = "20"; } double amount = 0; int pageNo = Integer.valueOf(page_no); int pageSize = Integer.valueOf(page_size); String category = request.getParameter("category"); String contentType = request.getParameter("contentType"); if (symbolType==null){ @@ -57,7 +64,7 @@ } List<String> symbols = itemService.findByType(symbolType).stream().map(Item::getSymbol).collect(Collectors.toList()); symbols.add("-1"); Page<MoneyLog> page = new Page<>(pageNo, 20); Page<MoneyLog> page = new Page<>(pageNo, pageSize); LambdaQueryWrapper<MoneyLog> lambdaQueryWrapper = Wrappers.<MoneyLog>query().lambda().eq(MoneyLog::getUserId, partyId); // 不显示不可见的 lambdaQueryWrapper.ne(MoneyLog::getShow, "0"); @@ -127,8 +134,9 @@ log.setCreateTimeStr(DateUtils.format(showCreateTime, DateUtils.DF_yyyyMMddHHmmss)); } } return Result.succeed(page.getRecords()); Result ok = Result.succeed(page.getRecords()); ok.setTotal(page.getTotal()); return ok; } } trading-order-admin/src/main/java/com/yami/trading/api/controller/RealtimeController.java
@@ -365,7 +365,7 @@ .build(); list.add(dto); } else { log.error("获取行情接口，realtime is null；币种->{}", item.getSymbol()); //log.error("获取行情接口，realtime is null；币种->{}", item.getSymbol()); } }); Result<List<QueryRealtimeDTO>> ok = Result.ok(list); @@ -443,7 +443,7 @@ .build(); list.add(dto); } else { log.error("获取行情接口，realtime is null；币种->{}", item.getSymbol()); //log.error("获取行情接口，realtime is null；币种->{}", item.getSymbol()); } }); return list; trading-order-huobi/src/main/java/com/yami/trading/huobi/data/internal/DataServiceImpl.java
@@ -73,7 +73,7 @@ if (realtime != null) { list.add(realtime); } else { log.error("realtime is null; 币种->{}", oneSymbol); //log.error("realtime is null; 币种->{}", oneSymbol); } } } trading-order-service/src/main/java/com/yami/trading/dao/loan/LoanParamMapper.java
New file @@ -0,0 +1,11 @@ package com.yami.trading.dao.loan; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yami.trading.bean.loan.LoanParam; public interface LoanParamMapper extends BaseMapper<LoanParam> { Page getLoanParamList(Page page); } trading-order-service/src/main/resources/mapper/loan/LoanParamMapper.xml
New file @@ -0,0 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.yami.trading.dao.loan.LoanParamMapper"> <select id="getLoanParamList" resultType="java.util.HashMap" parameterType="map"> SELECT uuid,term,max_quota,min_quota,repay_cycle,daily_rate,repayment,lending_institution,lending_name FROM t_loan_param ORDER BY uuid </select> </mapper>
