From b4f9c98cb732bf97cbe7ec61bd08b879fc6b0b37 Mon Sep 17 00:00:00 2001 From: hu177768073 <177768073@qq.com> Date: Tue, 29 Apr 2025 16:58:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BsUserSpreadController.java | 122 ++++++++++++++++-- .../hfkj/dao/BsGasOrderSpreadMapperExt.java | 26 ++++ .../dao/BsUserSpreadAccountMapperExt.java | 22 +++- .../hfkj/dao/BsUserSpreadRelMapperExt.java | 21 +-- .../service/gas/BsGasOrderSpreadService.java | 8 ++ .../gas/impl/BsGasOrderSpreadServiceImpl.java | 16 +++ 6 files changed, 194 insertions(+), 21 deletions(-) diff --git a/bweb/src/main/java/com/bweb/controller/BsUserSpreadController.java b/bweb/src/main/java/com/bweb/controller/BsUserSpreadController.java index 6aa98ad..0394caf 100644 --- a/bweb/src/main/java/com/bweb/controller/BsUserSpreadController.java +++ b/bweb/src/main/java/com/bweb/controller/BsUserSpreadController.java @@ -8,15 +8,12 @@ import com.hfkj.common.exception.ErrorHelp; import com.hfkj.common.exception.SysCode; import com.hfkj.common.security.UserCenter; import com.hfkj.common.utils.ResponseMsgUtil; -import com.hfkj.entity.BsUserSpreadOilChannel; -import com.hfkj.entity.BsUserSpreadPower; -import com.hfkj.entity.BsUserSpreadRel; +import com.hfkj.entity.*; import com.hfkj.model.ResponseData; import com.hfkj.model.UserSessionObject; -import com.hfkj.service.spread.BsUserSpreadAccountService; -import com.hfkj.service.spread.BsUserSpreadOilChannelService; -import com.hfkj.service.spread.BsUserSpreadPowerService; -import com.hfkj.service.spread.BsUserSpreadRelService; +import com.hfkj.service.gas.BsGasOrderService; +import com.hfkj.service.gas.BsGasOrderSpreadService; +import com.hfkj.service.spread.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; @@ -42,8 +39,14 @@ public class BsUserSpreadController { @Resource private BsUserSpreadOilChannelService userSpreadOilChannelService; @Resource + private BsUserSpreadAccountRecordService userSpreadAccountRecordService; + @Resource private BsUserSpreadAccountService userSpreadAccountService; @Resource + private BsGasOrderSpreadService gasOrderSpreadService; + @Resource + private BsGasOrderService gasOrderService; + @Resource private BsUserSpreadRelService userSpreadRelService; @RequestMapping(value = "/editOilChannel", method = RequestMethod.POST) @@ -89,6 +92,20 @@ public class BsUserSpreadController { } } + @RequestMapping(value = "/getOilChannelList", method = RequestMethod.GET) + @ResponseBody + @ApiOperation(value = "查询油站渠道列表") + public ResponseData getOilChannelList(@RequestParam(value = "channel", required = false) Integer channel) { + try { + Map param = new HashMap<>(); + param.put("channel", channel); + return ResponseMsgUtil.success(userSpreadOilChannelService.getList(param)); + + } catch (Exception e) { + return ResponseMsgUtil.exception(e); + } + } + @RequestMapping(value = "/getUserSpreadList", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "查询推广用户列表") @@ -139,14 +156,95 @@ public class BsUserSpreadController { } } - @RequestMapping(value = "/getOilChannelList", method = RequestMethod.GET) + @RequestMapping(value = "/countAccount", method = RequestMethod.GET) @ResponseBody - @ApiOperation(value = "查询油站渠道列表") - public ResponseData getOilChannelList(@RequestParam(value = "channel", required = false) Integer channel) { + @ApiOperation(value = "统计金额") + public ResponseData countAccount(@RequestParam(value = "userId", required = true) Long userId, + @RequestParam(name = "orderStatus", required = false) Integer orderStatus, + @RequestParam(name = "payTimeS", required = false) Long payTimeS, + @RequestParam(name = "payTimeE", required = false) Long payTimeE) { try { Map param = new HashMap<>(); - param.put("channel", channel); - return ResponseMsgUtil.success(userSpreadOilChannelService.getList(param)); + param.put("userId", userId); + param.put("orderStatus", orderStatus); + param.put("payTimeS", payTimeS); + param.put("payTimeE", payTimeE); + return ResponseMsgUtil.success(gasOrderSpreadService.countSettleOrderPrice(param)); + + } catch (Exception e) { + return ResponseMsgUtil.exception(e); + } + } + + @RequestMapping(value="/queryOilOrderSpread",method = RequestMethod.GET) + @ResponseBody + @ApiOperation(value = "查询加油推广订单") + public ResponseData queryOilOrderSpread(@RequestParam(value = "userId", required = true) Long userId, + @RequestParam(name = "orderNo", required = false) String orderNo, + @RequestParam(name = "orderStatus", required = false) Integer orderStatus, + @RequestParam(name = "payTimeS", required = false) Long payTimeS, + @RequestParam(name = "payTimeE", required = false) Long payTimeE, + @RequestParam(name = "pageNum", required = true) Integer pageNum, + @RequestParam(name = "pageSize", required = true) Integer pageSize) { + try { + Map param = new HashMap<>(); + param.put("userId", userId); + param.put("orderNo", orderNo); + param.put("status", orderStatus); + param.put("payTimeS", payTimeS); + param.put("payTimeE", payTimeE); + + PageHelper.startPage(pageNum,pageSize); + return ResponseMsgUtil.success(new PageInfo<>(gasOrderService.getOilOrderSpread(param))); + + } catch (Exception e) { + log.error("error!",e); + return ResponseMsgUtil.exception(e); + } + } + + @RequestMapping(value = "/getAccount", method = RequestMethod.GET) + @ResponseBody + @ApiOperation(value = "查询余额账户") + public ResponseData getAccount(@RequestParam(value = "userId", required = true) Long userId) { + try { + // 查询账户 + BsUserSpreadAccount userSpreadAccount = userSpreadAccountService.getDetailByUser(userId); + if (userSpreadAccount == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, ""); + } + HashMap map = new HashMap<>(); + // 账户余额 + map.put("amount", userSpreadAccount.getAmount()); + map.put("cashOutAmount", userSpreadAccount.getCashOutAmount()); + map.put("notCashOutAmount", gasOrderSpreadService.getNotCashOutAmount(userSpreadAccount.getUserId())); + return ResponseMsgUtil.success(map); + + } catch (Exception e) { + return ResponseMsgUtil.exception(e); + } + } + + @RequestMapping(value = "/getRecordList", method = RequestMethod.GET) + @ResponseBody + @ApiOperation(value = "查询记录列表") + public ResponseData getRecordList(@RequestParam(value = "userId", required = true) Long userId, + @RequestParam(value = "type", required = false) Integer type, + @RequestParam(value = "sourceType", required = false) Integer sourceType, + @RequestParam(value = "createTimeS", required = false) Long createTimeS, + @RequestParam(value = "createTimeE", required = false) Long createTimeE, + @RequestParam(value = "pageNum", required = true) Integer pageNum, + @RequestParam(value = "pageSize", required = true) Integer pageSize) { + try { + Map param = new HashMap<>(); + param.put("userId", userId); + param.put("type", type); + param.put("sourceType", sourceType); + param.put("createTimeS", createTimeS); + param.put("createTimeE", createTimeE); + + PageHelper.startPage(pageNum,pageSize); + return ResponseMsgUtil.success(new PageInfo<>(userSpreadAccountRecordService.getList(param))); } catch (Exception e) { return ResponseMsgUtil.exception(e); diff --git a/service/src/main/java/com/hfkj/dao/BsGasOrderSpreadMapperExt.java b/service/src/main/java/com/hfkj/dao/BsGasOrderSpreadMapperExt.java index ee85fe8..0e4ba7e 100644 --- a/service/src/main/java/com/hfkj/dao/BsGasOrderSpreadMapperExt.java +++ b/service/src/main/java/com/hfkj/dao/BsGasOrderSpreadMapperExt.java @@ -34,6 +34,32 @@ public interface BsGasOrderSpreadMapperExt { " ) a") HashMap querySettleOrderList(@Param("param") Map param); + + @Select("") + BigDecimal countSettleOrderPrice(@Param("param") Map param); + @Select(" select " + " case when sum(totalAmount) is not null then sum(totalAmount) else 0 end" + " from (" + diff --git a/service/src/main/java/com/hfkj/dao/BsUserSpreadAccountMapperExt.java b/service/src/main/java/com/hfkj/dao/BsUserSpreadAccountMapperExt.java index 6e2bf8e..a35aed9 100644 --- a/service/src/main/java/com/hfkj/dao/BsUserSpreadAccountMapperExt.java +++ b/service/src/main/java/com/hfkj/dao/BsUserSpreadAccountMapperExt.java @@ -1,7 +1,27 @@ package com.hfkj.dao; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.math.BigDecimal; +import java.util.Map; + /** * mapper扩展类 */ public interface BsUserSpreadAccountMapperExt { -} \ No newline at end of file + + + @Select("") + BigDecimal countSpreadAmount(@Param("param") Map param); +} diff --git a/service/src/main/java/com/hfkj/dao/BsUserSpreadRelMapperExt.java b/service/src/main/java/com/hfkj/dao/BsUserSpreadRelMapperExt.java index 62a84bb..5191e79 100644 --- a/service/src/main/java/com/hfkj/dao/BsUserSpreadRelMapperExt.java +++ b/service/src/main/java/com/hfkj/dao/BsUserSpreadRelMapperExt.java @@ -3,6 +3,7 @@ package com.hfkj.dao; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; +import java.math.BigDecimal; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -28,19 +29,23 @@ public interface BsUserSpreadRelMapperExt { List> getTeamList(@Param("param") Map param); @Select("") List> getUserSpreadList(@Param("param") Map param); + } diff --git a/service/src/main/java/com/hfkj/service/gas/BsGasOrderSpreadService.java b/service/src/main/java/com/hfkj/service/gas/BsGasOrderSpreadService.java index 2bd6293..0f1beb3 100644 --- a/service/src/main/java/com/hfkj/service/gas/BsGasOrderSpreadService.java +++ b/service/src/main/java/com/hfkj/service/gas/BsGasOrderSpreadService.java @@ -4,6 +4,7 @@ import com.hfkj.entity.BsGasOrder; import com.hfkj.entity.BsGasOrderSpread; import java.math.BigDecimal; +import java.util.Map; /** * @className: BsGasOrderSpreadService @@ -36,6 +37,13 @@ public interface BsGasOrderSpreadService { */ void settleOrder(Long userId) throws Exception; + /** + * 统计结算订单金额 + * @param param + * @throws Exception + */ + BigDecimal countSettleOrderPrice(Map param); + /** * 查询未结算金额 * @param userId diff --git a/service/src/main/java/com/hfkj/service/gas/impl/BsGasOrderSpreadServiceImpl.java b/service/src/main/java/com/hfkj/service/gas/impl/BsGasOrderSpreadServiceImpl.java index a9f1572..073a645 100644 --- a/service/src/main/java/com/hfkj/service/gas/impl/BsGasOrderSpreadServiceImpl.java +++ b/service/src/main/java/com/hfkj/service/gas/impl/BsGasOrderSpreadServiceImpl.java @@ -9,6 +9,7 @@ import com.hfkj.service.spread.BsUserSpreadOilChannelService; import com.hfkj.service.spread.BsUserSpreadRelService; import com.hfkj.sysenum.spread.UserSpreadAccountRecordSourceTypeEnum; import org.apache.commons.collections4.MapUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -105,6 +106,21 @@ public class BsGasOrderSpreadServiceImpl implements BsGasOrderSpreadService { } } + @Override + public BigDecimal countSettleOrderPrice(Map param) { + if (StringUtils.isBlank(MapUtils.getString(param, "status"))) { + // 设置查询默认状态数据 + param.put("status", "2,4"); + } + if (MapUtils.getLong(param, "payTimeS") != null) { + param.put("payTimeS", DateUtil.date2String(new Date(MapUtils.getLong(param, "payTimeS")),DateUtil.Y_M_D_HMS)); + } + if (MapUtils.getLong(param, "payTimeE") != null) { + param.put("payTimeE", DateUtil.date2String(new Date(MapUtils.getLong(param, "payTimeE")),DateUtil.Y_M_D_HMS)); + } + return gasOrderSpreadMapper.countSettleOrderPrice(param); + } + @Override public BigDecimal getNotCashOutAmount(Long userId) { return gasOrderSpreadMapper.queryNotCashOutAmount(userId);