Compare commits

...

5 Commits

  1. 1
      bweb/src/main/java/com/bweb/config/AuthConfig.java
  2. 105
      bweb/src/main/java/com/bweb/controller/BsTradeCountController.java
  3. 104
      bweb/src/main/java/com/bweb/controller/BsTradeOrderController.java
  4. 323
      bweb/src/main/java/com/bweb/controller/BsTradeOrderProfitSharingController.java
  5. 2
      bweb/src/main/resources/dev/application.yml
  6. 4
      cweb/src/main/java/com/cweb/controller/BsCompanyController.java
  7. 4
      cweb/src/main/java/com/cweb/controller/BsMerController.java
  8. 4
      cweb/src/main/java/com/cweb/controller/BsStoreController.java
  9. 4
      cweb/src/main/java/com/cweb/controller/BsTradeOrderController.java
  10. 10
      cweb/src/main/java/com/cweb/controller/TestController.java
  11. 2
      cweb/src/main/resources/dev/application.yml
  12. 20
      open-api/src/main/java/com/api/controller/v1/TradeProfitSharingController.java
  13. 6
      schedule/src/main/java/com/hfkj/schedule/TradeOrderSchedule.java
  14. 2
      schedule/src/main/java/com/hfkj/schedule/TransferSchedule.java
  15. 26
      service/src/main/java/com/hfkj/channel/lakala/LaKaLaLedgerService.java
  16. 30
      service/src/main/java/com/hfkj/channel/lakala/LaKaLaTradeSeparateService.java
  17. 3
      service/src/main/java/com/hfkj/channel/tianque/service/TianQueFundManageService.java
  18. 4
      service/src/main/java/com/hfkj/dao/BsMerMapper.java
  19. 13
      service/src/main/java/com/hfkj/dao/BsTradeOrderMapperExt.java
  20. 29
      service/src/main/java/com/hfkj/dao/BsTradeOrderProfitSharingMapper.java
  21. 37
      service/src/main/java/com/hfkj/dao/BsTradeOrderProfitSharingReceiverMapperExt.java
  22. 56
      service/src/main/java/com/hfkj/dao/BsTradeOrderProfitSharingSqlProvider.java
  23. 9
      service/src/main/java/com/hfkj/dao/BsTradeSettleMapperExt.java
  24. 64
      service/src/main/java/com/hfkj/entity/BsTradeOrderProfitSharing.java
  25. 270
      service/src/main/java/com/hfkj/entity/BsTradeOrderProfitSharingExample.java
  26. 67
      service/src/main/java/com/hfkj/model/TradeProfitSharingDetailModel.java
  27. 57
      service/src/main/java/com/hfkj/model/TradeProfitSharingResultModel.java
  28. 8
      service/src/main/java/com/hfkj/openapi/v1/model/request/RequestSeparateQueryAmtModel.java
  29. 40
      service/src/main/java/com/hfkj/openapi/v1/service/impl/OpenApiTradeOrderProfitSharingServiceImpl.java
  30. 57
      service/src/main/java/com/hfkj/openapi/v1/utils/SignatureUtil.java
  31. 9
      service/src/main/java/com/hfkj/service/BsTradeOrderProfitSharingReceiverService.java
  32. 8
      service/src/main/java/com/hfkj/service/BsTradeOrderProfitSharingService.java
  33. 2
      service/src/main/java/com/hfkj/service/BsTradeOrderRefundService.java
  34. 14
      service/src/main/java/com/hfkj/service/impl/BsTradeOrderProfitSharingReceiverServiceImpl.java
  35. 48
      service/src/main/java/com/hfkj/service/impl/BsTradeOrderProfitSharingServiceImpl.java
  36. 9
      service/src/main/java/com/hfkj/service/impl/BsTradeOrderRefundServiceImpl.java
  37. 11
      service/src/main/java/com/hfkj/service/impl/BsTradeOrderServiceImpl.java
  38. 4
      service/src/main/java/com/hfkj/service/impl/BsTransferAccountsServiceImpl.java
  39. 2
      service/src/main/java/com/hfkj/sysenum/ProfitSharingStatusEnum.java

