From 525cf8c8b6b8a122cf6257bc8fc2938f2e515cdf Mon Sep 17 00:00:00 2001 From: hu177768073 <177768073@qq.com> Date: Wed, 27 Aug 2025 15:10:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E7=BB=93=E5=88=86=E8=B4=A6=E7=BB=93?= =?UTF-8?q?=E6=9E=9C=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BsTradeOrderProfitSharingController.java | 323 ++++++++++++++++++ .../com/hfkj/schedule/TransferSchedule.java | 2 +- .../service/TianQueFundManageService.java | 3 +- .../dao/BsTradeOrderProfitSharingMapper.java | 29 +- ...deOrderProfitSharingReceiverMapperExt.java | 37 +- .../BsTradeOrderProfitSharingSqlProvider.java | 56 +++ .../entity/BsTradeOrderProfitSharing.java | 64 ++++ .../BsTradeOrderProfitSharingExample.java | 270 +++++++++++++++ .../model/TradeProfitSharingDetailModel.java | 67 ++++ .../model/TradeProfitSharingResultModel.java | 57 ++++ ...ApiTradeOrderProfitSharingServiceImpl.java | 18 + ...radeOrderProfitSharingReceiverService.java | 9 + .../BsTradeOrderProfitSharingService.java | 8 + ...OrderProfitSharingReceiverServiceImpl.java | 14 + .../BsTradeOrderProfitSharingServiceImpl.java | 48 +++ .../impl/BsTransferAccountsServiceImpl.java | 4 +- .../hfkj/sysenum/ProfitSharingStatusEnum.java | 2 +- 17 files changed, 999 insertions(+), 12 deletions(-) create mode 100644 bweb/src/main/java/com/bweb/controller/BsTradeOrderProfitSharingController.java create mode 100644 service/src/main/java/com/hfkj/model/TradeProfitSharingDetailModel.java create mode 100644 service/src/main/java/com/hfkj/model/TradeProfitSharingResultModel.java diff --git a/bweb/src/main/java/com/bweb/controller/BsTradeOrderProfitSharingController.java b/bweb/src/main/java/com/bweb/controller/BsTradeOrderProfitSharingController.java new file mode 100644 index 0000000..7925f10 --- /dev/null +++ b/bweb/src/main/java/com/bweb/controller/BsTradeOrderProfitSharingController.java @@ -0,0 +1,323 @@ +package com.bweb.controller; + +import com.alibaba.excel.EasyExcel; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.hfkj.common.exception.ErrorCode; +import com.hfkj.common.exception.ErrorHelp; +import com.hfkj.common.exception.SysCode; +import com.hfkj.common.security.UserCenter; +import com.hfkj.common.utils.EasyExcelUtil; +import com.hfkj.common.utils.ResponseMsgUtil; +import com.hfkj.config.CommonSysConst; +import com.hfkj.entity.BsTradeOrderProfitSharing; +import com.hfkj.model.*; +import com.hfkj.service.*; +import com.hfkj.sysenum.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.apache.commons.collections4.MapUtils; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +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 javax.annotation.Resource; +import java.io.File; +import java.util.*; + +@Controller +@Api(value = "交易订单") +@RequestMapping(value = "/tradeOrderProfitSharing") +public class BsTradeOrderProfitSharingController { + + private static Logger log = LoggerFactory.getLogger(BsTradeOrderProfitSharingController.class); + + @Resource + private UserCenter userCenter; + + @Resource + private BsTradeOrderProfitSharingService tradeOrderProfitSharingService; + @Resource + private BsTradeOrderProfitSharingReceiverService tradeOrderProfitSharingReceiverService; + + + @RequestMapping(value="/queryResultList",method = RequestMethod.GET) + @ResponseBody + @ApiOperation(value = "查询分账结果列表") + public ResponseData queryResultList(@RequestParam(value = "merId" , required = false) Long merId, + @RequestParam(value = "merNo" , required = false) String merNo, + @RequestParam(value = "cmdType" , required = false) Integer cmdType, + @RequestParam(value = "profitSharingOrderNo" , required = false) String profitSharingOrderNo, + @RequestParam(value = "platformProfitSharingOrderNo" , required = false) String platformProfitSharingOrderNo, + @RequestParam(value = "platformTradeNo" , required = false) String platformTradeNo, + @RequestParam(value = "status" , required = false) Integer status, + @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<>(); + UserInfoModel userModel = userCenter.getSessionModel(UserInfoModel.class); + if (userModel.getSecUser().getObjectType().equals(SecUserTypeEnum.type0.getNumber())) { + param.put("merId", merId); + param.put("merNo", merNo); + + } else if (userModel.getSecUser().getObjectType().equals(SecUserTypeEnum.type1.getNumber())) { + param.put("merId", merId); + param.put("merNo", merNo); + + } else if (userModel.getSecUser().getObjectType().equals(SecUserTypeEnum.type2.getNumber())) { + param.put("merId", merId); + param.put("merNo", merNo); + + } else if (userModel.getSecUser().getObjectType().equals(SecUserTypeEnum.type3.getNumber())) { + param.put("merId", merId); + param.put("merNo", merNo); + + } else if (userModel.getSecUser().getObjectType().equals(SecUserTypeEnum.type4.getNumber())) { + param.put("merId", userModel.getMer().getId()); + } else { + throw ErrorHelp.genException(SysCode.System, ErrorCode.MENU_TREE_HAS_NOT_ERROR, ""); + } + param.put("cmdType", cmdType); + param.put("status", status); + param.put("profitSharingOrderNo", profitSharingOrderNo); + param.put("platformProfitSharingOrderNo", platformProfitSharingOrderNo); + param.put("platformTradeNo", platformTradeNo); + param.put("createTimeS", createTimeS); + param.put("createTimeE", createTimeE); + + PageHelper.startPage(pageNum,pageSize); + return ResponseMsgUtil.success(new PageInfo<>(tradeOrderProfitSharingService.getList(param))); + + } catch (Exception e) { + log.error(e.getMessage(), e); + return ResponseMsgUtil.exception(e); + } + } + + + @RequestMapping(value="/exportResult",method = RequestMethod.GET) + @ResponseBody + @ApiOperation(value = "导出分账结果") + public ResponseData exportResult(@RequestParam(value = "merId" , required = false) Long merId, + @RequestParam(value = "merNo" , required = false) String merNo, + @RequestParam(value = "cmdType" , required = false) Integer cmdType, + @RequestParam(value = "profitSharingOrderNo" , required = false) String profitSharingOrderNo, + @RequestParam(value = "platformProfitSharingOrderNo" , required = false) String platformProfitSharingOrderNo, + @RequestParam(value = "platformTradeNo" , required = false) String platformTradeNo, + @RequestParam(value = "status" , required = false) Integer status, + @RequestParam(value = "createTimeS" , required = false) Long createTimeS, + @RequestParam(value = "createTimeE" , required = false) Long createTimeE) { + try { + Map param = new HashMap<>(); + UserInfoModel userModel = userCenter.getSessionModel(UserInfoModel.class); + if (userModel.getSecUser().getObjectType().equals(SecUserTypeEnum.type0.getNumber())) { + param.put("merId", merId); + param.put("merNo", merNo); + + } else if (userModel.getSecUser().getObjectType().equals(SecUserTypeEnum.type1.getNumber())) { + param.put("merId", merId); + param.put("merNo", merNo); + + } else if (userModel.getSecUser().getObjectType().equals(SecUserTypeEnum.type2.getNumber())) { + param.put("merId", merId); + param.put("merNo", merNo); + + } else if (userModel.getSecUser().getObjectType().equals(SecUserTypeEnum.type3.getNumber())) { + param.put("merId", merId); + param.put("merNo", merNo); + + } else if (userModel.getSecUser().getObjectType().equals(SecUserTypeEnum.type4.getNumber())) { + param.put("merId", userModel.getMer().getId()); + } else { + throw ErrorHelp.genException(SysCode.System, ErrorCode.MENU_TREE_HAS_NOT_ERROR, ""); + } + param.put("cmdType", cmdType); + param.put("status", status); + param.put("profitSharingOrderNo", profitSharingOrderNo); + param.put("platformProfitSharingOrderNo", platformProfitSharingOrderNo); + param.put("platformTradeNo", platformTradeNo); + param.put("createTimeS", createTimeS); + param.put("createTimeE", createTimeE); + + // 数据 + List dataList = tradeOrderProfitSharingService.getList(param); + List exportDataList = new ArrayList<>(); + TradeProfitSharingResultModel exportData; + for (BsTradeOrderProfitSharing tradeOrderProfitSharing : dataList) { + exportData = new TradeProfitSharingResultModel(); + exportData.setMerNo(tradeOrderProfitSharing.getMerNo()); + exportData.setProfitSharingOrderNo(tradeOrderProfitSharing.getProfitSharingOrderNo()); + exportData.setPlatformProfitSharingOrderNo(tradeOrderProfitSharing.getPlatformProfitSharingOrderNo()); + exportData.setCreateTime(tradeOrderProfitSharing.getCreateTime()); + exportData.setCmdType(Objects.requireNonNull(ProfitSharingCmdTypeEnum.getDataByNumber(tradeOrderProfitSharing.getCmdType())).getName()); + exportData.setReceiverAmount(tradeOrderProfitSharing.getProfitSharingAmoun().toString()); + exportData.setStatus(Objects.requireNonNull(ProfitSharingStatusEnum.getDataByNumber(tradeOrderProfitSharing.getStatus())).getName()); + exportDataList.add(exportData); + } + String fileName = "/temporary/" + System.currentTimeMillis() + ".xlsx"; + EasyExcel.write(CommonSysConst.getSysConfig().getFilesystem() + fileName, TradeProfitSharingResultModel.class) + .sheet("分账结果").doWrite(exportDataList); + return ResponseMsgUtil.success(fileName); + + } catch (Exception e) { + log.error(e.getMessage(), e); + return ResponseMsgUtil.exception(e); + } + } + + + + @RequestMapping(value="/getReceiverList",method = RequestMethod.GET) + @ResponseBody + @ApiOperation(value = "查询分账明细列表") + public ResponseData getReceiverList(@RequestParam(value = "merId" , required = false) Long merId, + @RequestParam(value = "merNo" , required = false) String merNo, + @RequestParam(value = "cmdType" , required = false) Integer cmdType, + @RequestParam(value = "profitSharingOrderNo" , required = false) String profitSharingOrderNo, + @RequestParam(value = "platformProfitSharingOrderNo" , required = false) String platformProfitSharingOrderNo, + @RequestParam(value = "platformTradeNo" , required = false) String platformTradeNo, + @RequestParam(value = "receiverNo" , required = false) String receiverNo, + @RequestParam(value = "status" , required = false) Integer status, + @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<>(); + UserInfoModel userModel = userCenter.getSessionModel(UserInfoModel.class); + if (userModel.getSecUser().getObjectType().equals(SecUserTypeEnum.type0.getNumber())) { + param.put("merId", merId); + param.put("merNo", merNo); + + } else if (userModel.getSecUser().getObjectType().equals(SecUserTypeEnum.type1.getNumber())) { + param.put("merId", merId); + param.put("merNo", merNo); + + } else if (userModel.getSecUser().getObjectType().equals(SecUserTypeEnum.type2.getNumber())) { + param.put("merId", merId); + param.put("merNo", merNo); + + } else if (userModel.getSecUser().getObjectType().equals(SecUserTypeEnum.type3.getNumber())) { + param.put("merId", merId); + param.put("merNo", merNo); + + } else if (userModel.getSecUser().getObjectType().equals(SecUserTypeEnum.type4.getNumber())) { + if (StringUtils.isBlank(receiverNo)) { + param.put("merId", userModel.getMer().getId()); + } + } else { + throw ErrorHelp.genException(SysCode.System, ErrorCode.MENU_TREE_HAS_NOT_ERROR, ""); + } + param.put("cmdType", cmdType); + param.put("status", status); + param.put("profitSharingOrderNo", profitSharingOrderNo); + param.put("platformProfitSharingOrderNo", platformProfitSharingOrderNo); + param.put("platformTradeNo", platformTradeNo); + param.put("receiverNo", receiverNo); + param.put("createTimeS", createTimeS); + param.put("createTimeE", createTimeE); + + PageHelper.startPage(pageNum,pageSize); + return ResponseMsgUtil.success(new PageInfo<>(tradeOrderProfitSharingReceiverService.getReceiverList(param))); + + } catch (Exception e) { + log.error(e.getMessage(), e); + return ResponseMsgUtil.exception(e); + } + } + + @RequestMapping(value="/exportReceiver",method = RequestMethod.GET) + @ResponseBody + @ApiOperation(value = "导出分账明细") + public ResponseData exportReceiver(@RequestParam(value = "merId" , required = false) Long merId, + @RequestParam(value = "merNo" , required = false) String merNo, + @RequestParam(value = "cmdType" , required = false) Integer cmdType, + @RequestParam(value = "profitSharingOrderNo" , required = false) String profitSharingOrderNo, + @RequestParam(value = "platformProfitSharingOrderNo" , required = false) String platformProfitSharingOrderNo, + @RequestParam(value = "platformTradeNo" , required = false) String platformTradeNo, + @RequestParam(value = "receiverNo" , required = false) String receiverNo, + @RequestParam(value = "status" , required = false) Integer status, + @RequestParam(value = "createTimeS" , required = false) Long createTimeS, + @RequestParam(value = "createTimeE" , required = false) Long createTimeE) { + try { + Map param = new HashMap<>(); + UserInfoModel userModel = userCenter.getSessionModel(UserInfoModel.class); + if (userModel.getSecUser().getObjectType().equals(SecUserTypeEnum.type0.getNumber())) { + param.put("merId", merId); + param.put("merNo", merNo); + + } else if (userModel.getSecUser().getObjectType().equals(SecUserTypeEnum.type1.getNumber())) { + param.put("merId", merId); + param.put("merNo", merNo); + + } else if (userModel.getSecUser().getObjectType().equals(SecUserTypeEnum.type2.getNumber())) { + param.put("merId", merId); + param.put("merNo", merNo); + + } else if (userModel.getSecUser().getObjectType().equals(SecUserTypeEnum.type3.getNumber())) { + param.put("merId", merId); + param.put("merNo", merNo); + + } else if (userModel.getSecUser().getObjectType().equals(SecUserTypeEnum.type4.getNumber())) { + if (StringUtils.isBlank(receiverNo)) { + param.put("merId", userModel.getMer().getId()); + } + } else { + throw ErrorHelp.genException(SysCode.System, ErrorCode.MENU_TREE_HAS_NOT_ERROR, ""); + } + param.put("cmdType", cmdType); + param.put("status", status); + param.put("profitSharingOrderNo", profitSharingOrderNo); + param.put("platformProfitSharingOrderNo", platformProfitSharingOrderNo); + param.put("platformTradeNo", platformTradeNo); + param.put("receiverNo", receiverNo); + param.put("createTimeS", createTimeS); + param.put("createTimeE", createTimeE); + + + // 数据 + List dataList = tradeOrderProfitSharingReceiverService.getReceiverList(param); String fileName = "/temporary/" + System.currentTimeMillis() + ".xlsx"; + for (TradeProfitSharingDetailModel detailModel : dataList) { + detailModel.setCmdType(Objects.requireNonNull(ProfitSharingCmdTypeEnum.getDataByNumber(Integer.valueOf(detailModel.getCmdType()))).getName()); + } + EasyExcel.write(CommonSysConst.getSysConfig().getFilesystem() + fileName, TradeProfitSharingDetailModel.class) + .sheet("分账明细").doWrite(dataList); + return ResponseMsgUtil.success(fileName); + + } catch (Exception e) { + log.error(e.getMessage(), e); + return ResponseMsgUtil.exception(e); + } + } + + @RequestMapping(value="/queryProfitSharingDetail",method = RequestMethod.GET) + @ResponseBody + @ApiOperation(value = "查询分账详情列表") + public ResponseData queryProfitSharingDetail(@RequestParam(value = "profitSharingOrderNo" , required = true) String profitSharingOrderNo) { + try { + //查询分账 + BsTradeOrderProfitSharing profitSharing = tradeOrderProfitSharingService.getDetailByProfitSharingOrderNo(profitSharingOrderNo); + if (profitSharing == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未找到分账数据"); + } + Map map = new HashMap<>(); + map.put("profitSharing", profitSharing); + // 接收方列表 + map.put("receiver", tradeOrderProfitSharingReceiverService.getReceiverListByProfitSharingId(profitSharing.getId())); + + return ResponseMsgUtil.success(map); + + } catch (Exception e) { + log.error(e.getMessage(), e); + return ResponseMsgUtil.exception(e); + } + } + +} diff --git a/schedule/src/main/java/com/hfkj/schedule/TransferSchedule.java b/schedule/src/main/java/com/hfkj/schedule/TransferSchedule.java index e83ceff..964f711 100644 --- a/schedule/src/main/java/com/hfkj/schedule/TransferSchedule.java +++ b/schedule/src/main/java/com/hfkj/schedule/TransferSchedule.java @@ -57,7 +57,7 @@ public class TransferSchedule { for (BsTransferAccounts transferAccounts : list) { try { // 转账结果查询 - JSONObject transferInfo = tianQueFundManageService.getTransferInfo(transferAccounts.getOrderNo()); + JSONObject transferInfo = tianQueFundManageService.getTransferInfo(transferAccounts.getReceiverPlatformNo(),transferAccounts.getOrderNo()); if (StringUtils.isNotBlank(transferInfo.getString("rate"))) { transferAccounts.setShdFeeAmt(new BigDecimal(transferInfo.getString("rate"))); } diff --git a/service/src/main/java/com/hfkj/channel/tianque/service/TianQueFundManageService.java b/service/src/main/java/com/hfkj/channel/tianque/service/TianQueFundManageService.java index 8495fd8..6729890 100644 --- a/service/src/main/java/com/hfkj/channel/tianque/service/TianQueFundManageService.java +++ b/service/src/main/java/com/hfkj/channel/tianque/service/TianQueFundManageService.java @@ -61,9 +61,10 @@ public class TianQueFundManageService { * @param orderNo * @return */ - public JSONObject getTransferInfo(String orderNo) { + public JSONObject getTransferInfo(String mno,String orderNo) { log.info("========= Start 营销转账 Start ==========="); Map param = new HashMap<>(); + param.put("mno", mno); param.put("orderNo", orderNo); JSONObject responseBody = RequestUtil.request(TianQueConfig.requestUrl + "/capital/fundManage/getTransferInfo", param); diff --git a/service/src/main/java/com/hfkj/dao/BsTradeOrderProfitSharingMapper.java b/service/src/main/java/com/hfkj/dao/BsTradeOrderProfitSharingMapper.java index b93088d..e7861f1 100644 --- a/service/src/main/java/com/hfkj/dao/BsTradeOrderProfitSharingMapper.java +++ b/service/src/main/java/com/hfkj/dao/BsTradeOrderProfitSharingMapper.java @@ -40,7 +40,9 @@ public interface BsTradeOrderProfitSharingMapper extends BsTradeOrderProfitShari @Insert({ "insert into bs_trade_order_profit_sharing (cmd_type, trade_order_id, ", - "trade_order_no, origin_profit_sharing_order_no, ", + "trade_order_no, mer_id, ", + "mer_no, mer_name, ", + "mer_abbreviate, origin_profit_sharing_order_no, ", "profit_sharing_order_no, platform_type, ", "platform_profit_sharing_order_no, platform_mer_no, ", "platform_trade_no, platform_appid, ", @@ -50,7 +52,9 @@ public interface BsTradeOrderProfitSharingMapper extends BsTradeOrderProfitShari "finish_time, ext_1, ", "ext_2, ext_3)", "values (#{cmdType,jdbcType=INTEGER}, #{tradeOrderId,jdbcType=BIGINT}, ", - "#{tradeOrderNo,jdbcType=VARCHAR}, #{originProfitSharingOrderNo,jdbcType=VARCHAR}, ", + "#{tradeOrderNo,jdbcType=VARCHAR}, #{merId,jdbcType=BIGINT}, ", + "#{merNo,jdbcType=VARCHAR}, #{merName,jdbcType=VARCHAR}, ", + "#{merAbbreviate,jdbcType=VARCHAR}, #{originProfitSharingOrderNo,jdbcType=VARCHAR}, ", "#{profitSharingOrderNo,jdbcType=VARCHAR}, #{platformType,jdbcType=INTEGER}, ", "#{platformProfitSharingOrderNo,jdbcType=VARCHAR}, #{platformMerNo,jdbcType=VARCHAR}, ", "#{platformTradeNo,jdbcType=VARCHAR}, #{platformAppid,jdbcType=VARCHAR}, ", @@ -73,6 +77,10 @@ public interface BsTradeOrderProfitSharingMapper extends BsTradeOrderProfitShari @Result(column="cmd_type", property="cmdType", jdbcType=JdbcType.INTEGER), @Result(column="trade_order_id", property="tradeOrderId", jdbcType=JdbcType.BIGINT), @Result(column="trade_order_no", property="tradeOrderNo", jdbcType=JdbcType.VARCHAR), + @Result(column="mer_id", property="merId", jdbcType=JdbcType.BIGINT), + @Result(column="mer_no", property="merNo", jdbcType=JdbcType.VARCHAR), + @Result(column="mer_name", property="merName", jdbcType=JdbcType.VARCHAR), + @Result(column="mer_abbreviate", property="merAbbreviate", jdbcType=JdbcType.VARCHAR), @Result(column="origin_profit_sharing_order_no", property="originProfitSharingOrderNo", jdbcType=JdbcType.VARCHAR), @Result(column="profit_sharing_order_no", property="profitSharingOrderNo", jdbcType=JdbcType.VARCHAR), @Result(column="platform_type", property="platformType", jdbcType=JdbcType.INTEGER), @@ -95,10 +103,11 @@ public interface BsTradeOrderProfitSharingMapper extends BsTradeOrderProfitShari @Select({ "select", - "id, cmd_type, trade_order_id, trade_order_no, origin_profit_sharing_order_no, ", - "profit_sharing_order_no, platform_type, platform_profit_sharing_order_no, platform_mer_no, ", - "platform_trade_no, platform_appid, ratio, profit_sharing_amoun, `status`, create_type, ", - "create_time, profit_sharing_time, finish_time, ext_1, ext_2, ext_3", + "id, cmd_type, trade_order_id, trade_order_no, mer_id, mer_no, mer_name, mer_abbreviate, ", + "origin_profit_sharing_order_no, profit_sharing_order_no, platform_type, platform_profit_sharing_order_no, ", + "platform_mer_no, platform_trade_no, platform_appid, ratio, profit_sharing_amoun, ", + "`status`, create_type, create_time, profit_sharing_time, finish_time, ext_1, ", + "ext_2, ext_3", "from bs_trade_order_profit_sharing", "where id = #{id,jdbcType=BIGINT}" }) @@ -107,6 +116,10 @@ public interface BsTradeOrderProfitSharingMapper extends BsTradeOrderProfitShari @Result(column="cmd_type", property="cmdType", jdbcType=JdbcType.INTEGER), @Result(column="trade_order_id", property="tradeOrderId", jdbcType=JdbcType.BIGINT), @Result(column="trade_order_no", property="tradeOrderNo", jdbcType=JdbcType.VARCHAR), + @Result(column="mer_id", property="merId", jdbcType=JdbcType.BIGINT), + @Result(column="mer_no", property="merNo", jdbcType=JdbcType.VARCHAR), + @Result(column="mer_name", property="merName", jdbcType=JdbcType.VARCHAR), + @Result(column="mer_abbreviate", property="merAbbreviate", jdbcType=JdbcType.VARCHAR), @Result(column="origin_profit_sharing_order_no", property="originProfitSharingOrderNo", jdbcType=JdbcType.VARCHAR), @Result(column="profit_sharing_order_no", property="profitSharingOrderNo", jdbcType=JdbcType.VARCHAR), @Result(column="platform_type", property="platformType", jdbcType=JdbcType.INTEGER), @@ -141,6 +154,10 @@ public interface BsTradeOrderProfitSharingMapper extends BsTradeOrderProfitShari "set cmd_type = #{cmdType,jdbcType=INTEGER},", "trade_order_id = #{tradeOrderId,jdbcType=BIGINT},", "trade_order_no = #{tradeOrderNo,jdbcType=VARCHAR},", + "mer_id = #{merId,jdbcType=BIGINT},", + "mer_no = #{merNo,jdbcType=VARCHAR},", + "mer_name = #{merName,jdbcType=VARCHAR},", + "mer_abbreviate = #{merAbbreviate,jdbcType=VARCHAR},", "origin_profit_sharing_order_no = #{originProfitSharingOrderNo,jdbcType=VARCHAR},", "profit_sharing_order_no = #{profitSharingOrderNo,jdbcType=VARCHAR},", "platform_type = #{platformType,jdbcType=INTEGER},", diff --git a/service/src/main/java/com/hfkj/dao/BsTradeOrderProfitSharingReceiverMapperExt.java b/service/src/main/java/com/hfkj/dao/BsTradeOrderProfitSharingReceiverMapperExt.java index 78716fc..e55acdb 100644 --- a/service/src/main/java/com/hfkj/dao/BsTradeOrderProfitSharingReceiverMapperExt.java +++ b/service/src/main/java/com/hfkj/dao/BsTradeOrderProfitSharingReceiverMapperExt.java @@ -1,7 +1,42 @@ package com.hfkj.dao; +import com.hfkj.model.TradeProfitSharingDetailModel; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + /** * mapper扩展类 */ public interface BsTradeOrderProfitSharingReceiverMapperExt { -} \ No newline at end of file + + @Select("") + List queryReceiverList(@Param("param") Map param); +} diff --git a/service/src/main/java/com/hfkj/dao/BsTradeOrderProfitSharingSqlProvider.java b/service/src/main/java/com/hfkj/dao/BsTradeOrderProfitSharingSqlProvider.java index 46b6dc0..5e06376 100644 --- a/service/src/main/java/com/hfkj/dao/BsTradeOrderProfitSharingSqlProvider.java +++ b/service/src/main/java/com/hfkj/dao/BsTradeOrderProfitSharingSqlProvider.java @@ -40,6 +40,22 @@ public class BsTradeOrderProfitSharingSqlProvider { sql.VALUES("trade_order_no", "#{tradeOrderNo,jdbcType=VARCHAR}"); } + if (record.getMerId() != null) { + sql.VALUES("mer_id", "#{merId,jdbcType=BIGINT}"); + } + + if (record.getMerNo() != null) { + sql.VALUES("mer_no", "#{merNo,jdbcType=VARCHAR}"); + } + + if (record.getMerName() != null) { + sql.VALUES("mer_name", "#{merName,jdbcType=VARCHAR}"); + } + + if (record.getMerAbbreviate() != null) { + sql.VALUES("mer_abbreviate", "#{merAbbreviate,jdbcType=VARCHAR}"); + } + if (record.getOriginProfitSharingOrderNo() != null) { sql.VALUES("origin_profit_sharing_order_no", "#{originProfitSharingOrderNo,jdbcType=VARCHAR}"); } @@ -121,6 +137,10 @@ public class BsTradeOrderProfitSharingSqlProvider { sql.SELECT("cmd_type"); sql.SELECT("trade_order_id"); sql.SELECT("trade_order_no"); + sql.SELECT("mer_id"); + sql.SELECT("mer_no"); + sql.SELECT("mer_name"); + sql.SELECT("mer_abbreviate"); sql.SELECT("origin_profit_sharing_order_no"); sql.SELECT("profit_sharing_order_no"); sql.SELECT("platform_type"); @@ -171,6 +191,22 @@ public class BsTradeOrderProfitSharingSqlProvider { sql.SET("trade_order_no = #{record.tradeOrderNo,jdbcType=VARCHAR}"); } + if (record.getMerId() != null) { + sql.SET("mer_id = #{record.merId,jdbcType=BIGINT}"); + } + + if (record.getMerNo() != null) { + sql.SET("mer_no = #{record.merNo,jdbcType=VARCHAR}"); + } + + if (record.getMerName() != null) { + sql.SET("mer_name = #{record.merName,jdbcType=VARCHAR}"); + } + + if (record.getMerAbbreviate() != null) { + sql.SET("mer_abbreviate = #{record.merAbbreviate,jdbcType=VARCHAR}"); + } + if (record.getOriginProfitSharingOrderNo() != null) { sql.SET("origin_profit_sharing_order_no = #{record.originProfitSharingOrderNo,jdbcType=VARCHAR}"); } @@ -251,6 +287,10 @@ public class BsTradeOrderProfitSharingSqlProvider { sql.SET("cmd_type = #{record.cmdType,jdbcType=INTEGER}"); sql.SET("trade_order_id = #{record.tradeOrderId,jdbcType=BIGINT}"); sql.SET("trade_order_no = #{record.tradeOrderNo,jdbcType=VARCHAR}"); + sql.SET("mer_id = #{record.merId,jdbcType=BIGINT}"); + sql.SET("mer_no = #{record.merNo,jdbcType=VARCHAR}"); + sql.SET("mer_name = #{record.merName,jdbcType=VARCHAR}"); + sql.SET("mer_abbreviate = #{record.merAbbreviate,jdbcType=VARCHAR}"); sql.SET("origin_profit_sharing_order_no = #{record.originProfitSharingOrderNo,jdbcType=VARCHAR}"); sql.SET("profit_sharing_order_no = #{record.profitSharingOrderNo,jdbcType=VARCHAR}"); sql.SET("platform_type = #{record.platformType,jdbcType=INTEGER}"); @@ -290,6 +330,22 @@ public class BsTradeOrderProfitSharingSqlProvider { sql.SET("trade_order_no = #{tradeOrderNo,jdbcType=VARCHAR}"); } + if (record.getMerId() != null) { + sql.SET("mer_id = #{merId,jdbcType=BIGINT}"); + } + + if (record.getMerNo() != null) { + sql.SET("mer_no = #{merNo,jdbcType=VARCHAR}"); + } + + if (record.getMerName() != null) { + sql.SET("mer_name = #{merName,jdbcType=VARCHAR}"); + } + + if (record.getMerAbbreviate() != null) { + sql.SET("mer_abbreviate = #{merAbbreviate,jdbcType=VARCHAR}"); + } + if (record.getOriginProfitSharingOrderNo() != null) { sql.SET("origin_profit_sharing_order_no = #{originProfitSharingOrderNo,jdbcType=VARCHAR}"); } diff --git a/service/src/main/java/com/hfkj/entity/BsTradeOrderProfitSharing.java b/service/src/main/java/com/hfkj/entity/BsTradeOrderProfitSharing.java index c1eb118..1f7d7da 100644 --- a/service/src/main/java/com/hfkj/entity/BsTradeOrderProfitSharing.java +++ b/service/src/main/java/com/hfkj/entity/BsTradeOrderProfitSharing.java @@ -35,6 +35,26 @@ public class BsTradeOrderProfitSharing implements Serializable { */ private String tradeOrderNo; + /** + * 商户id + */ + private Long merId; + + /** + * 商户号 + */ + private String merNo; + + /** + * 商户名称 + */ + private String merName; + + /** + * 商户简称 + */ + private String merAbbreviate; + /** * 原分账单号 */ @@ -145,6 +165,38 @@ public class BsTradeOrderProfitSharing implements Serializable { this.tradeOrderNo = tradeOrderNo; } + public Long getMerId() { + return merId; + } + + public void setMerId(Long merId) { + this.merId = merId; + } + + public String getMerNo() { + return merNo; + } + + public void setMerNo(String merNo) { + this.merNo = merNo; + } + + public String getMerName() { + return merName; + } + + public void setMerName(String merName) { + this.merName = merName; + } + + public String getMerAbbreviate() { + return merAbbreviate; + } + + public void setMerAbbreviate(String merAbbreviate) { + this.merAbbreviate = merAbbreviate; + } + public String getOriginProfitSharingOrderNo() { return originProfitSharingOrderNo; } @@ -297,6 +349,10 @@ public class BsTradeOrderProfitSharing implements Serializable { && (this.getCmdType() == null ? other.getCmdType() == null : this.getCmdType().equals(other.getCmdType())) && (this.getTradeOrderId() == null ? other.getTradeOrderId() == null : this.getTradeOrderId().equals(other.getTradeOrderId())) && (this.getTradeOrderNo() == null ? other.getTradeOrderNo() == null : this.getTradeOrderNo().equals(other.getTradeOrderNo())) + && (this.getMerId() == null ? other.getMerId() == null : this.getMerId().equals(other.getMerId())) + && (this.getMerNo() == null ? other.getMerNo() == null : this.getMerNo().equals(other.getMerNo())) + && (this.getMerName() == null ? other.getMerName() == null : this.getMerName().equals(other.getMerName())) + && (this.getMerAbbreviate() == null ? other.getMerAbbreviate() == null : this.getMerAbbreviate().equals(other.getMerAbbreviate())) && (this.getOriginProfitSharingOrderNo() == null ? other.getOriginProfitSharingOrderNo() == null : this.getOriginProfitSharingOrderNo().equals(other.getOriginProfitSharingOrderNo())) && (this.getProfitSharingOrderNo() == null ? other.getProfitSharingOrderNo() == null : this.getProfitSharingOrderNo().equals(other.getProfitSharingOrderNo())) && (this.getPlatformType() == null ? other.getPlatformType() == null : this.getPlatformType().equals(other.getPlatformType())) @@ -324,6 +380,10 @@ public class BsTradeOrderProfitSharing implements Serializable { result = prime * result + ((getCmdType() == null) ? 0 : getCmdType().hashCode()); result = prime * result + ((getTradeOrderId() == null) ? 0 : getTradeOrderId().hashCode()); result = prime * result + ((getTradeOrderNo() == null) ? 0 : getTradeOrderNo().hashCode()); + result = prime * result + ((getMerId() == null) ? 0 : getMerId().hashCode()); + result = prime * result + ((getMerNo() == null) ? 0 : getMerNo().hashCode()); + result = prime * result + ((getMerName() == null) ? 0 : getMerName().hashCode()); + result = prime * result + ((getMerAbbreviate() == null) ? 0 : getMerAbbreviate().hashCode()); result = prime * result + ((getOriginProfitSharingOrderNo() == null) ? 0 : getOriginProfitSharingOrderNo().hashCode()); result = prime * result + ((getProfitSharingOrderNo() == null) ? 0 : getProfitSharingOrderNo().hashCode()); result = prime * result + ((getPlatformType() == null) ? 0 : getPlatformType().hashCode()); @@ -354,6 +414,10 @@ public class BsTradeOrderProfitSharing implements Serializable { sb.append(", cmdType=").append(cmdType); sb.append(", tradeOrderId=").append(tradeOrderId); sb.append(", tradeOrderNo=").append(tradeOrderNo); + sb.append(", merId=").append(merId); + sb.append(", merNo=").append(merNo); + sb.append(", merName=").append(merName); + sb.append(", merAbbreviate=").append(merAbbreviate); sb.append(", originProfitSharingOrderNo=").append(originProfitSharingOrderNo); sb.append(", profitSharingOrderNo=").append(profitSharingOrderNo); sb.append(", platformType=").append(platformType); diff --git a/service/src/main/java/com/hfkj/entity/BsTradeOrderProfitSharingExample.java b/service/src/main/java/com/hfkj/entity/BsTradeOrderProfitSharingExample.java index 75f50db..98e6cbd 100644 --- a/service/src/main/java/com/hfkj/entity/BsTradeOrderProfitSharingExample.java +++ b/service/src/main/java/com/hfkj/entity/BsTradeOrderProfitSharingExample.java @@ -376,6 +376,276 @@ public class BsTradeOrderProfitSharingExample { return (Criteria) this; } + public Criteria andMerIdIsNull() { + addCriterion("mer_id is null"); + return (Criteria) this; + } + + public Criteria andMerIdIsNotNull() { + addCriterion("mer_id is not null"); + return (Criteria) this; + } + + public Criteria andMerIdEqualTo(Long value) { + addCriterion("mer_id =", value, "merId"); + return (Criteria) this; + } + + public Criteria andMerIdNotEqualTo(Long value) { + addCriterion("mer_id <>", value, "merId"); + return (Criteria) this; + } + + public Criteria andMerIdGreaterThan(Long value) { + addCriterion("mer_id >", value, "merId"); + return (Criteria) this; + } + + public Criteria andMerIdGreaterThanOrEqualTo(Long value) { + addCriterion("mer_id >=", value, "merId"); + return (Criteria) this; + } + + public Criteria andMerIdLessThan(Long value) { + addCriterion("mer_id <", value, "merId"); + return (Criteria) this; + } + + public Criteria andMerIdLessThanOrEqualTo(Long value) { + addCriterion("mer_id <=", value, "merId"); + return (Criteria) this; + } + + public Criteria andMerIdIn(List values) { + addCriterion("mer_id in", values, "merId"); + return (Criteria) this; + } + + public Criteria andMerIdNotIn(List values) { + addCriterion("mer_id not in", values, "merId"); + return (Criteria) this; + } + + public Criteria andMerIdBetween(Long value1, Long value2) { + addCriterion("mer_id between", value1, value2, "merId"); + return (Criteria) this; + } + + public Criteria andMerIdNotBetween(Long value1, Long value2) { + addCriterion("mer_id not between", value1, value2, "merId"); + return (Criteria) this; + } + + public Criteria andMerNoIsNull() { + addCriterion("mer_no is null"); + return (Criteria) this; + } + + public Criteria andMerNoIsNotNull() { + addCriterion("mer_no is not null"); + return (Criteria) this; + } + + public Criteria andMerNoEqualTo(String value) { + addCriterion("mer_no =", value, "merNo"); + return (Criteria) this; + } + + public Criteria andMerNoNotEqualTo(String value) { + addCriterion("mer_no <>", value, "merNo"); + return (Criteria) this; + } + + public Criteria andMerNoGreaterThan(String value) { + addCriterion("mer_no >", value, "merNo"); + return (Criteria) this; + } + + public Criteria andMerNoGreaterThanOrEqualTo(String value) { + addCriterion("mer_no >=", value, "merNo"); + return (Criteria) this; + } + + public Criteria andMerNoLessThan(String value) { + addCriterion("mer_no <", value, "merNo"); + return (Criteria) this; + } + + public Criteria andMerNoLessThanOrEqualTo(String value) { + addCriterion("mer_no <=", value, "merNo"); + return (Criteria) this; + } + + public Criteria andMerNoLike(String value) { + addCriterion("mer_no like", value, "merNo"); + return (Criteria) this; + } + + public Criteria andMerNoNotLike(String value) { + addCriterion("mer_no not like", value, "merNo"); + return (Criteria) this; + } + + public Criteria andMerNoIn(List values) { + addCriterion("mer_no in", values, "merNo"); + return (Criteria) this; + } + + public Criteria andMerNoNotIn(List values) { + addCriterion("mer_no not in", values, "merNo"); + return (Criteria) this; + } + + public Criteria andMerNoBetween(String value1, String value2) { + addCriterion("mer_no between", value1, value2, "merNo"); + return (Criteria) this; + } + + public Criteria andMerNoNotBetween(String value1, String value2) { + addCriterion("mer_no not between", value1, value2, "merNo"); + return (Criteria) this; + } + + public Criteria andMerNameIsNull() { + addCriterion("mer_name is null"); + return (Criteria) this; + } + + public Criteria andMerNameIsNotNull() { + addCriterion("mer_name is not null"); + return (Criteria) this; + } + + public Criteria andMerNameEqualTo(String value) { + addCriterion("mer_name =", value, "merName"); + return (Criteria) this; + } + + public Criteria andMerNameNotEqualTo(String value) { + addCriterion("mer_name <>", value, "merName"); + return (Criteria) this; + } + + public Criteria andMerNameGreaterThan(String value) { + addCriterion("mer_name >", value, "merName"); + return (Criteria) this; + } + + public Criteria andMerNameGreaterThanOrEqualTo(String value) { + addCriterion("mer_name >=", value, "merName"); + return (Criteria) this; + } + + public Criteria andMerNameLessThan(String value) { + addCriterion("mer_name <", value, "merName"); + return (Criteria) this; + } + + public Criteria andMerNameLessThanOrEqualTo(String value) { + addCriterion("mer_name <=", value, "merName"); + return (Criteria) this; + } + + public Criteria andMerNameLike(String value) { + addCriterion("mer_name like", value, "merName"); + return (Criteria) this; + } + + public Criteria andMerNameNotLike(String value) { + addCriterion("mer_name not like", value, "merName"); + return (Criteria) this; + } + + public Criteria andMerNameIn(List values) { + addCriterion("mer_name in", values, "merName"); + return (Criteria) this; + } + + public Criteria andMerNameNotIn(List values) { + addCriterion("mer_name not in", values, "merName"); + return (Criteria) this; + } + + public Criteria andMerNameBetween(String value1, String value2) { + addCriterion("mer_name between", value1, value2, "merName"); + return (Criteria) this; + } + + public Criteria andMerNameNotBetween(String value1, String value2) { + addCriterion("mer_name not between", value1, value2, "merName"); + return (Criteria) this; + } + + public Criteria andMerAbbreviateIsNull() { + addCriterion("mer_abbreviate is null"); + return (Criteria) this; + } + + public Criteria andMerAbbreviateIsNotNull() { + addCriterion("mer_abbreviate is not null"); + return (Criteria) this; + } + + public Criteria andMerAbbreviateEqualTo(String value) { + addCriterion("mer_abbreviate =", value, "merAbbreviate"); + return (Criteria) this; + } + + public Criteria andMerAbbreviateNotEqualTo(String value) { + addCriterion("mer_abbreviate <>", value, "merAbbreviate"); + return (Criteria) this; + } + + public Criteria andMerAbbreviateGreaterThan(String value) { + addCriterion("mer_abbreviate >", value, "merAbbreviate"); + return (Criteria) this; + } + + public Criteria andMerAbbreviateGreaterThanOrEqualTo(String value) { + addCriterion("mer_abbreviate >=", value, "merAbbreviate"); + return (Criteria) this; + } + + public Criteria andMerAbbreviateLessThan(String value) { + addCriterion("mer_abbreviate <", value, "merAbbreviate"); + return (Criteria) this; + } + + public Criteria andMerAbbreviateLessThanOrEqualTo(String value) { + addCriterion("mer_abbreviate <=", value, "merAbbreviate"); + return (Criteria) this; + } + + public Criteria andMerAbbreviateLike(String value) { + addCriterion("mer_abbreviate like", value, "merAbbreviate"); + return (Criteria) this; + } + + public Criteria andMerAbbreviateNotLike(String value) { + addCriterion("mer_abbreviate not like", value, "merAbbreviate"); + return (Criteria) this; + } + + public Criteria andMerAbbreviateIn(List values) { + addCriterion("mer_abbreviate in", values, "merAbbreviate"); + return (Criteria) this; + } + + public Criteria andMerAbbreviateNotIn(List values) { + addCriterion("mer_abbreviate not in", values, "merAbbreviate"); + return (Criteria) this; + } + + public Criteria andMerAbbreviateBetween(String value1, String value2) { + addCriterion("mer_abbreviate between", value1, value2, "merAbbreviate"); + return (Criteria) this; + } + + public Criteria andMerAbbreviateNotBetween(String value1, String value2) { + addCriterion("mer_abbreviate not between", value1, value2, "merAbbreviate"); + return (Criteria) this; + } + public Criteria andOriginProfitSharingOrderNoIsNull() { addCriterion("origin_profit_sharing_order_no is null"); return (Criteria) this; diff --git a/service/src/main/java/com/hfkj/model/TradeProfitSharingDetailModel.java b/service/src/main/java/com/hfkj/model/TradeProfitSharingDetailModel.java new file mode 100644 index 0000000..4338530 --- /dev/null +++ b/service/src/main/java/com/hfkj/model/TradeProfitSharingDetailModel.java @@ -0,0 +1,67 @@ +package com.hfkj.model; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadFontStyle; +import lombok.Data; +import org.apache.poi.ss.usermodel.HorizontalAlignment; + +@Data +public class TradeProfitSharingDetailModel { + + @ColumnWidth(25) + @ExcelProperty("商户号") + @HeadFontStyle(bold = true) + @ContentStyle(horizontalAlignment = HorizontalAlignment.CENTER) + private String merNo; + + @ColumnWidth(25) + @ExcelProperty("商户名称") + @HeadFontStyle(bold = true) + @ContentStyle(horizontalAlignment = HorizontalAlignment.CENTER) + private String merName; + + @ColumnWidth(30) + @ExcelProperty("分账流水号") + @HeadFontStyle(bold = true) + @ContentStyle(horizontalAlignment = HorizontalAlignment.CENTER) + private String profitSharingOrderNo; + + @ColumnWidth(45) + @ExcelProperty("平台流水号") + @HeadFontStyle(bold = true) + @ContentStyle(horizontalAlignment = HorizontalAlignment.CENTER) + private String platformProfitSharingOrderNo; + + @ColumnWidth(20) + @ExcelProperty("分账时间") + @HeadFontStyle(bold = true) + @ContentStyle(horizontalAlignment = HorizontalAlignment.CENTER) + private String createTime; + + @ColumnWidth(18) + @ExcelProperty("分账类型") + @HeadFontStyle(bold = true) + @ContentStyle(horizontalAlignment = HorizontalAlignment.CENTER) + private String cmdType; + + @ColumnWidth(25) + @ExcelProperty("分账接收号") + @HeadFontStyle(bold = true) + @ContentStyle(horizontalAlignment = HorizontalAlignment.CENTER) + private String receiverNo; + + @ColumnWidth(25) + @ExcelProperty("分账接收名称") + @HeadFontStyle(bold = true) + @ContentStyle(horizontalAlignment = HorizontalAlignment.CENTER) + private String receiverName; + + @ColumnWidth(25) + @ExcelProperty("分账金额(元)") + @HeadFontStyle(bold = true) + @ContentStyle(horizontalAlignment = HorizontalAlignment.CENTER) + private String receiverAmount; + +} diff --git a/service/src/main/java/com/hfkj/model/TradeProfitSharingResultModel.java b/service/src/main/java/com/hfkj/model/TradeProfitSharingResultModel.java new file mode 100644 index 0000000..2f2f1b5 --- /dev/null +++ b/service/src/main/java/com/hfkj/model/TradeProfitSharingResultModel.java @@ -0,0 +1,57 @@ +package com.hfkj.model; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadFontStyle; +import lombok.Data; +import org.apache.poi.ss.usermodel.HorizontalAlignment; + +import java.util.Date; + +@Data +public class TradeProfitSharingResultModel { + + @ColumnWidth(25) + @ExcelProperty("商户号") + @HeadFontStyle(bold = true) + @ContentStyle(horizontalAlignment = HorizontalAlignment.CENTER) + private String merNo; + + @ColumnWidth(30) + @ExcelProperty("分账流水号") + @HeadFontStyle(bold = true) + @ContentStyle(horizontalAlignment = HorizontalAlignment.CENTER) + private String profitSharingOrderNo; + + @ColumnWidth(45) + @ExcelProperty("平台流水号") + @HeadFontStyle(bold = true) + @ContentStyle(horizontalAlignment = HorizontalAlignment.CENTER) + private String platformProfitSharingOrderNo; + + @ColumnWidth(20) + @ExcelProperty("分账时间") + @HeadFontStyle(bold = true) + @ContentStyle(horizontalAlignment = HorizontalAlignment.CENTER) + private Date createTime; + + @ColumnWidth(15) + @ExcelProperty("分账类型") + @HeadFontStyle(bold = true) + @ContentStyle(horizontalAlignment = HorizontalAlignment.CENTER) + private String cmdType; + + @ColumnWidth(15) + @ExcelProperty("分账金额(元)") + @HeadFontStyle(bold = true) + @ContentStyle(horizontalAlignment = HorizontalAlignment.CENTER) + private String receiverAmount; + + @ColumnWidth(15) + @ExcelProperty("分账结果") + @HeadFontStyle(bold = true) + @ContentStyle(horizontalAlignment = HorizontalAlignment.CENTER) + private String status; + +} diff --git a/service/src/main/java/com/hfkj/openapi/v1/service/impl/OpenApiTradeOrderProfitSharingServiceImpl.java b/service/src/main/java/com/hfkj/openapi/v1/service/impl/OpenApiTradeOrderProfitSharingServiceImpl.java index ec7a414..bc1ca08 100644 --- a/service/src/main/java/com/hfkj/openapi/v1/service/impl/OpenApiTradeOrderProfitSharingServiceImpl.java +++ b/service/src/main/java/com/hfkj/openapi/v1/service/impl/OpenApiTradeOrderProfitSharingServiceImpl.java @@ -72,8 +72,17 @@ public class OpenApiTradeOrderProfitSharingServiceImpl implements OpenApiTradeOr if (tradeOrder.getProfitSharingStatus().equals(false)) { throw ErrorHelp.genException(SysCode.OpenApi, ErrorCode.OPEN_API_COMMON, "交易订单不支持分账"); } + // 商户 + BsMer mer = merService.getMer(tradeOrder.getMerId()); + if (mer == null) { + throw ErrorHelp.genException(SysCode.OpenApi, ErrorCode.OPEN_API_COMMON, "未知的商户"); + } BsTradeOrderProfitSharing tradeOrderProfitSharing = new BsTradeOrderProfitSharing(); tradeOrderProfitSharing.setCmdType(ProfitSharingCmdTypeEnum.CMD_TYPE_1.getNumber()); + tradeOrderProfitSharing.setMerId(mer.getId()); + tradeOrderProfitSharing.setMerNo(mer.getMerNo()); + tradeOrderProfitSharing.setMerName(mer.getMerName()); + tradeOrderProfitSharing.setMerAbbreviate(mer.getMerAbbreviate()); tradeOrderProfitSharing.setTradeOrderId(tradeOrder.getId()); tradeOrderProfitSharing.setTradeOrderNo(tradeOrder.getOutTradeNo()); tradeOrderProfitSharing.setProfitSharingOrderNo(separateModel.getOutSeparateNo()); @@ -171,6 +180,15 @@ public class OpenApiTradeOrderProfitSharingServiceImpl implements OpenApiTradeOr profitSharingCmd.setCreateType(TradeOrderProfitSharingCreateType.type2.getNumber()); tradeOrderProfitSharingService.editData(profitSharingCmd); + // 接收方 + List receiverList = tradeOrderProfitSharingReceiverService.getReceiverListByProfitSharingId(originOutSeparate.getId()); + for (BsTradeOrderProfitSharingReceiver receiver : receiverList) { + receiver.setId(null); + receiver.setTradeOrderProfitSharingId(profitSharingCmd.getId()); + receiver.setCreateTime(new Date()); + tradeOrderProfitSharingReceiverService.editData(receiver); + } + // 调用第三方 JSONObject responseCancel = laKaLaTradeSeparateService.cancel(separateCancelModel.getOutSeparateNo()); diff --git a/service/src/main/java/com/hfkj/service/BsTradeOrderProfitSharingReceiverService.java b/service/src/main/java/com/hfkj/service/BsTradeOrderProfitSharingReceiverService.java index 46f74c2..c4d2472 100644 --- a/service/src/main/java/com/hfkj/service/BsTradeOrderProfitSharingReceiverService.java +++ b/service/src/main/java/com/hfkj/service/BsTradeOrderProfitSharingReceiverService.java @@ -2,7 +2,9 @@ package com.hfkj.service; import com.hfkj.entity.BsTradeOrderProfitSharing; import com.hfkj.entity.BsTradeOrderProfitSharingReceiver; +import com.hfkj.model.TradeProfitSharingDetailModel; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -33,4 +35,11 @@ public interface BsTradeOrderProfitSharingReceiverService { */ List getProfitSharingList(Map param); + /** + * 获取分账接收方列表 + * @param param + * @return + */ + List getReceiverList(Map param); + } diff --git a/service/src/main/java/com/hfkj/service/BsTradeOrderProfitSharingService.java b/service/src/main/java/com/hfkj/service/BsTradeOrderProfitSharingService.java index 60fba18..6238fb3 100644 --- a/service/src/main/java/com/hfkj/service/BsTradeOrderProfitSharingService.java +++ b/service/src/main/java/com/hfkj/service/BsTradeOrderProfitSharingService.java @@ -5,6 +5,7 @@ import com.hfkj.entity.BsTradeOrderProfitSharing; import com.hfkj.sysenum.ProfitSharingCmdTypeEnum; import java.util.List; +import java.util.Map; /** * 交易订单分账记录 @@ -41,6 +42,13 @@ public interface BsTradeOrderProfitSharingService { */ BsTradeOrderProfitSharing getDetailByProfitSharingOrderNo(String profitSharingOrderNo); + /** + * 查询列表 + * @param param + * @return + */ + List getList(Map param); + /** * 获取需要分账的订单 * @return diff --git a/service/src/main/java/com/hfkj/service/impl/BsTradeOrderProfitSharingReceiverServiceImpl.java b/service/src/main/java/com/hfkj/service/impl/BsTradeOrderProfitSharingReceiverServiceImpl.java index d09c233..ba3d734 100644 --- a/service/src/main/java/com/hfkj/service/impl/BsTradeOrderProfitSharingReceiverServiceImpl.java +++ b/service/src/main/java/com/hfkj/service/impl/BsTradeOrderProfitSharingReceiverServiceImpl.java @@ -1,17 +1,20 @@ package com.hfkj.service.impl; +import com.hfkj.common.utils.DateUtil; import com.hfkj.dao.BsTradeOrderProfitSharingMapper; import com.hfkj.dao.BsTradeOrderProfitSharingReceiverMapper; import com.hfkj.entity.BsTradeOrderProfitSharing; import com.hfkj.entity.BsTradeOrderProfitSharingExample; import com.hfkj.entity.BsTradeOrderProfitSharingReceiver; import com.hfkj.entity.BsTradeOrderProfitSharingReceiverExample; +import com.hfkj.model.TradeProfitSharingDetailModel; import com.hfkj.service.BsTradeOrderProfitSharingReceiverService; import org.apache.commons.collections4.MapUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -59,4 +62,15 @@ public class BsTradeOrderProfitSharingReceiverServiceImpl implements BsTradeOrde return tradeOrderProfitSharingReceiverMapper.selectByExample(example); } + + @Override + public List getReceiverList(Map param) { + if (MapUtils.getLong(param, "createTimeS") != null) { + param.put("createTimeS", DateUtil.date2String(new Date(MapUtils.getLong(param, "createTimeS")), DateUtil.Y_M_D_HMS)); + } + if (MapUtils.getLong(param, "createTimeE") != null) { + param.put("createTimeE", DateUtil.date2String(new Date(MapUtils.getLong(param, "createTimeE")), DateUtil.Y_M_D_HMS)); + } + return tradeOrderProfitSharingReceiverMapper.queryReceiverList(param); + } } diff --git a/service/src/main/java/com/hfkj/service/impl/BsTradeOrderProfitSharingServiceImpl.java b/service/src/main/java/com/hfkj/service/impl/BsTradeOrderProfitSharingServiceImpl.java index df64313..ec71053 100644 --- a/service/src/main/java/com/hfkj/service/impl/BsTradeOrderProfitSharingServiceImpl.java +++ b/service/src/main/java/com/hfkj/service/impl/BsTradeOrderProfitSharingServiceImpl.java @@ -9,6 +9,8 @@ import com.hfkj.dao.BsTradeOrderProfitSharingMapper; import com.hfkj.entity.*; import com.hfkj.service.*; import com.hfkj.sysenum.*; +import org.apache.commons.collections4.MapUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; @@ -17,6 +19,7 @@ import javax.annotation.Resource; import java.math.BigDecimal; import java.util.Date; import java.util.List; +import java.util.Map; /** * @className: BsTradeOrderProfitSharingServiceImpl @@ -413,6 +416,51 @@ public class BsTradeOrderProfitSharingServiceImpl implements BsTradeOrderProfitS return null; } + @Override + public List getList(Map param) { + BsTradeOrderProfitSharingExample example = new BsTradeOrderProfitSharingExample(); + BsTradeOrderProfitSharingExample.Criteria criteria = example.createCriteria(); + + if (MapUtils.getLong(param, "merId") != null) { + criteria.andMerIdEqualTo(MapUtils.getLong(param, "merId")); + } + + if (MapUtils.getInteger(param, "cmdType") != null) { + criteria.andCmdTypeEqualTo(MapUtils.getInteger(param, "cmdType")); + } + + if (MapUtils.getInteger(param, "status") != null) { + criteria.andStatusEqualTo(MapUtils.getInteger(param, "status")); + } + + if (StringUtils.isNotBlank(MapUtils.getString(param, "merNo"))) { + criteria.andMerNoEqualTo(MapUtils.getString(param, "merNo")); + } + + if (StringUtils.isNotBlank(MapUtils.getString(param, "profitSharingOrderNo"))) { + criteria.andProfitSharingOrderNoLike("%"+MapUtils.getString(param, "profitSharingOrderNo")+"%"); + } + + if (StringUtils.isNotBlank(MapUtils.getString(param, "platformTradeNo"))) { + criteria.andPlatformTradeNoLike("%"+MapUtils.getString(param, "platformTradeNo")+"%"); + } + + if (StringUtils.isNotBlank(MapUtils.getString(param, "platformProfitSharingOrderNo"))) { + criteria.andPlatformProfitSharingOrderNoLike("%"+MapUtils.getString(param, "platformProfitSharingOrderNo")+"%"); + } + + if (MapUtils.getLong(param, "createTimeS") != null) { + criteria.andCreateTimeGreaterThanOrEqualTo(new Date(MapUtils.getLong(param, "createTimeS"))); + } + + if (MapUtils.getLong(param, "createTimeE") != null) { + criteria.andCreateTimeLessThanOrEqualTo(new Date(MapUtils.getLong(param, "createTimeE"))); + } + + example.setOrderByClause("create_time desc"); + return tradeOrderProfitSharingMapper.selectByExample(example); + } + @Override public List getNeedProfitSharingOrder() { return tradeOrderProfitSharingMapper.getNeedProfitSharingOrder(); diff --git a/service/src/main/java/com/hfkj/service/impl/BsTransferAccountsServiceImpl.java b/service/src/main/java/com/hfkj/service/impl/BsTransferAccountsServiceImpl.java index 7d6d271..a646c11 100644 --- a/service/src/main/java/com/hfkj/service/impl/BsTransferAccountsServiceImpl.java +++ b/service/src/main/java/com/hfkj/service/impl/BsTransferAccountsServiceImpl.java @@ -129,10 +129,10 @@ public class BsTransferAccountsServiceImpl implements BsTransferAccountsService @Override public List getList(Map param) { BsTransferAccountsExample example = new BsTransferAccountsExample(); - example.createCriteria().andStatusNotEqualTo(TransferAccountsStatus.status0.getNumber()); + BsTransferAccountsExample.Criteria criteria = example.createCriteria().andStatusNotEqualTo(TransferAccountsStatus.status0.getNumber()); if (MapUtils.getInteger(param, "status") != null) { - example.createCriteria().andStatusEqualTo(MapUtils.getInteger(param, "status")); + criteria.andStatusEqualTo(MapUtils.getInteger(param, "status")); } example.setOrderByClause("create_time desc"); diff --git a/service/src/main/java/com/hfkj/sysenum/ProfitSharingStatusEnum.java b/service/src/main/java/com/hfkj/sysenum/ProfitSharingStatusEnum.java index 7dc66cb..18e89a7 100644 --- a/service/src/main/java/com/hfkj/sysenum/ProfitSharingStatusEnum.java +++ b/service/src/main/java/com/hfkj/sysenum/ProfitSharingStatusEnum.java @@ -9,7 +9,7 @@ import java.util.Objects; **/ public enum ProfitSharingStatusEnum { status0(0, "待处理"), - status1(1, "已完成"), + status1(1, "成功"), status2(2, "处理中"), status3(3, "已受理"), status4(4, "失败"),