dromara/dax-pay
1
0
Fork 0
mirror of https://gitee.com/dromara/dax-pay.git synced 2025-09-04 19:49:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat 对账开发

Browse Source
This commit is contained in:
bootx
2024-03-03 23:20:24 +08:00
parent 71727c26bd
commit fbcabac2ac
33 changed files with 388 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
daxpay-single-demo/src/main/java/cn/bootx/platform/daxpay/demo/service/AggregateService.java
View File

@@ -261,7 +261,6 @@ public class AggregateService {
}
}
/**
* 获取微信OpenId
*/

42
daxpay-single/daxpay-single-admin/src/main/java/cn/bootx/platform/daxpay/admin/controller/order/PayReconcileOrderController.java → daxpay-single/daxpay-single-admin/src/main/java/cn/bootx/platform/daxpay/admin/controller/order/ReconcileOrderController.java
View File

@@ -5,11 +5,14 @@ import cn.bootx.platform.common.core.rest.Res;
import cn.bootx.platform.common.core.rest.ResResult;
import cn.bootx.platform.common.core.rest.param.PageParam;
import cn.bootx.platform.common.core.util.ValidationUtil;
import cn.bootx.platform.daxpay.service.core.order.reconcile.service.PayReconcileQueryService;
import cn.bootx.platform.daxpay.service.core.payment.reconcile.service.PayReconcileService;
import cn.bootx.platform.daxpay.service.dto.order.reconcile.PayReconcileDetailDto;
import cn.bootx.platform.daxpay.service.dto.order.reconcile.PayReconcileOrderDto;
import cn.bootx.platform.daxpay.service.core.order.reconcile.service.ReconcileDiffService;
import cn.bootx.platform.daxpay.service.core.order.reconcile.service.ReconcileQueryService;
import cn.bootx.platform.daxpay.service.core.payment.reconcile.service.ReconcileService;
import cn.bootx.platform.daxpay.service.dto.order.reconcile.ReconcileDetailDto;
import cn.bootx.platform.daxpay.service.dto.order.reconcile.ReconcileDiffRecordDto;
import cn.bootx.platform.daxpay.service.dto.order.reconcile.ReconcileOrderDto;
import cn.bootx.platform.daxpay.service.param.reconcile.ReconcileDetailQuery;
import cn.bootx.platform.daxpay.service.param.reconcile.ReconcileDiffQuery;
import cn.bootx.platform.daxpay.service.param.reconcile.ReconcileOrderCreate;
import cn.bootx.platform.daxpay.service.param.reconcile.ReconcileOrderQuery;
import io.swagger.v3.oas.annotations.Operation;
@@ -26,9 +29,10 @@ import org.springframework.web.bind.annotation.*;
@RestController
@RequestMapping("/order/reconcile")
@RequiredArgsConstructor
public class PayReconcileOrderController {
private final PayReconcileService reconcileService;
private final PayReconcileQueryService reconcileQueryService;
public class ReconcileOrderController {
private final ReconcileService reconcileService;
private final ReconcileQueryService reconcileQueryService;
private final ReconcileDiffService reconcileDiffService;
@Operation(summary = "手动创建支付对账订单")
@PostMapping("/create")
@@ -54,25 +58,37 @@ public class PayReconcileOrderController {
@Operation(summary = "订单分页")
@GetMapping("/page")
public ResResult<PageResult<PayReconcileOrderDto>> page(PageParam pageParam, ReconcileOrderQuery query){
public ResResult<PageResult<ReconcileOrderDto>> page(PageParam pageParam, ReconcileOrderQuery query){
return Res.ok(reconcileQueryService.page(pageParam, query));
}
@Operation(summary = "订单详情")
@GetMapping("/findById")
public ResResult<PayReconcileOrderDto> findById(Long id){
public ResResult<ReconcileOrderDto> findById(Long id){
return Res.ok(reconcileQueryService.findById(id));
}
@Operation(summary = "对账明细分页")
@GetMapping("/pageDetail")
public ResResult<PageResult<PayReconcileDetailDto>> pageDetail(PageParam pageParam, ReconcileDetailQuery query){
@GetMapping("/detail/page")
public ResResult<PageResult<ReconcileDetailDto>> pageDetail(PageParam pageParam, ReconcileDetailQuery query){
return Res.ok(reconcileQueryService.pageDetail(pageParam, query));
}
@Operation(summary = "对账明细详情")
@GetMapping("/findDetailById")
public ResResult<PayReconcileDetailDto> findDetailById(Long id){
@GetMapping("/detail/findById")
public ResResult<ReconcileDetailDto> findDetailById(Long id){
return Res.ok(reconcileQueryService.findDetailById(id));
}
@Operation(summary = "对账差异分页")
@GetMapping("/diff/page")
public ResResult<PageResult<ReconcileDiffRecordDto>> pageDiff(PageParam pageParam, ReconcileDiffQuery query){
return Res.ok(reconcileDiffService.page(pageParam, query));
}
@Operation(summary = "对账差异详情")
@GetMapping("/diff/findById")
public ResResult<ReconcileDiffRecordDto> findDiffById(Long id){
return Res.ok(reconcileDiffService.findById(id));
}
}

4
daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/common/context/ReconcileLocal.java
View File

@@ -1,6 +1,6 @@
package cn.bootx.platform.daxpay.service.common.context;
import cn.bootx.platform.daxpay.service.core.order.reconcile.entity.PayReconcileDetail;
import cn.bootx.platform.daxpay.service.core.order.reconcile.entity.ReconcileDetail;
import lombok.Data;
import lombok.experimental.Accessors;
@@ -16,6 +16,6 @@ import java.util.List;
public class ReconcileLocal {
/** 通用支付对账记录 */
private List<PayReconcileDetail> reconcileDetails;
private List<ReconcileDetail> reconcileDetails;
}

12
daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/alipay/service/AliPayReconcileService.java
View File

@@ -10,7 +10,7 @@ import cn.bootx.platform.daxpay.service.core.channel.alipay.dao.AliReconcileBill
import cn.bootx.platform.daxpay.service.core.channel.alipay.entity.AliPayConfig;
import cn.bootx.platform.daxpay.service.core.channel.alipay.entity.AliReconcileBillDetail;
import cn.bootx.platform.daxpay.service.core.channel.alipay.entity.AliReconcileBillTotal;
import cn.bootx.platform.daxpay.service.core.order.reconcile.entity.PayReconcileDetail;
import cn.bootx.platform.daxpay.service.core.order.reconcile.entity.ReconcileDetail;
import cn.hutool.core.io.IoUtil;
import cn.hutool.core.text.csv.CsvReader;
import cn.hutool.core.text.csv.CsvUtil;
@@ -122,7 +122,7 @@ public class AliPayReconcileService {
* 转换为通用对账记录对象
*/
private void convertAndSave(List<AliReconcileBillDetail> billDetails){
List<PayReconcileDetail> collect = billDetails.stream()
List<ReconcileDetail> collect = billDetails.stream()
.map(this::convert)
.collect(Collectors.toList());
// 写入到上下文中
@@ -132,14 +132,14 @@ public class AliPayReconcileService {
/**
* 转换为通用对账记录对象
*/
private PayReconcileDetail convert(AliReconcileBillDetail billDetail){
private ReconcileDetail convert(AliReconcileBillDetail billDetail){
// 金额
String orderAmount = billDetail.getOrderAmount();
double v = Double.parseDouble(orderAmount) * 100;
int amount = Math.abs(((int) v));
// 默认为支付对账记录
PayReconcileDetail payReconcileDetail = new PayReconcileDetail()
ReconcileDetail reconcileDetail = new ReconcileDetail()
.setRecordOrderId(billDetail.getRecordOrderId())
.setOrderId(billDetail.getOutTradeNo())
.setType(ReconcileTradeEnum.PAY.getCode())
@@ -148,11 +148,11 @@ public class AliPayReconcileService {
.setGatewayOrderNo(billDetail.getTradeNo());
// 退款覆盖更新对应的字段
if (Objects.equals(billDetail.getTradeType(), "退款")){
payReconcileDetail.setOrderId(billDetail.getBatchNo())
reconcileDetail.setOrderId(billDetail.getBatchNo())
.setType(ReconcileTradeEnum.REFUND.getCode());
}
return payReconcileDetail;
return reconcileDetail;
}

14
daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wechat/service/WechatPayReconcileService.java
View File

@@ -11,7 +11,7 @@ import cn.bootx.platform.daxpay.service.core.channel.wechat.entity.WeChatPayConf
import cn.bootx.platform.daxpay.service.core.channel.wechat.entity.WxReconcileBillDetail;
import cn.bootx.platform.daxpay.service.core.channel.wechat.entity.WxReconcileBillTotal;
import cn.bootx.platform.daxpay.service.core.channel.wechat.entity.WxReconcileFundFlowDetail;
import cn.bootx.platform.daxpay.service.core.order.reconcile.entity.PayReconcileDetail;
import cn.bootx.platform.daxpay.service.core.order.reconcile.entity.ReconcileDetail;
import cn.hutool.core.codec.Base64;
import cn.hutool.core.text.csv.CsvReader;
import cn.hutool.core.text.csv.CsvUtil;
@@ -107,7 +107,7 @@ public class WechatPayReconcileService{
* 转换为通用对账记录对象
*/
public void convertAndSave(List<WxReconcileBillDetail> billDetails){
List<PayReconcileDetail> collect = billDetails.stream()
List<ReconcileDetail> collect = billDetails.stream()
.map(this::convert)
.collect(Collectors.toList());
// 写入到上下文中
@@ -117,9 +117,9 @@ public class WechatPayReconcileService{
/**
* 转换为通用对账记录对象
*/
public PayReconcileDetail convert(WxReconcileBillDetail billDetail){
public ReconcileDetail convert(WxReconcileBillDetail billDetail){
// 默认为支付对账记录
PayReconcileDetail payReconcileDetail = new PayReconcileDetail()
ReconcileDetail reconcileDetail = new ReconcileDetail()
.setRecordOrderId(billDetail.getRecordOrderId())
.setOrderId(billDetail.getMchOrderNo())
.setTitle(billDetail.getSubject())
@@ -130,7 +130,7 @@ public class WechatPayReconcileService{
String orderAmount = billDetail.getOrderAmount();
double v = Double.parseDouble(orderAmount) * 100;
int amount = Math.abs(((int) v));
payReconcileDetail.setType(ReconcileTradeEnum.PAY.getCode())
reconcileDetail.setType(ReconcileTradeEnum.PAY.getCode())
.setAmount(amount);
}
// 退款
@@ -139,7 +139,7 @@ public class WechatPayReconcileService{
String refundAmount = billDetail.getApplyRefundAmount();
double v = Double.parseDouble(refundAmount) * 100;
int amount = Math.abs(((int) v));
payReconcileDetail.setType(ReconcileTradeEnum.REFUND.getCode())
reconcileDetail.setType(ReconcileTradeEnum.REFUND.getCode())
.setAmount(amount)
.setOrderId(billDetail.getMchRefundNo());
}
@@ -147,7 +147,7 @@ public class WechatPayReconcileService{
if (Objects.equals(billDetail.getStatus(), "REVOKED")){
log.warn("对账出现已撤销记录, 后续进行处理");
}
return payReconcileDetail;
return reconcileDetail;
}

22
daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/order/reconcile/conver/PayReconcileConvert.java
View File

@@ -1,22 +0,0 @@
package cn.bootx.platform.daxpay.service.core.order.reconcile.conver;
import cn.bootx.platform.daxpay.service.core.order.reconcile.entity.PayReconcileDetail;
import cn.bootx.platform.daxpay.service.core.order.reconcile.entity.PayReconcileOrder;
import cn.bootx.platform.daxpay.service.dto.order.reconcile.PayReconcileDetailDto;
import cn.bootx.platform.daxpay.service.dto.order.reconcile.PayReconcileOrderDto;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;
/**
*
* @author xxm
* @since 2024/1/22
*/
@Mapper
public interface PayReconcileConvert {
PayReconcileConvert CONVERT = Mappers.getMapper(PayReconcileConvert.class);
PayReconcileDetailDto convert(PayReconcileDetail in);
PayReconcileOrderDto convert(PayReconcileOrder in);
}

26
daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/order/reconcile/conver/ReconcileConvert.java Normal file
View File

@@ -0,0 +1,26 @@
package cn.bootx.platform.daxpay.service.core.order.reconcile.conver;
import cn.bootx.platform.daxpay.service.core.order.reconcile.entity.ReconcileDetail;
import cn.bootx.platform.daxpay.service.core.order.reconcile.entity.ReconcileDiffRecord;
import cn.bootx.platform.daxpay.service.core.order.reconcile.entity.ReconcileOrder;
import cn.bootx.platform.daxpay.service.dto.order.reconcile.ReconcileDetailDto;
import cn.bootx.platform.daxpay.service.dto.order.reconcile.ReconcileDiffRecordDto;
import cn.bootx.platform.daxpay.service.dto.order.reconcile.ReconcileOrderDto;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;
/**
*
* @author xxm
* @since 2024/1/22
*/
@Mapper
public interface ReconcileConvert {
ReconcileConvert CONVERT = Mappers.getMapper(ReconcileConvert.class);
ReconcileDetailDto convert(ReconcileDetail in);
ReconcileDiffRecordDto convert(ReconcileDiffRecord in);
ReconcileOrderDto convert(ReconcileOrder in);
}

18
daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/order/reconcile/dao/PayReconcileDiffRecordManager.java
View File

@@ -1,18 +0,0 @@
package cn.bootx.platform.daxpay.service.core.order.reconcile.dao;
import cn.bootx.platform.common.mybatisplus.impl.BaseManager;
import cn.bootx.platform.daxpay.service.core.order.reconcile.entity.PayReconcileDiffRecord;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Repository;
/**
*
* @author xxm
* @since 2024/2/28
*/
@Slf4j
@Repository
@RequiredArgsConstructor
public class PayReconcileDiffRecordManager extends BaseManager<PayReconcileDiffRecordMapper, PayReconcileDiffRecord> {
}

14
daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/order/reconcile/dao/PayReconcileDetailManager.java → daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/order/reconcile/dao/ReconcileDetailManager.java
View File

@@ -4,7 +4,7 @@ import cn.bootx.platform.common.core.rest.param.PageParam;
import cn.bootx.platform.common.mybatisplus.impl.BaseManager;
import cn.bootx.platform.common.mybatisplus.util.MpUtil;
import cn.bootx.platform.common.query.generator.QueryGenerator;
import cn.bootx.platform.daxpay.service.core.order.reconcile.entity.PayReconcileDetail;
import cn.bootx.platform.daxpay.service.core.order.reconcile.entity.ReconcileDetail;
import cn.bootx.platform.daxpay.service.param.reconcile.ReconcileDetailQuery;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -22,22 +22,22 @@ import java.util.List;
@Slf4j
@Repository
@RequiredArgsConstructor
public class PayReconcileDetailManager extends BaseManager<PayReconcileDetailMapper, PayReconcileDetail> {
public class ReconcileDetailManager extends BaseManager<ReconcileDetailMapper, ReconcileDetail> {
/**
* 根据订单id查询
*/
public List<PayReconcileDetail> findAllByOrderId(Long orderId){
return this.findAllByField(PayReconcileDetail::getRecordOrderId, orderId);
public List<ReconcileDetail> findAllByOrderId(Long orderId){
return this.findAllByField(ReconcileDetail::getRecordOrderId, orderId);
}
/**
* 分页
*/
public Page<PayReconcileDetail> page(PageParam pageParam, ReconcileDetailQuery query){
Page<PayReconcileDetail> mpPage = MpUtil.getMpPage(pageParam, PayReconcileDetail.class);
QueryWrapper<PayReconcileDetail> generator = QueryGenerator.generator(query);
public Page<ReconcileDetail> page(PageParam pageParam, ReconcileDetailQuery query){
Page<ReconcileDetail> mpPage = MpUtil.getMpPage(pageParam, ReconcileDetail.class);
QueryWrapper<ReconcileDetail> generator = QueryGenerator.generator(query);
return this.page(mpPage,generator);
}
}

4
daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/order/reconcile/dao/PayReconcileDetailMapper.java → daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/order/reconcile/dao/ReconcileDetailMapper.java
View File

@@ -1,6 +1,6 @@
package cn.bootx.platform.daxpay.service.core.order.reconcile.dao;
import cn.bootx.platform.daxpay.service.core.order.reconcile.entity.PayReconcileDetail;
import cn.bootx.platform.daxpay.service.core.order.reconcile.entity.ReconcileDetail;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
@@ -10,5 +10,5 @@ import org.apache.ibatis.annotations.Mapper;
* @since 2024/1/20
*/
@Mapper
public interface PayReconcileDetailMapper extends BaseMapper<PayReconcileDetail> {
public interface ReconcileDetailMapper extends BaseMapper<ReconcileDetail> {
}

33
daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/order/reconcile/dao/ReconcileDiffRecordManager.java Normal file
View File

@@ -0,0 +1,33 @@
package cn.bootx.platform.daxpay.service.core.order.reconcile.dao;
import cn.bootx.platform.common.core.rest.param.PageParam;
import cn.bootx.platform.common.mybatisplus.impl.BaseManager;
import cn.bootx.platform.common.mybatisplus.util.MpUtil;
import cn.bootx.platform.common.query.generator.QueryGenerator;
import cn.bootx.platform.daxpay.service.core.order.reconcile.entity.ReconcileDiffRecord;
import cn.bootx.platform.daxpay.service.param.reconcile.ReconcileDiffQuery;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Repository;
/**
*
* @author xxm
* @since 2024/2/28
*/
@Slf4j
@Repository
@RequiredArgsConstructor
public class ReconcileDiffRecordManager extends BaseManager<ReconcileDiffRecordMapper, ReconcileDiffRecord> {
/**
* 分页
*/
public Page<ReconcileDiffRecord> page(PageParam pageParam, ReconcileDiffQuery query){
Page<ReconcileDiffRecord> mpPage = MpUtil.getMpPage(pageParam, ReconcileDiffRecord.class);
QueryWrapper<ReconcileDiffRecord> generator = QueryGenerator.generator(query);
return this.page(mpPage,generator);
}
}

4
daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/order/reconcile/dao/PayReconcileDiffRecordMapper.java → daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/order/reconcile/dao/ReconcileDiffRecordMapper.java
View File

@@ -1,6 +1,6 @@
package cn.bootx.platform.daxpay.service.core.order.reconcile.dao;
import cn.bootx.platform.daxpay.service.core.order.reconcile.entity.PayReconcileDiffRecord;
import cn.bootx.platform.daxpay.service.core.order.reconcile.entity.ReconcileDiffRecord;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
@@ -10,5 +10,5 @@ import org.apache.ibatis.annotations.Mapper;
* @since 2024/2/28
*/
@Mapper
public interface PayReconcileDiffRecordMapper extends BaseMapper<PayReconcileDiffRecord> {
public interface ReconcileDiffRecordMapper extends BaseMapper<ReconcileDiffRecord> {
}

10
daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/order/reconcile/dao/PayReconcileOrderManager.java → daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/order/reconcile/dao/ReconcileOrderManager.java
View File

@@ -4,7 +4,7 @@ import cn.bootx.platform.common.core.rest.param.PageParam;
import cn.bootx.platform.common.mybatisplus.impl.BaseManager;
import cn.bootx.platform.common.mybatisplus.util.MpUtil;
import cn.bootx.platform.common.query.generator.QueryGenerator;
import cn.bootx.platform.daxpay.service.core.order.reconcile.entity.PayReconcileOrder;
import cn.bootx.platform.daxpay.service.core.order.reconcile.entity.ReconcileOrder;
import cn.bootx.platform.daxpay.service.param.reconcile.ReconcileOrderQuery;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -20,14 +20,14 @@ import org.springframework.stereotype.Repository;
@Slf4j
@Repository
@RequiredArgsConstructor
public class PayReconcileOrderManager extends BaseManager<PayReconcileOrderMapper, PayReconcileOrder> {
public class ReconcileOrderManager extends BaseManager<ReconcileOrderMapper, ReconcileOrder> {
/**
* 分页
*/
public Page<PayReconcileOrder> page(PageParam pageParam, ReconcileOrderQuery query){
Page<PayReconcileOrder> mpPage = MpUtil.getMpPage(pageParam, PayReconcileOrder.class);
QueryWrapper<PayReconcileOrder> generator = QueryGenerator.generator(query);
public Page<ReconcileOrder> page(PageParam pageParam, ReconcileOrderQuery query){
Page<ReconcileOrder> mpPage = MpUtil.getMpPage(pageParam, ReconcileOrder.class);
QueryWrapper<ReconcileOrder> generator = QueryGenerator.generator(query);
return this.page(mpPage,generator);
}
}

4
daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/order/reconcile/dao/PayReconcileOrderMapper.java → daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/order/reconcile/dao/ReconcileOrderMapper.java
View File

@@ -1,6 +1,6 @@
package cn.bootx.platform.daxpay.service.core.order.reconcile.dao;
import cn.bootx.platform.daxpay.service.core.order.reconcile.entity.PayReconcileOrder;
import cn.bootx.platform.daxpay.service.core.order.reconcile.entity.ReconcileOrder;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
@@ -10,5 +10,5 @@ import org.apache.ibatis.annotations.Mapper;
* @since 2024/1/18
*/
@Mapper
public interface PayReconcileOrderMapper extends BaseMapper<PayReconcileOrder> {
public interface ReconcileOrderMapper extends BaseMapper<ReconcileOrder> {
}

10
daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/order/reconcile/entity/PayReconcileDetail.java → daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/order/reconcile/entity/ReconcileDetail.java
View File

@@ -3,8 +3,8 @@ package cn.bootx.platform.daxpay.service.core.order.reconcile.entity;
import cn.bootx.platform.common.core.function.EntityBaseFunction;
import cn.bootx.platform.common.mybatisplus.base.MpCreateEntity;
import cn.bootx.platform.daxpay.code.ReconcileTradeEnum;
import cn.bootx.platform.daxpay.service.core.order.reconcile.conver.PayReconcileConvert;
import cn.bootx.platform.daxpay.service.dto.order.reconcile.PayReconcileDetailDto;
import cn.bootx.platform.daxpay.service.core.order.reconcile.conver.ReconcileConvert;
import cn.bootx.platform.daxpay.service.dto.order.reconcile.ReconcileDetailDto;
import cn.bootx.table.modify.annotation.DbColumn;
import cn.bootx.table.modify.annotation.DbTable;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -24,7 +24,7 @@ import java.time.LocalDateTime;
@Accessors(chain = true)
@DbTable(comment = "支付对账记录")
@TableName("pay_reconcile_detail")
public class PayReconcileDetail extends MpCreateEntity implements EntityBaseFunction<PayReconcileDetailDto> {
public class ReconcileDetail extends MpCreateEntity implements EntityBaseFunction<ReconcileDetailDto> {
/** 关联对账订单ID */
@DbColumn(comment = "关联对账订单ID")
@@ -67,7 +67,7 @@ public class PayReconcileDetail extends MpCreateEntity implements EntityBaseFunc
@Override
public PayReconcileDetailDto toDto() {
return PayReconcileConvert.CONVERT.convert(this);
public ReconcileDetailDto toDto() {
return ReconcileConvert.CONVERT.convert(this);
}
}

22
daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/order/reconcile/entity/PayReconcileDiffRecord.java → daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/order/reconcile/entity/ReconcileDiffRecord.java
View File

@@ -1,7 +1,12 @@
package cn.bootx.platform.daxpay.service.core.order.reconcile.entity;
import cn.bootx.platform.common.core.function.EntityBaseFunction;
import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity;
import cn.bootx.platform.daxpay.code.ReconcileTradeEnum;
import cn.bootx.platform.daxpay.service.code.ReconcileDiffTypeEnum;
import cn.bootx.platform.daxpay.service.core.order.reconcile.conver.ReconcileConvert;
import cn.bootx.platform.daxpay.service.core.payment.reconcile.domain.ReconcileDiff;
import cn.bootx.platform.daxpay.service.dto.order.reconcile.ReconcileDiffRecordDto;
import cn.bootx.table.modify.annotation.DbColumn;
import cn.bootx.table.modify.annotation.DbTable;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -21,7 +26,7 @@ import java.time.LocalDateTime;
@Accessors(chain = true)
@DbTable(comment = "对账差异单")
@TableName("pay_reconcile_diff_record")
public class PayReconcileDiffRecord extends MpBaseEntity {
public class ReconcileDiffRecord extends MpBaseEntity implements EntityBaseFunction<ReconcileDiffRecordDto> {
/** 对账单ID */
@DbColumn(comment = "对账单ID")
@@ -48,11 +53,19 @@ public class PayReconcileDiffRecord extends MpBaseEntity {
/**
* 差异类型
*
* @see ReconcileDiffTypeEnum
*/
@DbColumn(comment = "差异类型")
private String diffType;
/**
* 差异内容, 存储json字符串, 格式为
* {属性: '标题', 本地字段值:'标题1', 网关字段值: '标题2'}
* @see ReconcileDiff
*/
@DbColumn(comment = "差异内容")
private String diffContent;
/** 网关订单号 */
@DbColumn(comment = "网关订单号")
private String gatewayOrderNo;
@@ -64,4 +77,9 @@ public class PayReconcileDiffRecord extends MpBaseEntity {
/** 订单时间 */
@DbColumn(comment = "订单时间")
private LocalDateTime orderTime;
@Override
public ReconcileDiffRecordDto toDto() {
return ReconcileConvert.CONVERT.convert(this);
}
}

10
daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/order/reconcile/entity/PayReconcileOrder.java → daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/order/reconcile/entity/ReconcileOrder.java
View File

@@ -2,8 +2,8 @@ package cn.bootx.platform.daxpay.service.core.order.reconcile.entity;
import cn.bootx.platform.common.core.function.EntityBaseFunction;
import cn.bootx.platform.common.mybatisplus.base.MpCreateEntity;
import cn.bootx.platform.daxpay.service.core.order.reconcile.conver.PayReconcileConvert;
import cn.bootx.platform.daxpay.service.dto.order.reconcile.PayReconcileOrderDto;
import cn.bootx.platform.daxpay.service.core.order.reconcile.conver.ReconcileConvert;
import cn.bootx.platform.daxpay.service.dto.order.reconcile.ReconcileOrderDto;
import cn.bootx.table.modify.annotation.DbColumn;
import cn.bootx.table.modify.annotation.DbTable;
import cn.bootx.table.modify.mysql.annotation.DbMySqlIndex;
@@ -24,7 +24,7 @@ import java.time.LocalDate;
@Accessors(chain = true)
@DbTable(comment = "支付对账单订单")
@TableName("pay_reconcile_order")
public class PayReconcileOrder extends MpCreateEntity implements EntityBaseFunction<PayReconcileOrderDto> {
public class ReconcileOrder extends MpCreateEntity implements EntityBaseFunction<ReconcileOrderDto> {
/**
* 批次号
@@ -56,7 +56,7 @@ public class PayReconcileOrder extends MpCreateEntity implements EntityBaseFunct
private String errorMsg;
@Override
public PayReconcileOrderDto toDto() {
return PayReconcileConvert.CONVERT.convert(this);
public ReconcileOrderDto toDto() {
return ReconcileConvert.CONVERT.convert(this);
}
}

20
daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/order/reconcile/service/PayReconcileDiffRecordService.java
View File

@@ -1,20 +0,0 @@
package cn.bootx.platform.daxpay.service.core.order.reconcile.service;
import cn.bootx.platform.daxpay.service.core.order.reconcile.dao.PayReconcileDiffRecordManager;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
/**
*
* @author xxm
* @since 2024/2/29
*/
@Slf4j
@Service
@RequiredArgsConstructor
public class PayReconcileDiffRecordService {
private final PayReconcileDiffRecordManager recordManager;
}

49
daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/order/reconcile/service/ReconcileDiffService.java Normal file
View File

@@ -0,0 +1,49 @@
package cn.bootx.platform.daxpay.service.core.order.reconcile.service;
import cn.bootx.platform.common.core.exception.DataNotExistException;
import cn.bootx.platform.common.core.rest.PageResult;
import cn.bootx.platform.common.core.rest.param.PageParam;
import cn.bootx.platform.common.mybatisplus.util.MpUtil;
import cn.bootx.platform.daxpay.service.core.order.reconcile.dao.ReconcileDiffRecordManager;
import cn.bootx.platform.daxpay.service.core.order.reconcile.entity.ReconcileDiffRecord;
import cn.bootx.platform.daxpay.service.dto.order.reconcile.ReconcileDiffRecordDto;
import cn.bootx.platform.daxpay.service.param.reconcile.ReconcileDiffQuery;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* 对账差异单服务
* @author xxm
* @since 2024/2/29
*/
@Slf4j
@Service
@RequiredArgsConstructor
public class ReconcileDiffService {
private final ReconcileDiffRecordManager recordManager;
/**
* 批量保存
*/
public void saveAll(List<ReconcileDiffRecord> diffRecords) {
recordManager.saveAll(diffRecords);
}
/**
* 分页查询
*/
public PageResult<ReconcileDiffRecordDto> page(PageParam pageParam, ReconcileDiffQuery query) {
return MpUtil.convert2DtoPageResult(recordManager.page(pageParam, query));
}
/**
* 详情查询
*/
public ReconcileDiffRecordDto findById(Long id) {
return recordManager.findById(id).map(ReconcileDiffRecord::toDto).orElseThrow(() -> new DataNotExistException("不存在的对账差异单"));
}
}

12
daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/order/reconcile/service/PayReconcileOrderService.java → daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/order/reconcile/service/ReconcileOrderService.java
View File

@@ -1,8 +1,8 @@
package cn.bootx.platform.daxpay.service.core.order.reconcile.service;
import cn.bootx.platform.common.sequence.func.Sequence;
import cn.bootx.platform.daxpay.service.core.order.reconcile.dao.PayReconcileOrderManager;
import cn.bootx.platform.daxpay.service.core.order.reconcile.entity.PayReconcileOrder;
import cn.bootx.platform.daxpay.service.core.order.reconcile.dao.ReconcileOrderManager;
import cn.bootx.platform.daxpay.service.core.order.reconcile.entity.ReconcileOrder;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -19,22 +19,22 @@ import java.util.Optional;
@Slf4j
@Service
@RequiredArgsConstructor
public class PayReconcileOrderService {
private final PayReconcileOrderManager reconcileOrderManager;
public class ReconcileOrderService {
private final ReconcileOrderManager reconcileOrderManager;
private final Sequence sequence;
/**
* 更新, 开启一个新事务进行更新
*/
@Transactional(propagation = Propagation.REQUIRES_NEW, rollbackFor = Exception.class)
public void update(PayReconcileOrder order){
public void update(ReconcileOrder order){
reconcileOrderManager.updateById(order);
}
/**
* 根据Id查询
*/
public Optional<PayReconcileOrder> findById(Long id){
public Optional<ReconcileOrder> findById(Long id){
return reconcileOrderManager.findById(id);
}

30
daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/order/reconcile/service/PayReconcileQueryService.java → daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/order/reconcile/service/ReconcileQueryService.java
View File

@@ -4,12 +4,12 @@ import cn.bootx.platform.common.core.exception.DataNotExistException;
import cn.bootx.platform.common.core.rest.PageResult;
import cn.bootx.platform.common.core.rest.param.PageParam;
import cn.bootx.platform.common.mybatisplus.util.MpUtil;
import cn.bootx.platform.daxpay.service.core.order.reconcile.dao.PayReconcileDetailManager;
import cn.bootx.platform.daxpay.service.core.order.reconcile.dao.PayReconcileOrderManager;
import cn.bootx.platform.daxpay.service.core.order.reconcile.entity.PayReconcileDetail;
import cn.bootx.platform.daxpay.service.core.order.reconcile.entity.PayReconcileOrder;
import cn.bootx.platform.daxpay.service.dto.order.reconcile.PayReconcileDetailDto;
import cn.bootx.platform.daxpay.service.dto.order.reconcile.PayReconcileOrderDto;
import cn.bootx.platform.daxpay.service.core.order.reconcile.dao.ReconcileDetailManager;
import cn.bootx.platform.daxpay.service.core.order.reconcile.dao.ReconcileOrderManager;
import cn.bootx.platform.daxpay.service.core.order.reconcile.entity.ReconcileDetail;
import cn.bootx.platform.daxpay.service.core.order.reconcile.entity.ReconcileOrder;
import cn.bootx.platform.daxpay.service.dto.order.reconcile.ReconcileDetailDto;
import cn.bootx.platform.daxpay.service.dto.order.reconcile.ReconcileOrderDto;
import cn.bootx.platform.daxpay.service.param.reconcile.ReconcileDetailQuery;
import cn.bootx.platform.daxpay.service.param.reconcile.ReconcileOrderQuery;
import lombok.RequiredArgsConstructor;
@@ -24,37 +24,37 @@ import org.springframework.stereotype.Service;
@Slf4j
@Service
@RequiredArgsConstructor
public class PayReconcileQueryService {
private final PayReconcileOrderManager orderManager;
private final PayReconcileDetailManager detailManager;
public class ReconcileQueryService {
private final ReconcileOrderManager orderManager;
private final ReconcileDetailManager detailManager;
/**
* 分页
*/
public PageResult<PayReconcileOrderDto> page(PageParam pageParam, ReconcileOrderQuery query){
public PageResult<ReconcileOrderDto> page(PageParam pageParam, ReconcileOrderQuery query){
return MpUtil.convert2DtoPageResult(orderManager.page(pageParam, query));
}
/**
* 对账订单
*/
public PayReconcileOrderDto findById(Long id){
return orderManager.findById(id).map(PayReconcileOrder::toDto)
public ReconcileOrderDto findById(Long id){
return orderManager.findById(id).map(ReconcileOrder::toDto)
.orElseThrow(()->new DataNotExistException("对账订单不存在"));
}
/**
* 明细分页
*/
public PageResult<PayReconcileDetailDto> pageDetail(PageParam pageParam, ReconcileDetailQuery query){
public PageResult<ReconcileDetailDto> pageDetail(PageParam pageParam, ReconcileDetailQuery query){
return MpUtil.convert2DtoPageResult(detailManager.page(pageParam, query));
}
/**
* 明细详情
*/
public PayReconcileDetailDto findDetailById(Long id){
return detailManager.findById(id).map(PayReconcileDetail::toDto)
public ReconcileDetailDto findDetailById(Long id){
return detailManager.findById(id).map(ReconcileDetail::toDto)
.orElseThrow(()->new DataNotExistException("对账详情不存在"));
}

14
daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/reconcile/domain/ReconcileDiff.java
View File

@@ -1,9 +1,23 @@
package cn.bootx.platform.daxpay.service.core.payment.reconcile.domain;
import lombok.Data;
import lombok.experimental.Accessors;
/**
* 对账差异内容
* @author xxm
* @since 2024/3/1
*/
@Data
@Accessors(chain = true)
public class ReconcileDiff {
/** 字段名 */
private String fieldName;
/** 本地订单字段值 */
private String localValue;
/** 网关订单字段值 */
private String gatewayValue;
}

2
daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/reconcile/factory/PayReconcileStrategyFactory.java → daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/reconcile/factory/ReconcileStrategyFactory.java
View File

@@ -17,7 +17,7 @@ import java.util.Objects;
* @since 2024/1/18
*/
@UtilityClass
public class PayReconcileStrategyFactory {
public class ReconcileStrategyFactory {
/**
* 根据传入的支付类型批量创建策略

179
daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/reconcile/service/PayReconcileService.java → daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/reconcile/service/ReconcileService.java
View File

@@ -9,15 +9,16 @@ import cn.bootx.platform.daxpay.exception.pay.PayFailureException;
import cn.bootx.platform.daxpay.service.code.AliPayRecordTypeEnum;
import cn.bootx.platform.daxpay.service.code.ReconcileDiffTypeEnum;
import cn.bootx.platform.daxpay.service.common.local.PaymentContextLocal;
import cn.bootx.platform.daxpay.service.core.order.reconcile.dao.PayReconcileDetailManager;
import cn.bootx.platform.daxpay.service.core.order.reconcile.dao.PayReconcileOrderManager;
import cn.bootx.platform.daxpay.service.core.order.reconcile.entity.PayReconcileDetail;
import cn.bootx.platform.daxpay.service.core.order.reconcile.entity.PayReconcileDiffRecord;
import cn.bootx.platform.daxpay.service.core.order.reconcile.entity.PayReconcileOrder;
import cn.bootx.platform.daxpay.service.core.order.reconcile.service.PayReconcileDiffRecordService;
import cn.bootx.platform.daxpay.service.core.order.reconcile.service.PayReconcileOrderService;
import cn.bootx.platform.daxpay.service.core.order.reconcile.dao.ReconcileDetailManager;
import cn.bootx.platform.daxpay.service.core.order.reconcile.dao.ReconcileOrderManager;
import cn.bootx.platform.daxpay.service.core.order.reconcile.entity.ReconcileDetail;
import cn.bootx.platform.daxpay.service.core.order.reconcile.entity.ReconcileDiffRecord;
import cn.bootx.platform.daxpay.service.core.order.reconcile.entity.ReconcileOrder;
import cn.bootx.platform.daxpay.service.core.order.reconcile.service.ReconcileDiffService;
import cn.bootx.platform.daxpay.service.core.order.reconcile.service.ReconcileOrderService;
import cn.bootx.platform.daxpay.service.core.payment.reconcile.domain.GeneralReconcileRecord;
import cn.bootx.platform.daxpay.service.core.payment.reconcile.factory.PayReconcileStrategyFactory;
import cn.bootx.platform.daxpay.service.core.payment.reconcile.domain.ReconcileDiff;
import cn.bootx.platform.daxpay.service.core.payment.reconcile.factory.ReconcileStrategyFactory;
import cn.bootx.platform.daxpay.service.func.AbsReconcileStrategy;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -34,26 +35,26 @@ import java.util.function.Function;
import java.util.stream.Collectors;
/**
* 支付对账单下载服务
* 对账服务
* @author xxm
* @since 2024/1/17
*/
@Slf4j
@Service
@RequiredArgsConstructor
public class PayReconcileService {
private final PayReconcileOrderService reconcileOrderService;
public class ReconcileService {
private final ReconcileOrderService reconcileOrderService;
private final PayReconcileDiffRecordService reconcileDiffRecordService;
private final ReconcileDiffService reconcileDiffService;
private final PayReconcileOrderManager reconcileOrderManager;
private final PayReconcileDetailManager reconcileDetailManager;
private final ReconcileOrderManager reconcileOrderManager;
private final ReconcileDetailManager reconcileDetailManager;
/**
* 创建对账订单
*/
@Transactional(propagation = Propagation.REQUIRES_NEW, rollbackFor = Exception.class)
public PayReconcileOrder create(LocalDate date, String channel) {
public ReconcileOrder create(LocalDate date, String channel) {
// 获取通道枚举
PayChannelEnum channelEnum = PayChannelEnum.findByCode(channel);
@@ -62,12 +63,12 @@ public class PayReconcileService {
throw new PayFailureException("不支持对账的通道, 请检查");
}
// 构建对账策略
AbsReconcileStrategy reconcileStrategy = PayReconcileStrategyFactory.create(channel);
AbsReconcileStrategy reconcileStrategy = ReconcileStrategyFactory.create(channel);
// 生成批次号
String seqNo = reconcileStrategy.generateSequence(date);
PayReconcileOrder order = new PayReconcileOrder()
ReconcileOrder order = new ReconcileOrder()
.setBatchNo(seqNo)
.setChannel(channel)
.setDate(date);
@@ -79,17 +80,17 @@ public class PayReconcileService {
* 下载对账单并进行保存
*/
public void downAndSave(Long reconcileOrderId) {
PayReconcileOrder payReconcileOrder = reconcileOrderService.findById(reconcileOrderId)
ReconcileOrder reconcileOrder = reconcileOrderService.findById(reconcileOrderId)
.orElseThrow(() -> new DataNotExistException("未找到对账订单"));
this.downAndSave(payReconcileOrder);
this.downAndSave(reconcileOrder);
}
/**
* 下载对账单并进行保存
*/
public void downAndSave(PayReconcileOrder reconcileOrder) {
public void downAndSave(ReconcileOrder reconcileOrder) {
// 构建对账策略
AbsReconcileStrategy reconcileStrategy = PayReconcileStrategyFactory.create(reconcileOrder.getChannel());
AbsReconcileStrategy reconcileStrategy = ReconcileStrategyFactory.create(reconcileOrder.getChannel());
reconcileStrategy.setRecordOrder(reconcileOrder);
reconcileStrategy.doBeforeHandler();
try {
@@ -103,7 +104,7 @@ public class PayReconcileService {
throw new RuntimeException(e);
}
// 保存转换后的通用结构对账单
List<PayReconcileDetail> reconcileDetails = PaymentContextLocal.get()
List<ReconcileDetail> reconcileDetails = PaymentContextLocal.get()
.getReconcileInfo()
.getReconcileDetails();
reconcileDetailManager.saveAll(reconcileDetails);
@@ -113,22 +114,22 @@ public class PayReconcileService {
* 对账单比对
*/
public void compare(Long reconcileOrderId){
PayReconcileOrder payReconcileOrder = reconcileOrderService.findById(reconcileOrderId)
ReconcileOrder reconcileOrder = reconcileOrderService.findById(reconcileOrderId)
.orElseThrow(() -> new DataNotExistException("未找到对账订单"));
this.compare(payReconcileOrder);
this.compare(reconcileOrder);
}
/**
* 对账单比对
*/
public void compare(PayReconcileOrder reconcileOrder){
public void compare(ReconcileOrder reconcileOrder){
// 判断是否已经下载了对账单明细
if (!reconcileOrder.isDown()){
throw new PayFailureException("请先下载对账单");
}
// 查询对账单
List<PayReconcileDetail> reconcileDetails = reconcileDetailManager.findAllByOrderId(reconcileOrder.getId());
List<ReconcileDetail> reconcileDetails = reconcileDetailManager.findAllByOrderId(reconcileOrder.getId());
// 获取通道枚举
if (!PayChannelEnum.ASYNC_TYPE_CODE.contains(reconcileOrder.getChannel())){
log.error("不支持对账的通道, 请检查, 对账订单ID: {}", reconcileOrder.getId());
@@ -136,16 +137,17 @@ public class PayReconcileService {
}
// 判断是否为为异步通道
// 构建对账策略
AbsReconcileStrategy reconcileStrategy = PayReconcileStrategyFactory.create(reconcileOrder.getChannel());
AbsReconcileStrategy reconcileStrategy = ReconcileStrategyFactory.create(reconcileOrder.getChannel());
// 初始化参数
reconcileStrategy.setRecordOrder(reconcileOrder);
reconcileStrategy.setReconcileDetails(reconcileDetails);
try {
// 执行比对任务, 获取对账差异记录
// 执行比对任务, 获取对账差异记录并保存
List<GeneralReconcileRecord> generalReconcileRecord = reconcileStrategy.getGeneralReconcileRecord();
List<PayReconcileDiffRecord> diffRecords = this.generateDiffRecord(generalReconcileRecord,reconcileDetails);
// reconcileOrder.setCompare(true);
// reconcileOrderService.update(reconcileOrder);
List<ReconcileDiffRecord> diffRecords = this.generateDiffRecord(reconcileOrder,generalReconcileRecord,reconcileDetails);
reconcileOrder.setCompare(true);
reconcileOrderService.update(reconcileOrder);
reconcileDiffService.saveAll(diffRecords);
} catch (Exception e) {
log.error("比对对账单异常", e);
reconcileOrder.setErrorMsg("原因: " + e.getMessage());
@@ -156,77 +158,74 @@ public class PayReconcileService {
/**
* 比对生成对账差异单
* 1. 远程有, 本地无 补单(追加回订单/记录差异表)
* 2. 远程无, 本地有 记录差错表
* 3. 远程有, 本地有, 但状态不一致 记录差错表
* 1. 远程有, 本地无
* 2. 远程无, 本地有
* 3. 远程有, 本地有, 但状态不一致
*
*/
private List<PayReconcileDiffRecord> generateDiffRecord(List<GeneralReconcileRecord> records, List<PayReconcileDetail> details){
if (CollUtil.isEmpty(details)){
private List<ReconcileDiffRecord> generateDiffRecord(ReconcileOrder reconcileOrder, List<GeneralReconcileRecord> gatewayRecords, List<ReconcileDetail> localDetails){
if (CollUtil.isEmpty(localDetails)){
return new ArrayList<>();
}
Map<String, PayReconcileDetail> detailMap = details.stream()
.collect(Collectors.toMap(PayReconcileDetail::getOrderId, Function.identity(), CollectorsFunction::retainLatest));
Map<String, ReconcileDetail> detailMap = localDetails.stream()
.collect(Collectors.toMap(ReconcileDetail::getOrderId, Function.identity(), CollectorsFunction::retainLatest));
List<PayReconcileDiffRecord> diffRecords = new ArrayList<>();
Map<Long, GeneralReconcileRecord> recordMap = records.stream()
// 差异内容
List<ReconcileDiffRecord> diffRecords = new ArrayList<>();
Map<Long, GeneralReconcileRecord> recordMap = gatewayRecords.stream()
.collect(Collectors.toMap(GeneralReconcileRecord::getOrderId, Function.identity(), CollectorsFunction::retainLatest));
// 对账与流水比对
for (PayReconcileDetail detail : details) {
for (ReconcileDetail detail : localDetails) {
// 判断本地流水有没有记录, 流水没有记录查询本地订单
GeneralReconcileRecord record = recordMap.get(Long.valueOf(detail.getOrderId()));
if (Objects.isNull(record)){
log.info("本地订单不存在: {}", detail.getOrderId());
PayReconcileDiffRecord diffRecord = new PayReconcileDiffRecord()
ReconcileDiffRecord diffRecord = new ReconcileDiffRecord()
.setDiffType(ReconcileDiffTypeEnum.LOCAL_NOT_EXISTS.getCode())
.setOrderId(Long.valueOf(detail.getOrderId()))
.setDetailId(detail.getId())
.setRecordId(detail.getRecordOrderId())
.setRecordId(reconcileOrder.getId())
.setTitle(detail.getTitle())
.setDiffType(detail.getType())
.setOrderType(detail.getType())
.setGatewayOrderNo(detail.getGatewayOrderNo())
.setAmount(detail.getAmount())
.setOrderTime(detail.getOrderTime());
diffRecords.add(diffRecord);
continue;
}
// 交易类型 支付/退款
if (Objects.equals(detail.getType(), ReconcileTradeEnum.PAY.getCode())){
// 判断类型是否存在差异
if (!Objects.equals(record.getType(), AliPayRecordTypeEnum.PAY.getCode())){
PayReconcileDiffRecord diffRecord = new PayReconcileDiffRecord()
.setDiffType(ReconcileDiffTypeEnum.NOT_MATCH.getCode())
.setOrderId(Long.valueOf(detail.getOrderId()))
.setDetailId(detail.getId())
.setRecordId(detail.getRecordOrderId())
.setTitle(detail.getTitle())
.setDiffType(detail.getType())
.setGatewayOrderNo(detail.getGatewayOrderNo())
.setAmount(detail.getAmount())
.setOrderTime(detail.getOrderTime());
diffRecords.add(diffRecord);
continue;
}
} else {
// 判断类型是否存在差异
if (!Objects.equals(record.getType(), AliPayRecordTypeEnum.REFUND.getCode())) {
log.info("本地订单类型不正常: {}", detail.getOrderId());
continue;
}
}
// 判断是否存在差异 金额, 状态
if (!Objects.equals(record.getAmount(), detail.getAmount())){
log.info("本地订单金额不正常: {}", detail.getOrderId());
continue;
// 如果远程和本地都存在, 比对差异
List<ReconcileDiff> reconcileDiffs = this.reconcileDiff(detail, record);
if (CollUtil.isNotEmpty(reconcileDiffs)) {
ReconcileDiffRecord diffRecord = new ReconcileDiffRecord()
.setDiffType(ReconcileDiffTypeEnum.NOT_MATCH.getCode())
.setOrderId(Long.valueOf(detail.getOrderId()))
.setDetailId(detail.getId())
.setRecordId(reconcileOrder.getId())
.setTitle(detail.getTitle())
.setOrderType(detail.getType())
.setGatewayOrderNo(detail.getGatewayOrderNo())
.setAmount(detail.getAmount())
.setOrderTime(detail.getOrderTime());
diffRecords.add(diffRecord);
}
}
// 流水与对账单比对, 找出本地有, 远程没有的记录
for (GeneralReconcileRecord record : records) {
PayReconcileDetail detail = detailMap.get(String.valueOf(record.getOrderId()));
for (GeneralReconcileRecord gateway : gatewayRecords) {
ReconcileDetail detail = detailMap.get(String.valueOf(gateway.getOrderId()));
if (Objects.isNull(detail)){
log.info("远程订单不存在: {}", record.getOrderId());
ReconcileDiffRecord diffRecord = new ReconcileDiffRecord()
.setDiffType(ReconcileDiffTypeEnum.LOCAL_NOT_EXISTS.getCode())
.setOrderId(gateway.getOrderId())
.setRecordId(reconcileOrder.getId())
.setDetailId(null)
.setTitle(gateway.getTitle())
.setDiffType(gateway.getType())
.setOrderType(gateway.getType())
.setGatewayOrderNo(gateway.getGatewayOrderNo())
.setAmount(gateway.getAmount())
.setOrderTime(gateway.getGatewayTime());
diffRecords.add(diffRecord);
log.info("远程订单不存在: {}", gateway.getOrderId());
continue;
}
}
@@ -234,9 +233,31 @@ public class PayReconcileService {
}
/**
* 判断订单之间是否存在差异
* 判断订单之间存在哪些差异
*/
public void reconcileDiff(GeneralReconcileRecord record, PayReconcileDetail detail){
public List<ReconcileDiff> reconcileDiff(ReconcileDetail detail, GeneralReconcileRecord record){
List<ReconcileDiff> diffs = new ArrayList<>();
// 判断类型是否相同
if (!(Objects.equals(detail.getType(), ReconcileTradeEnum.PAY.getCode())
&& Objects.equals(record.getType(), AliPayRecordTypeEnum.PAY.getCode()))){
log.warn("订单类型不一致: {},{}", detail.getType(), record.getType());
diffs.add(new ReconcileDiff().setFieldName("订单类型").setLocalValue(detail.getType()).setGatewayValue(record.getType()));
}
// 判断名称是否一致
if (!Objects.equals(detail.getTitle(), record.getTitle())){
log.warn("订单名称不一致: {},{}", detail.getTitle(), record.getTitle());
diffs.add(new ReconcileDiff().setFieldName("订单名称").setLocalValue(detail.getTitle()).setGatewayValue(record.getTitle()));
}
// 判断金额是否一致
if (!Objects.equals(detail.getAmount(), record.getAmount())){
log.warn("订单金额不一致: {},{}", detail.getAmount(), record.getAmount());
diffs.add(new ReconcileDiff().setFieldName("订单金额")
.setLocalValue(String.valueOf(detail.getAmount()))
.setGatewayValue(String.valueOf(record.getAmount())));
}
return diffs;
}
}

1
daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/reconcile/strategy/AlipayReconcileStrategy.java
View File

@@ -9,7 +9,6 @@ import cn.bootx.platform.daxpay.service.core.channel.alipay.entity.AliPayConfig;
import cn.bootx.platform.daxpay.service.core.channel.alipay.entity.AliPayRecord;
import cn.bootx.platform.daxpay.service.core.channel.alipay.service.AliPayConfigService;
import cn.bootx.platform.daxpay.service.core.channel.alipay.service.AliPayReconcileService;
import cn.bootx.platform.daxpay.service.core.order.reconcile.entity.PayReconcileDiffRecord;
import cn.bootx.platform.daxpay.service.core.payment.reconcile.domain.GeneralReconcileRecord;
import cn.bootx.platform.daxpay.service.func.AbsReconcileStrategy;
import cn.hutool.core.date.DatePattern;

1
daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/reconcile/strategy/WechatPayReconcileStrategy.java
View File

@@ -9,7 +9,6 @@ import cn.bootx.platform.daxpay.service.core.channel.wechat.entity.WeChatPayConf
import cn.bootx.platform.daxpay.service.core.channel.wechat.entity.WeChatPayRecord;
import cn.bootx.platform.daxpay.service.core.channel.wechat.service.WeChatPayConfigService;
import cn.bootx.platform.daxpay.service.core.channel.wechat.service.WechatPayReconcileService;
import cn.bootx.platform.daxpay.service.core.order.reconcile.entity.PayReconcileDiffRecord;
import cn.bootx.platform.daxpay.service.core.payment.reconcile.domain.GeneralReconcileRecord;
import cn.bootx.platform.daxpay.service.func.AbsReconcileStrategy;
import cn.hutool.core.date.DatePattern;

2
daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/order/reconcile/PayReconcileDetailDto.java → daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/order/reconcile/ReconcileDetailDto.java
View File

@@ -15,7 +15,7 @@ import lombok.experimental.Accessors;
@Data
@Accessors(chain = true)
@Schema(title = "对账订单详情")
public class PayReconcileDetailDto extends BaseDto {
public class ReconcileDetailDto extends BaseDto {
/** 关联对账订单ID */
@Schema(description = "关联对账订单ID")

19
daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/order/reconcile/ReconcileDiffRecordDto.java Normal file
View File

@@ -0,0 +1,19 @@
package cn.bootx.platform.daxpay.service.dto.order.reconcile;
import cn.bootx.platform.common.core.rest.dto.BaseDto;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* 对账差异单
* @author xxm
* @since 2024/3/3
*/
@EqualsAndHashCode(callSuper = true)
@Data
@Accessors(chain = true)
@Schema(title = "对账差异单")
public class ReconcileDiffRecordDto extends BaseDto {
}

2
daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/order/reconcile/PayReconcileOrderDto.java → daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/order/reconcile/ReconcileOrderDto.java
View File

@@ -17,7 +17,7 @@ import java.time.LocalDate;
@Data
@Accessors(chain = true)
@Schema(title = "对账订单")
public class PayReconcileOrderDto extends BaseDto {
public class ReconcileOrderDto extends BaseDto {
@Schema(description = "日期")
private LocalDate date;

8
daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/func/AbsReconcileStrategy.java
View File

@@ -1,7 +1,7 @@
package cn.bootx.platform.daxpay.service.func;
import cn.bootx.platform.daxpay.service.core.order.reconcile.entity.PayReconcileDetail;
import cn.bootx.platform.daxpay.service.core.order.reconcile.entity.PayReconcileOrder;
import cn.bootx.platform.daxpay.service.core.order.reconcile.entity.ReconcileDetail;
import cn.bootx.platform.daxpay.service.core.order.reconcile.entity.ReconcileOrder;
import cn.bootx.platform.daxpay.service.core.payment.reconcile.domain.GeneralReconcileRecord;
import lombok.Getter;
import lombok.Setter;
@@ -19,10 +19,10 @@ import java.util.List;
public abstract class AbsReconcileStrategy implements PayStrategy {
/** 对账订单 */
private PayReconcileOrder recordOrder;
private ReconcileOrder recordOrder;
/** 对账订单明细 */
private List<PayReconcileDetail> reconcileDetails;
private List<ReconcileDetail> reconcileDetails;
/**

19
daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/reconcile/ReconcileDiffQuery.java Normal file
View File

@@ -0,0 +1,19 @@
package cn.bootx.platform.daxpay.service.param.reconcile;
import cn.bootx.platform.common.core.rest.param.QueryOrder;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* 对账差异查询参数
* @author xxm
* @since 2024/3/3
*/
@EqualsAndHashCode(callSuper = true)
@Data
@Accessors(chain = true)
@Schema(title = "对账差异查询参数")
public class ReconcileDiffQuery extends QueryOrder {
}

6
daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/task/PayReconcileTask.java → daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/task/ReconcileTask.java
View File

@@ -1,6 +1,6 @@
package cn.bootx.platform.daxpay.service.task;
import cn.bootx.platform.daxpay.service.task.service.PayReconcileTaskService;
import cn.bootx.platform.daxpay.service.task.service.ReconcileTaskService;
import lombok.RequiredArgsConstructor;
import lombok.Setter;
import lombok.extern.slf4j.Slf4j;
@@ -20,8 +20,8 @@ import java.util.Objects;
@DisallowConcurrentExecution
@PersistJobDataAfterExecution
@RequiredArgsConstructor
public class PayReconcileTask implements Job {
private final PayReconcileTaskService reconcileTaskService;
public class ReconcileTask implements Job {
private final ReconcileTaskService reconcileTaskService;
/**
* 要同步的通道

10
daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/task/service/PayReconcileTaskService.java → daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/task/service/ReconcileTaskService.java
View File

@@ -1,7 +1,7 @@
package cn.bootx.platform.daxpay.service.task.service;
import cn.bootx.platform.daxpay.service.core.order.reconcile.entity.PayReconcileOrder;
import cn.bootx.platform.daxpay.service.core.payment.reconcile.service.PayReconcileService;
import cn.bootx.platform.daxpay.service.core.order.reconcile.entity.ReconcileOrder;
import cn.bootx.platform.daxpay.service.core.payment.reconcile.service.ReconcileService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -16,8 +16,8 @@ import java.time.LocalDate;
@Slf4j
@Service
@RequiredArgsConstructor
public class PayReconcileTaskService {
private final PayReconcileService reconcileService;
public class ReconcileTaskService {
private final ReconcileService reconcileService;
/**
* 执行任务
@@ -25,7 +25,7 @@ public class PayReconcileTaskService {
public void reconcileTask(LocalDate date, String channel){
// 1. 查询需要定时对账的通道, 创建出来对账订单
PayReconcileOrder reconcileOrder = reconcileService.create(date, channel);
ReconcileOrder reconcileOrder = reconcileService.create(date, channel);
// 2. 执行对账任务, 下载对账单并解析, 分别存储为原始数据和通用对账数据
reconcileService.downAndSave(reconcileOrder);