@ -93,6 +93,7 @@ public class AuthConfig implements WebMvcConfigurer {
.excludePathPatterns("/login/logout")
.excludePathPatterns("/common/*")
.excludePathPatterns("/sms/*")
.excludePathPatterns("/tradeCount/*")
.excludePathPatterns("/coupon/getGuizhouSinopec")
.excludePathPatterns("/cmsContent/get*")
.excludePathPatterns("/highGoldRec/*")

@ -0,0 +1,105 @@
package com.bweb.controller;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.hfkj.common.utils.DateUtil;
import com.hfkj.common.utils.ResponseMsgUtil;
import com.hfkj.entity.BsTradeOrder;
import com.hfkj.model.ResponseData;
import com.hfkj.model.UserInfoModel;
import com.hfkj.service.BsTradeOrderService;
import com.hfkj.sysenum.SecUserTypeEnum;
import com.hfkj.sysenum.TradeOrderStatusEnum;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
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.time.*;
import java.util.Date;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
/**
* @className: BsTradeCountController
* @author: HuRui
* @date: 2025/7/15
**/
@Controller
@Api(value = "交易订单")
@RequestMapping(value = "/tradeCount")
public class BsTradeCountController {
private static Logger log = LoggerFactory.getLogger(BsTradeOrderController.class);
@Resource
private BsTradeOrderService tradeOrderService;
@RequestMapping(value="/home",method = RequestMethod.GET)
@ResponseBody
@ApiOperation(value = "首页统计")
public ResponseData home() {
try {
Map<String,Object> param = new LinkedHashMap<>();
Map<String,Object> dataMap = new LinkedHashMap<>();
// 今日数据
param.put("createTimeS", LocalDateTime.of(LocalDate.now(), LocalTime.MIN).atZone(ZoneId.systemDefault()).toInstant().toEpochMilli());
param.put("createTimeE", LocalDateTime.of(LocalDate.now(), LocalTime.MAX).atZone(ZoneId.systemDefault()).toInstant().toEpochMilli());
param.put("status", TradeOrderStatusEnum.status3.getNumber());
dataMap.put("today", tradeOrderService.countTradeOrderPrice(param));
// 月数据
param.clear();
// 本月数据
param.put("createTimeS", LocalDateTime.of(LocalDate.now().withDayOfMonth(1), LocalTime.MIN).atZone(ZoneId.systemDefault()).toInstant().toEpochMilli());
param.put("createTimeE", LocalDateTime.of(LocalDate.now().withDayOfMonth(LocalDate.now().lengthOfMonth()), LocalTime.MAX).atZone(ZoneId.systemDefault()).toInstant().toEpochMilli());
param.put("status", TradeOrderStatusEnum.status3.getNumber());
dataMap.put("thisMonth", tradeOrderService.countTradeOrderPrice(param));
// 去年同月数据
param.put("createTimeS", DateUtil.format(YearMonth.now().minusYears(1).atDay(1)+" 23:59:59","yyyy-MM-dd HH:mm:ss").getTime());
param.put("createTimeE", DateUtil.format(YearMonth.now().minusYears(1).atEndOfMonth()+" 23:59:59","yyyy-MM-dd HH:mm:ss").getTime());
param.put("status", TradeOrderStatusEnum.status3.getNumber());
dataMap.put("lastMonth", tradeOrderService.countTradeOrderPrice(param));
// 年数据
param.clear();
// 今年数据
param.put("createTimeS", DateUtil.format(Year.now().atDay(1)+" 00:00:00","yyyy-MM-dd HH:mm:ss").getTime());
param.put("createTimeE", DateUtil.format(Year.now().atDay(Year.now().length())+" 23:59:59","yyyy-MM-dd HH:mm:ss").getTime());
param.put("status", TradeOrderStatusEnum.status3.getNumber());
dataMap.put("thisYear", tradeOrderService.countTradeOrderPrice(param));
// 去年数据
param.put("createTimeS", DateUtil.format(Year.now().minusYears(1).atDay(1)+" 00:00:00","yyyy-MM-dd HH:mm:ss").getTime());
param.put("createTimeE", DateUtil.format(Year.now().minusYears(1).atDay(Year.now().length())+" 23:59:59","yyyy-MM-dd HH:mm:ss").getTime());
param.put("status", TradeOrderStatusEnum.status3.getNumber());
dataMap.put("lastYear", tradeOrderService.countTradeOrderPrice(param));
return ResponseMsgUtil.success(dataMap);
} catch (Exception e) {
log.error(e.getMessage(), e);
return ResponseMsgUtil.exception(e);
}
}
public static void main(String[] args) {
System.out.println("今年第一天: " + DateUtil.date2String(new Date(DateUtil.format(Year.now().minusYears(1).atDay(1)+" 00:00:00","yyyy-MM-dd HH:mm:ss").getTime()),DateUtil.Y_M_D_HMS));
System.out.println("今年第一天: " + DateUtil.date2String(new Date(DateUtil.format(Year.now().minusYears(1).atDay(Year.now().length())+" 23:59:59","yyyy-MM-dd HH:mm:ss").getTime()),DateUtil.Y_M_D_HMS));
System.out.println(": " + DateUtil.date2String(new Date(DateUtil.format(YearMonth.now().minusYears(1).atDay(1)+" 23:59:59","yyyy-MM-dd HH:mm:ss").getTime()),DateUtil.Y_M_D_HMS));
System.out.println(": " + DateUtil.date2String(new Date(DateUtil.format(YearMonth.now().minusYears(1).atEndOfMonth()+" 23:59:59","yyyy-MM-dd HH:mm:ss").getTime()),DateUtil.Y_M_D_HMS));
System.out.println(": " + DateUtil.date2String(new Date(DateUtil.format(Year.now().minusYears(1).atDay(Year.now().length())+" 23:59:59","yyyy-MM-dd HH:mm:ss").getTime()),DateUtil.Y_M_D_HMS));
}
}

@ -34,6 +34,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@Controller
@Api(value = "交易订单")
@ -72,6 +73,8 @@ public class BsTradeOrderController {
@RequestParam(value = "payMode" , required = false) String payMode,
@RequestParam(value = "outTradeNo" , required = false) String outTradeNo,
@RequestParam(value = "accTradeNo" , required = false) String accTradeNo,
@RequestParam(value = "createTimeS" , required = false) Long createTimeS,
@RequestParam(value = "createTimeE" , required = false) Long createTimeE,
@RequestParam(value = "payTimeS" , required = false) Long payTimeS,
@RequestParam(value = "payTimeE" , required = false) Long payTimeE,
@RequestParam(value = "status" , required = false) Integer status,
@ -135,6 +138,8 @@ public class BsTradeOrderController {
param.put("accTradeNo", accTradeNo);
param.put("payTimeS", payTimeS);
param.put("payTimeE", payTimeE);
param.put("createTimeS", createTimeS);
param.put("createTimeE", createTimeE);
param.put("status", status);
param.put("specialField", specialField);
@ -147,6 +152,101 @@ public class BsTradeOrderController {
}
}
@RequestMapping(value="/countOrderData",method = RequestMethod.GET)
@ResponseBody
@ApiOperation(value = "查询订单列表")
public ResponseData countOrderData(@RequestParam(value = "salesmanId" , required = false) Long salesmanId,
@RequestParam(value = "merId" , required = false) Long merId,
@RequestParam(value = "merNo" , required = false) String merNo,
@RequestParam(value = "merName" , required = false) String merName,
@RequestParam(value = "merAbbreviate" , required = false) String merAbbreviate,
@RequestParam(value = "companyId" , required = false) Long companyId,
@RequestParam(value = "agentId" , required = false) Long agentId,
@RequestParam(value = "storeId" , required = false) Long storeId,
@RequestParam(value = "storeName" , required = false) String storeName,
@RequestParam(value = "payMode" , required = false) String payMode,
@RequestParam(value = "outTradeNo" , required = false) String outTradeNo,
@RequestParam(value = "accTradeNo" , required = false) String accTradeNo,
@RequestParam(value = "createTimeS" , required = false) Long createTimeS,
@RequestParam(value = "createTimeE" , required = false) Long createTimeE,
@RequestParam(value = "payTimeS" , required = false) Long payTimeS,
@RequestParam(value = "payTimeE" , required = false) Long payTimeE,
@RequestParam(value = "status" , required = false) Integer status,
@RequestParam(value = "specialField" , required = false) String specialField) {
try {
Map<String, Object> param = new HashMap<>();
UserInfoModel userModel = userCenter.getSessionModel(UserInfoModel.class);
if (userModel.getSecUser().getObjectType().equals(SecUserTypeEnum.type0.getNumber())) {
param.put("companyId", companyId);
param.put("agentId", agentId);
param.put("salesmanId", salesmanId);
param.put("merId", merId);
param.put("merName", merName);
param.put("merAbbreviate", merAbbreviate);
param.put("merNo", merNo);
param.put("storeId", storeId);
param.put("storeName", storeName);
} else if (userModel.getSecUser().getObjectType().equals(SecUserTypeEnum.type1.getNumber())) {
param.put("companyId", userModel.getBsCompany().getId()>2?userModel.getBsCompany().getId():null);
param.put("agentId", agentId);
param.put("salesmanId", salesmanId);
param.put("merId", merId);
param.put("merName", merName);
param.put("merAbbreviate", merAbbreviate);
param.put("merNo", merNo);
param.put("storeId", storeId);
param.put("storeName", storeName);
} else if (userModel.getSecUser().getObjectType().equals(SecUserTypeEnum.type2.getNumber())) {
param.put("agentId", userModel.getAgent().getId());
param.put("salesmanId", salesmanId);
param.put("merId", merId);
param.put("merNo", merNo);
param.put("merName", merName);
param.put("merAbbreviate", merAbbreviate);
param.put("storeId", storeId);
param.put("storeName", storeName);
} else if (userModel.getSecUser().getObjectType().equals(SecUserTypeEnum.type3.getNumber())) {
param.put("salesmanId", userModel.getSalesman().getId());
param.put("merId", merId);
param.put("merNo", merNo);
param.put("merName", merName);
param.put("merAbbreviate", merAbbreviate);
param.put("storeId", storeId);
param.put("storeName", storeName);
} else if (userModel.getSecUser().getObjectType().equals(SecUserTypeEnum.type4.getNumber())) {
param.put("merId", userModel.getMer().getId());
param.put("storeId", storeId);
param.put("storeName", storeName);
} else if (userModel.getSecUser().getObjectType().equals(SecUserTypeEnum.type5.getNumber())) {
param.put("storeId", userModel.getStore().getId());
}
param.put("payMode", payMode);
param.put("outTradeNo", outTradeNo);
param.put("accTradeNo", accTradeNo);
param.put("payTimeS", payTimeS);
param.put("payTimeE", payTimeE);
param.put("createTimeS", createTimeS);
param.put("createTimeE", createTimeE);
param.put("status", status);
param.put("specialField", specialField);
Map<String, Object> countData = tradeOrderService.countTradeOrderPrice(param);
Map<String,Object> map = new HashMap<>();
map.put("totalCount", countData.get("count"));
map.put("totalPrice", countData.get("tradePrice"));
return ResponseMsgUtil.success(map);
} catch (Exception e) {
log.error(e.getMessage(), e);
return ResponseMsgUtil.exception(e);
}
}
@RequestMapping(value="/exportTradeOrder",method = RequestMethod.GET)
@ResponseBody
@ApiOperation(value = "导出交易订单")
@ -162,6 +262,8 @@ public class BsTradeOrderController {
@RequestParam(value = "payMode" , required = false) String payMode,
@RequestParam(value = "outTradeNo" , required = false) String outTradeNo,
@RequestParam(value = "accTradeNo" , required = false) String accTradeNo,
@RequestParam(value = "createTimeS" , required = false) Long createTimeS,
@RequestParam(value = "createTimeE" , required = false) Long createTimeE,
@RequestParam(value = "payTimeS" , required = false) Long payTimeS,
@RequestParam(value = "payTimeE" , required = false) Long payTimeE,
@RequestParam(value = "status" , required = false) Integer status,
@ -222,6 +324,8 @@ public class BsTradeOrderController {
param.put("payMode", payMode);
param.put("outTradeNo", outTradeNo);
param.put("accTradeNo", accTradeNo);
param.put("createTimeS", createTimeS);
param.put("createTimeE", createTimeE);
param.put("payTimeS", payTimeS);
param.put("payTimeE", payTimeE);
param.put("status", status);

@ -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<String, Object> 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<String, Object> 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<BsTradeOrderProfitSharing> dataList = tradeOrderProfitSharingService.getList(param);
List<TradeProfitSharingResultModel> 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<String, Object> 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<String, Object> 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<TradeProfitSharingDetailModel> 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<String,Object> 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);
}
}
}

@ -9,7 +9,7 @@ debug: false
#datasource数据源设置
spring:
datasource:
url: jdbc:mysql://139.9.154.68:3306/gratia_pay?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false
url: jdbc:mysql://139.9.154.68:3306/gratia_pay_prod?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false
username: root
password: HF123456.
type: com.alibaba.druid.pool.DruidDataSource

@ -63,14 +63,14 @@ public class BsCompanyController {
payTimeS.set(Calendar.HOUR_OF_DAY, 00);
payTimeS.set(Calendar.MINUTE, 00);
payTimeS.set(Calendar.SECOND, 00);
param.put("payTimeS", payTimeS.getTime());
param.put("createTimeS", payTimeS.getTime());
Calendar payTimeE = Calendar.getInstance();
payTimeE.setTime(new Date());
payTimeE.set(Calendar.HOUR_OF_DAY, 23);
payTimeE.set(Calendar.MINUTE, 59);
payTimeE.set(Calendar.SECOND, 59);
param.put("payTimeE", payTimeE.getTime());
param.put("createTimeE", payTimeE.getTime());
// 今日交易额
Map<String, Object> today = new HashMap<>();

@ -96,14 +96,14 @@ public class BsMerController {
payTimeS.set(Calendar.HOUR_OF_DAY, 00);
payTimeS.set(Calendar.MINUTE, 00);
payTimeS.set(Calendar.SECOND, 00);
param.put("payTimeS", DateUtil.format(payTimeS.getTime(), "yyyy-MM-dd HH:mm:ss"));
param.put("createTimeS", DateUtil.format(payTimeS.getTime(), "yyyy-MM-dd HH:mm:ss"));
Calendar payTimeE = Calendar.getInstance();
payTimeE.setTime(new Date());
payTimeE.set(Calendar.HOUR_OF_DAY, 23);
payTimeE.set(Calendar.MINUTE, 59);
payTimeE.set(Calendar.SECOND, 59);
param.put("payTimeE", DateUtil.format(payTimeE.getTime(), "yyyy-MM-dd HH:mm:ss"));
param.put("createTimeE", DateUtil.format(payTimeE.getTime(), "yyyy-MM-dd HH:mm:ss"));
param.put("storeId", storeStr);

@ -72,14 +72,14 @@ public class BsStoreController {
payTimeS.set(Calendar.HOUR_OF_DAY, 00);
payTimeS.set(Calendar.MINUTE, 00);
payTimeS.set(Calendar.SECOND, 00);
param.put("payTimeS", DateUtil.format(payTimeS.getTime(), "yyyy-MM-dd HH:mm:ss"));
param.put("createTimeS", DateUtil.format(payTimeS.getTime(), "yyyy-MM-dd HH:mm:ss"));
Calendar payTimeE = Calendar.getInstance();
payTimeE.setTime(new Date());
payTimeE.set(Calendar.HOUR_OF_DAY, 23);
payTimeE.set(Calendar.MINUTE, 59);
payTimeE.set(Calendar.SECOND, 59);
param.put("payTimeE", DateUtil.format(payTimeE.getTime(), "yyyy-MM-dd HH:mm:ss"));
param.put("createTimeE", DateUtil.format(payTimeE.getTime(), "yyyy-MM-dd HH:mm:ss"));
param.put("storeId", userModel.getStore().getId());
// 今日交易额

@ -466,6 +466,8 @@ public class BsTradeOrderController {
@RequestParam(value = "payMode" , required = false) String payMode,
@RequestParam(value = "outTradeNo" , required = false) String outTradeNo,
@RequestParam(value = "accTradeNo" , required = false) String accTradeNo,
@RequestParam(value = "createTimeS" , required = false) Long createTimeS,
@RequestParam(value = "createTimeE" , required = false) Long createTimeE,
@RequestParam(value = "payTimeS" , required = false) Long payTimeS,
@RequestParam(value = "payTimeE" , required = false) Long payTimeE,
@RequestParam(value = "status" , required = false) Integer status,
@ -505,6 +507,8 @@ public class BsTradeOrderController {
param.put("payMode", payMode);
param.put("outTradeNo", outTradeNo);
param.put("accTradeNo", accTradeNo);
param.put("createTimeS", createTimeS);
param.put("createTimeE", createTimeE);
param.put("payTimeS", payTimeS);
param.put("payTimeE", payTimeE);
param.put("status", status);

@ -3,10 +3,7 @@ package com.cweb.controller;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.hfkj.channel.alipay.utils.AlipayRequest;
import com.hfkj.channel.lakala.LaKaLaLedgerService;
import com.hfkj.channel.lakala.LaKaLaTradeMergeService;
import com.hfkj.channel.lakala.LaKaLaTradeService;
import com.hfkj.channel.lakala.LaKaLaWalletService;
import com.hfkj.channel.lakala.*;
import com.hfkj.channel.lakala.config.LaKaLaConfig;
import com.hfkj.channel.llg.service.LLGMerService;
import com.hfkj.channel.llg.service.LLGOrderService;
@ -890,6 +887,8 @@ public class TestController {
return ResponseMsgUtil.exception(e);
}
}
@Resource
private LaKaLaTradeSeparateService laKaLaTradeSeparateService;
@RequestMapping(value="/preorder",method = RequestMethod.GET)
@ResponseBody
@ -897,7 +896,8 @@ public class TestController {
public ResponseData preorder(@RequestParam(name = "tradeNo", required = true) String tradeNo) {
try {
return ResponseMsgUtil.success(laKaLaTradeService.preorder(tradeNo));
//return ResponseMsgUtil.success(laKaLaTradeSeparateService.query(tradeNo));
return ResponseMsgUtil.success(laKaLaLedgerService.queryReceiverDetail());
} catch (Exception e) {
log.error(e.getMessage(), e);

@ -9,7 +9,7 @@ debug: false
#datasource数据源设置
spring:
datasource:
url: jdbc:mysql://139.9.154.68:3306/gratia_pay?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false
url: jdbc:mysql://139.9.154.68:3306/gratia_pay_prod?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false
username: root
password: HF123456.
type: com.alibaba.druid.pool.DruidDataSource

@ -98,10 +98,10 @@ public class TradeProfitSharingController {
throw ErrorHelp.genException(SysCode.OpenApi, ErrorCode.OPEN_API_COMMON, "商户分账权限未开通");
}
for (RequestSeparateModel.RequestSeparateRecvDataModel recvData : body.getRecvDatas()) {
// 校验接收方
/*// 校验接收方
if (recvData.getRecvMerchantNo().equals(body.getMerchantNo())) {
throw ErrorHelp.genException(SysCode.OpenApi, ErrorCode.OPEN_API_COMMON, "接收方不能与分账方主体相同");
}
}*/
// 查询接收方信息
BsMer recvMer = merService.getMer(recvData.getRecvMerchantNo());
if (recvMer == null) {
@ -110,13 +110,15 @@ public class TradeProfitSharingController {
if (!recvMer.getMerStatus().equals(MerStatusEnum.status1.getNumber())) {
throw ErrorHelp.genException(SysCode.OpenApi, ErrorCode.OPEN_API_COMMON, "接收方状态异常");
}
// 接收方分账信息
BsMerLedger ledger = merLedgerService.getMerLedger(recvMer.getId(), PlatformTypeEnum.getDataByNumber(tradeOrder.getPlatformType()));
if (ledger == null) {
throw ErrorHelp.genException(SysCode.OpenApi, ErrorCode.OPEN_API_COMMON, "接收方状态异常");
}
if (StringUtils.isBlank(ledger.getReceiverNo())) {
throw ErrorHelp.genException(SysCode.OpenApi, ErrorCode.OPEN_API_COMMON, "接收方状态异常");
if (!recvMer.getMerNo().equals(tradeOrder.getMerNo())) {
// 接收方分账信息
BsMerLedger ledger = merLedgerService.getMerLedger(recvMer.getId(), PlatformTypeEnum.getDataByNumber(tradeOrder.getPlatformType()));
if (ledger == null) {
throw ErrorHelp.genException(SysCode.OpenApi, ErrorCode.OPEN_API_COMMON, "接收方状态异常");
}
if (StringUtils.isBlank(ledger.getReceiverNo())) {
throw ErrorHelp.genException(SysCode.OpenApi, ErrorCode.OPEN_API_COMMON, "接收方状态异常");
}
}
}

@ -289,8 +289,8 @@ public class TradeOrderSchedule {
* 完结分账
* 每分钟扫描一次需要完结的订单
*/
@Scheduled(cron="0 0/1 * * * ?")
public void profitSharingFinish() {
/* @Scheduled(cron="0 0/1 * * * ?")*/
/* public void profitSharingFinish() {
List<BsTradeOrderProfitSharing> tradeOrderProfitSharingList = tradeOrderProfitSharingService.getNeedFinishProfitSharingOrder();
for (BsTradeOrderProfitSharing tradeOrderProfitSharing : tradeOrderProfitSharingList) {
try {
@ -328,7 +328,7 @@ public class TradeOrderSchedule {
tradeOrderProfitSharingService.editData(tradeOrderProfitSharing);
}
}
}
}*/
/**
* 交易结算

@ -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")));
}

@ -594,4 +594,30 @@ public class LaKaLaLedgerService {
merLedgerReceiverApplyService.editReceiverApply(ledgerReceiverApply);
}
/**
* 分账关系解绑申请
*/
public JSONObject queryReceiverDetail() {
Map<String, Object> commonParam = new HashMap<>();
commonParam.put("reqTime", DateUtil.format(new Date(), "yyyyMMddHHmmss"));
commonParam.put("version", "1.0.0");
commonParam.put("reqId", UnionUtils.createNonceStr());
Map<String, Object> map = new HashMap<>();
map.put("version", "1.0");
map.put("orderNo", System.currentTimeMillis()+"");
map.put("orgCode", "965644");
map.put("receiverNo", "SR2023091917041");
commonParam.put("reqData", map);
Map<String, Object> reqParam = LaKaLaConfig.generateSignParamsV2(JSONObject.parseObject(JSONObject.toJSONString(commonParam)));
// 头部参数
Map<String, Object> heard = new HashMap<>();
heard.put("Authorization", reqParam.get("Authorization"));
JSONObject responseBody = HttpsUtils.doPost(CommonSysConst.getSysConfig().getLkl_request_url() + "/api/v2/mms/openApi/ledger/queryReceiverDetail", commonParam, heard);
return responseBody;
}
}

@ -89,7 +89,11 @@ public class LaKaLaTradeSeparateService {
for (BsTradeOrderProfitSharingReceiver receiver : profitSharingReceiverList) {
if (receiver.getReceiverAmount().compareTo(new BigDecimal("0")) != 0) {
recvDatasMap = new HashMap<>();
recvDatasMap.put("recv_no", receiver.getReceiverAccount());
if (receiver.getReceiverNo().equals(tradeOrder.getMerNo())) {
recvDatasMap.put("recv_merchant_no", receiver.getReceiverAccount());
} else {
recvDatasMap.put("recv_no", receiver.getReceiverAccount());
}
recvDatasMap.put("separate_value", receiver.getReceiverAmount().multiply(new BigDecimal("100")).longValue());
recvDatasMapList.add(recvDatasMap);
}
@ -142,21 +146,21 @@ public class LaKaLaTradeSeparateService {
return tradeOrderProfitSharing;
}
public JSONObject queryAmt(String profitSharingOrderNo) {
// 交易订单分账
BsTradeOrderProfitSharing tradeOrderProfitSharing = tradeOrderProfitSharingService.getDetailByProfitSharingOrderNo(profitSharingOrderNo);
if (null == tradeOrderProfitSharing) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "未找到交易分账记录");
}
/**
* 查询可分账金额
* @param outTradeNo
* @return
*/
public JSONObject queryAmt(String outTradeNo) {
// 查询交易详情
BsTradeOrder tradeOrder = tradeOrderService.getOrderByOutTradeNo(tradeOrderProfitSharing.getTradeOrderNo());
BsTradeOrder tradeOrder = tradeOrderService.getOrderByOutTradeNo(outTradeNo);
Map<String, Object> commonParam = new HashMap<>();
commonParam.put("req_time", DateUtil.format(new Date(), "yyyyMMddHHmmss"));
commonParam.put("version", "3.0");
Map<String, Object> map = new HashMap<>();
map.put("merchant_no", tradeOrderProfitSharing.getPlatformMerNo());
map.put("merchant_no", tradeOrder.getPlatformMerNo());
map.put("log_no", tradeOrder.getPlatformLogNo());
map.put("log_date", DateUtil.date2String(tradeOrder.getPayTime(), "yyyyMMdd"));
commonParam.put("req_data", map);
@ -172,8 +176,6 @@ public class LaKaLaTradeSeparateService {
if (!responseBody.getString("code").equals("SACS0000")) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, responseBody.getString("msg"));
}
tradeOrderProfitSharing.setStatus(ProfitSharingStatusEnum.status2.getNumber());
tradeOrderProfitSharingService.editData(tradeOrderProfitSharing);
return responseBody.getJSONObject("resp_data");
}
@ -275,19 +277,21 @@ public class LaKaLaTradeSeparateService {
*/
public JSONObject query(String profitSharingOrderNo) {
log.info("========= Start 分账结果查询 Start ===========");
/*
// 交易订单分账
BsTradeOrderProfitSharing tradeOrderProfitSharing = tradeOrderProfitSharingService.getDetailByProfitSharingOrderNo(profitSharingOrderNo);
if (null == tradeOrderProfitSharing) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "未找到交易分账记录");
}
*/
Map<String, Object> commonParam = new HashMap<>();
commonParam.put("req_time", DateUtil.format(new Date(), "yyyyMMddHHmmss"));
commonParam.put("version", "3.0");
Map<String, Object> map = new HashMap<>();
map.put("merchant_no", tradeOrderProfitSharing.getPlatformMerNo());
map.put("out_separate_no", tradeOrderProfitSharing.getProfitSharingOrderNo());
map.put("merchant_no", "8226410506500HA");
map.put("out_separate_no", "L250806102141542");
commonParam.put("req_data", map);
Map<String, Object> reqParam = LaKaLaConfig.generateSignParamsV3(JSONObject.parseObject(JSONObject.toJSONString(commonParam)));

@ -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<String, Object> param = new HashMap<>();
param.put("mno", mno);
param.put("orderNo", orderNo);
JSONObject responseBody = RequestUtil.request(TianQueConfig.requestUrl + "/capital/fundManage/getTransferInfo", param);

@ -156,6 +156,8 @@ public interface BsMerMapper extends BsMerMapperExt {
"lar_id_card_period_type, lar_id_card_period_start, lar_id_card_period_end, complete_status, ",
"mer_status, period_status, create_salesman_id, create_salesman_name, create_time, ",
"update_time, ext_1, ext_2, ext_3",
"from bs_mer",
"where id = #{id,jdbcType=BIGINT}"
})
@Results({
@Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
@ -268,4 +270,4 @@ public interface BsMerMapper extends BsMerMapperExt {
"where id = #{id,jdbcType=BIGINT}"
})
int updateByPrimaryKey(BsMer record);
}
}

@ -22,11 +22,16 @@ public interface BsTradeOrderMapperExt {
" <if test='param.agentId != null'> and agent_id = #{param.agentId}</if>" +
" <if test='param.salesmanId != null'> and salesman_id = #{param.salesmanId} </if>" +
" <if test='param.merId != null'> and mer_id = #{param.merId} </if>" +
" <if test='param.merNo != null'> and mer_no like CONCAT('%', #{param.merNo} , '%') </if>" +
" <if test='param.merName != null'> and mer_name like CONCAT('%', #{param.merName} , '%') </if>" +
" <if test='param.merAbbreviate != null'> and mer_abbreviate like CONCAT('%', #{param.merAbbreviate} , '%') </if>" +
" <if test='param.storeId != null'> and store_id = #{param.storeId} </if>" +
" <if test='param.storeName != null'> and store_name CONCAT('%', #{param.storeName} , '%') </if>" +
" <if test='param.payMode != null'> and pay_mode = #{param.payMode}</if>" +
" <if test='param.outTradeNo != null'> and out_trade_no like CONCAT('%', #{param.outTradeNo} , '%')</if>" +
" <if test='param.accTradeNo != null'> and acc_trade_no = #{param.accTradeNo}</if>" +
" <if test='param.storeName != null'> and store_name like CONCAT('%', #{param.storeName} , '%') </if>" +
" <if test='param.payMode != null'> and pay_mode = #{param.payMode} </if>" +
" <if test='param.outTradeNo != null'> and out_trade_no like CONCAT('%', #{param.outTradeNo} , '%') </if>" +
" <if test='param.accTradeNo != null'> and acc_trade_no like CONCAT('%', #{param.accTradeNo} , '%') </if>" +
" <if test='param.createTimeS != null'> <![CDATA[ and create_time >= #{param.createTimeS} ]]> </if>" +
" <if test='param.createTimeE != null'> <![CDATA[ and create_time <= #{param.createTimeE} ]]> </if>" +
" <if test='param.payTimeS != null'> <![CDATA[ and pay_time >= #{param.payTimeS} ]]> </if>" +
" <if test='param.payTimeE != null'> <![CDATA[ and pay_time <= #{param.payTimeE} ]]> </if>" +
" <if test='param.status != null'> and status = #{param.status}</if>" +

@ -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},",

@ -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 {
}
@Select("<script>" +
" SELECT " +
" b.mer_no merNo, " +
" b.mer_name merName, " +
" b.trade_order_no tradeOrderNo, " +
" b.profit_sharing_order_no profitSharingOrderNo, " +
" b.platform_profit_sharing_order_no platformProfitSharingOrderNo, " +
" b.create_time createTime, " +
" b.cmd_type cmdType, " +
" a.receiver_no receiverNo, " +
" a.receiver_name receiverName, " +
" a.receiver_amount receiverAmount " +
" FROM bs_trade_order_profit_sharing_receiver a " +
" LEFT JOIN bs_trade_order_profit_sharing b on b.id = a.trade_order_profit_sharing_id " +
" where <![CDATA[ a.`status` <> 0 ]]>" +
" <if test='param.merId != null'> and b.mer_id = #{param.merId} </if>" +
" <if test='param.merNo != null'> and b.mer_no = #{param.merNo} </if>" +
" <if test='param.cmdType != null'> and b.cmd_type = #{param.cmdType} </if>" +
" <if test='param.profitSharingOrderNo != null'> and b.profit_sharing_order_no = #{param.profitSharingOrderNo} </if>" +
" <if test='param.platformProfitSharingOrderNo != null'> and b.platform_profit_sharing_order_no = #{param.platformProfitSharingOrderNo} </if>" +
" <if test='param.receiverNo != null'> and a.receiver_no = #{param.receiverNo} </if>" +
" <if test='param.createTimeS != null'> <![CDATA[ and b.create_time >= #{param.createTimeS} ]]> </if> " +
" <if test='param.createTimeE != null'> <![CDATA[ and b.create_time <= #{param.createTimeE} ]]> </if> " +
" ORDER BY b.create_time desc " +
"</script>")
List<TradeProfitSharingDetailModel> queryReceiverList(@Param("param") Map<String,Object> param);
}

@ -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}");
}

@ -83,8 +83,8 @@ public interface BsTradeSettleMapperExt {
" case when sum(shd_fee_amt) is null then 0 else sum(shd_fee_amt) end shdFeeAmount" +
" from bs_trade_settle " +
" where mer_no = #{param.merNo} and settle_date between #{param.settleTimeS} and #{param.settleTimeE} and trade_type = 1 and status = 1" +
" <if test='param.outTradeNo != null'> and out_trade_no = #{param.outTradeNo} </if>" +
" <if test='param.accTradeNo != null'> and acc_trade_no = #{param.accTradeNo} </if>" +
" <if test='param.outTradeNo != null'> and out_trade_no LIKE CONCAT('%',#{param.outTradeNo},'%') </if>" +
" <if test='param.accTradeNo != null'> and acc_trade_no LIKE CONCAT('%',#{param.accTradeNo},'%') </if>" +
" UNION" +
" select " +
" count(1) tradeNum," +
@ -92,9 +92,10 @@ public interface BsTradeSettleMapperExt {
" CONCAT('-', case when sum(settle_amount) is null then 0 else sum(settle_amount) end) settleAmount," +
" CONCAT('-', case when sum(shd_fee_amt) is null then 0 else sum(shd_fee_amt) end) shdFeeAmount" +
" from bs_trade_settle " +
" where mer_no = #{param.merNo} and settle_date between #{param.settleTimeS} and #{param.settleTimeE} and trade_type = 2 and status = 1" +
" <if test='param.outTradeNo != null'> and out_trade_no = #{param.outTradeNo} </if>" +
" <if test='param.accTradeNo != null'> and acc_trade_no = #{param.accTradeNo} </if>" +
" <if test='param.outTradeNo != null'> and out_trade_no LIKE CONCAT('%',#{param.outTradeNo},'%') </if>" +
" <if test='param.accTradeNo != null'> and acc_trade_no LIKE CONCAT('%',#{param.accTradeNo},'%') </if>" +
") a" +
" </script>"})
Map<String,Object> queryTradeSettleCount(@Param("param") Map<String, Object> param);

@ -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);

@ -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<Long> values) {
addCriterion("mer_id in", values, "merId");
return (Criteria) this;
}
public Criteria andMerIdNotIn(List<Long> 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<String> values) {
addCriterion("mer_no in", values, "merNo");
return (Criteria) this;
}
public Criteria andMerNoNotIn(List<String> 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<String> values) {
addCriterion("mer_name in", values, "merName");
return (Criteria) this;
}
public Criteria andMerNameNotIn(List<String> 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<String> values) {
addCriterion("mer_abbreviate in", values, "merAbbreviate");
return (Criteria) this;
}
public Criteria andMerAbbreviateNotIn(List<String> 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;

@ -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;
}

@ -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;
}

@ -21,11 +21,11 @@ public class RequestSeparateQueryAmtModel {
private String merchantNo;
/**
* 分账流水
* 商户交易单
*/
@NotBlank(message = "分账流水号必填项")
@Length(min = 6, max = 50, message = "分账流水号限制6至50位字符串长度")
private String outSeparateNo;
@NotBlank(message = "商户交易单号必填项")
@Length(min = 6, max = 50, message = "商户交易单号长度限制6至50位字符串长度")
private String outTradeNo;
/**
* 签名参数

@ -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());
@ -100,7 +109,11 @@ public class OpenApiTradeOrderProfitSharingServiceImpl implements OpenApiTradeOr
profitSharingReceiver.setReceiverObjectType(ProfitSharingReceiverObjectType.mer.getType());
profitSharingReceiver.setReceiverObjectId(recvMer.getId().toString());
profitSharingReceiver.setReceiverNo(recvMer.getMerNo());
profitSharingReceiver.setReceiverAccount(merLedger.getReceiverNo());
if (recvMer.getMerNo().equals(tradeOrder.getMerNo())) {
profitSharingReceiver.setReceiverAccount(tradeOrder.getPlatformMerNo());
} else {
profitSharingReceiver.setReceiverAccount(merLedger.getReceiverNo());
}
profitSharingReceiver.setReceiverName(recvMer.getMerName());
profitSharingReceiver.setReceiverAmount(new BigDecimal(recvData.getSeparateAmount()));
tradeOrderProfitSharingReceiverService.editData(profitSharingReceiver);
@ -167,6 +180,15 @@ public class OpenApiTradeOrderProfitSharingServiceImpl implements OpenApiTradeOr
profitSharingCmd.setCreateType(TradeOrderProfitSharingCreateType.type2.getNumber());
tradeOrderProfitSharingService.editData(profitSharingCmd);
// 接收方
List<BsTradeOrderProfitSharingReceiver> 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());
@ -262,22 +284,8 @@ public class OpenApiTradeOrderProfitSharingServiceImpl implements OpenApiTradeOr
@Override
public ResponseSeparateQueryAmtModel queryAmt(RequestSeparateQueryAmtModel separateQueryAmtModel) throws Exception {
// 查询分账
BsTradeOrderProfitSharing tradeOrderProfitSharing = tradeOrderProfitSharingService.getDetailByProfitSharingOrderNo(separateQueryAmtModel.getOutSeparateNo());
if (tradeOrderProfitSharing == null) {
throw ErrorHelp.genException(SysCode.OpenApi, ErrorCode.OPEN_API_COMMON, "未知的分账流水号");
}
// 交易订单
BsTradeOrder tradeOrder = openApiTradeOrderService.getOrderByOutTradeNo(tradeOrderProfitSharing.getTradeOrderNo());
if (tradeOrder == null) {
throw ErrorHelp.genException(SysCode.OpenApi, ErrorCode.OPEN_API_COMMON, "未知的交易流水号");
}
if (!separateQueryAmtModel.getMerchantNo().equals(tradeOrder.getMerNo())) {
throw ErrorHelp.genException(SysCode.OpenApi, ErrorCode.OPEN_API_COMMON, "未知的分账流水号");
}
// 第三方查询
JSONObject queryAmt = laKaLaTradeSeparateService.queryAmt(separateQueryAmtModel.getOutSeparateNo());
JSONObject queryAmt = laKaLaTradeSeparateService.queryAmt(separateQueryAmtModel.getOutTradeNo());
ResponseSeparateQueryAmtModel responseSeparateQueryAmtModel = new ResponseSeparateQueryAmtModel();
responseSeparateQueryAmtModel.setMerchantNo(separateQueryAmtModel.getMerchantNo());
responseSeparateQueryAmtModel.setTotalSeparateAmt(queryAmt.getBigDecimal("total_separate_amt").divide(new BigDecimal("100")));

@ -64,6 +64,7 @@ public class SignatureUtil {
}
}
sb.append("&key=").append(key);
System.out.println("签名字符串:"+sb.toString());
return sb.toString();
}
@ -84,42 +85,30 @@ public class SignatureUtil {
public static void main(String[] args) throws Exception {
String paramStr = "{\n" +
" \"merchantNo\": \"2023121813322612707\",\n" +
" \"outTradeNo\": \"ZF1130202312190012\",\n" +
" \"payMode\": \"ALIPAY\",\n" +
" \"totalAmount\": 1,\n" +
" \"transType\": \"NATIVE\",\n" +
" \"profitSharing\": 1,\n" +
" \"specialField\": \"测试\"" +
"\t\"outSplitInfo\": [{\n" +
"\t\t\"amount\": \"0.01\",\n" +
"\t\t\"outSubTradeNo\": \"CPBUS0202508121514410002_1\",\n" +
"\t\t\"subAttach\": \"202508061503020001\",\n" +
"\t\t\"merchantNo\": \"2025080710431547108\"\n" +
"\t}, {\n" +
"\t\t\"amount\": \"0.04\",\n" +
"\t\t\"outSubTradeNo\": \"CPBUS0202508121514410002_2\",\n" +
"\t\t\"subAttach\": \"202508120930470001,202508061102190001\",\n" +
"\t\t\"merchantNo\": \"2023082309581210306\"\n" +
"\t}],\n" +
"\t\"totalAmount\": \"0.05\",\n" +
"\t\"transType\": \"JSAPI\",\n" +
"\t\"payMode\": \"WECHAT\",\n" +
"\t\"subject\": \"微信合单支付\",\n" +
"\t\"outTradeNo\": \"CPBUS0202508121514410002\",\n" +
"\t\"notifyUrl\": \"http://test.api2.ctpark.cn/3rdparty/payment/payNotifyHpay\",\n" +
"\t\"attach\": \"wxMergePay\",\n" +
"\t\"userId\": \"o4Jwb42CBpXgAZJaF985MViTBIaI\",\n" +
"\t\"merchantNo\": \"2023082309581210306\",\n" +
"\t\"subAppid\": \"wxc1d482cb439d570d\"\n" +
"}";
/* String paramStr = "{\n" +
" \"merchantNo\": \"2023121813322612707\",\n" +
" \"outSeparateNo\": \"1530202305190001\",\n" +
" \"outTradeNo\": \"ZF1130202312190004\",\n" +
" \"totalAmount\": \"0.01\",\n" +
" \"recvDatas\": [\n" +
" {\n" +
" \"recvMerchantNo\": \"2023121811484863205\",\n" +
" \"separateAmount\": \"0.01\"\n" +
" }\n" +
" ]" +
"}";*/
/*
String paramStr = "{\n" +
" \"merchantNo\": \"2023121813322612707\",\n" +
" \"outSeparateNo\": \"1530202305190001\"" +
"}";*/
/* String paramStr = "{\n" +
" \"merchantNo\": \"2023121813322612707\",\n" +
" \"outTradeNo\": \"ZF1130202312190004\",\n" +
" \"refundAmount\": \"1\",\n" +
" \"refundReason\": \"测试退款\",\n" +
" \"refundTradeNo\": \"1170202312190001\"" +
"}";*/
String sign = createSign(JSONObject.parseObject(paramStr), "7ub4JCbyExtW4ragz6FO6bGkVnuV7cUp");
String sign = createSign(JSONObject.parseObject(paramStr), "rz58ZH8tTOCWxGPsRplGC3BDCBQmxsZo");
System.out.println(sign);
JSONObject object = JSONObject.parseObject(paramStr);

@ -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<BsTradeOrderProfitSharingReceiver> getProfitSharingList(Map<String, Object> param);
/**
* 获取分账接收方列表
* @param param
* @return
*/
List<TradeProfitSharingDetailModel> getReceiverList(Map<String, Object> param);
}

@ -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<BsTradeOrderProfitSharing> getList(Map<String,Object> param);
/**
* 获取需要分账的订单
* @return

@ -28,7 +28,7 @@ public interface BsTradeOrderRefundService {
* @param outTradeOrder
* @return
*/
BsTradeOrderRefund getRefundByOutTradeOrder(String outTradeOrder);
List<BsTradeOrderRefund> getRefundByOutTradeOrder(String outTradeOrder);
/**
* 根据合单退款id查询退款

@ -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<TradeProfitSharingDetailModel> getReceiverList(Map<String, Object> 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);
}
}

@ -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<BsTradeOrderProfitSharing> getList(Map<String, Object> 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<BsTradeOrderProfitSharing> getNeedProfitSharingOrder() {
return tradeOrderProfitSharingMapper.getNeedProfitSharingOrder();

@ -154,14 +154,11 @@ public class BsTradeOrderRefundServiceImpl implements BsTradeOrderRefundService
}
@Override
public BsTradeOrderRefund getRefundByOutTradeOrder(String outTradeOrder) {
public List<BsTradeOrderRefund> getRefundByOutTradeOrder(String outTradeOrder) {
BsTradeOrderRefundExample example = new BsTradeOrderRefundExample();
example.createCriteria().andOutTradeNoEqualTo(outTradeOrder).andStatusNotEqualTo(TradeOrderRefundStatusEnum.status0.getNumber());
List<BsTradeOrderRefund> list = tradeOrderRefundMapper.selectByExample(example);
if (list.size() > 0) {
return list.get(0);
}
return null;
example.setOrderByClause("create_time desc");
return tradeOrderRefundMapper.selectByExample(example);
}
@Override

@ -622,11 +622,11 @@ public class BsTradeOrderServiceImpl implements BsTradeOrderService {
}
if (StringUtils.isNotBlank(MapUtils.getString(param, "outTradeNo"))) {
criteria.andOutTradeNoEqualTo(MapUtils.getString(param, "outTradeNo"));
criteria.andOutTradeNoLike("%"+MapUtils.getString(param, "outTradeNo")+"%");
}
if (StringUtils.isNotBlank(MapUtils.getString(param, "accTradeNo"))) {
criteria.andAccTradeNoEqualTo(MapUtils.getString(param, "accTradeNo"));
criteria.andAccTradeNoLike("%"+MapUtils.getString(param, "accTradeNo")+"%");
}
if (MapUtils.getLong(param, "createTimeS") != null) {
@ -691,6 +691,13 @@ public class BsTradeOrderServiceImpl implements BsTradeOrderService {
paramMap.remove("outTradeNo");
}
if (MapUtils.getLong(param, "createTimeS") != null) {
paramMap.put("createTimeS", DateUtil.date2String(new Date(MapUtils.getLong(param, "createTimeS")), DateUtil.Y_M_D_HMS));
}
if (MapUtils.getLong(param, "createTimeE") != null) {
paramMap.put("createTimeE", DateUtil.date2String(new Date(MapUtils.getLong(param, "createTimeE")), DateUtil.Y_M_D_HMS));
}
if (MapUtils.getLong(param, "payTimeS") != null) {
paramMap.put("payTimeS", DateUtil.date2String(new Date(MapUtils.getLong(param, "payTimeS")), DateUtil.Y_M_D_HMS));
}

@ -129,10 +129,10 @@ public class BsTransferAccountsServiceImpl implements BsTransferAccountsService
@Override
public List<BsTransferAccounts> getList(Map<String, Object> 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");

@ -9,7 +9,7 @@ import java.util.Objects;
**/
public enum ProfitSharingStatusEnum {
status0(0, "待处理"),
status1(1, "已完成"),
status1(1, "成"),
status2(2, "处理中"),
status3(3, "已受理"),
status4(4, "失败"),

Loading…
Cancel
Save