abu/wzj-boot
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(transaction): 易生分账返回状态枚举修正

Browse Source
This commit is contained in:
huk 2025-09-15 10:17:55 +08:00
parent 9a6f0e14d7
commit 841c35106d
3 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/controller/ProductController.java
View File

@ -35,7 +35,7 @@ public class ProductController extends BaseController {
@Tag(name ="查询商品信息列表")
@PostMapping("list")
public R<IPage<ProductVO>> list(@RequestBody ProductBo bo,@RequestBody Page<Product> page) {
public R<IPage<ProductVO>> list(@RequestBody ProductBo bo) {
return R.ok(business.page(bo));
}

24
ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/enums/easypay/SepaStatus.java
View File

@ -10,16 +10,32 @@ import java.util.Arrays;
/**
* 分账单状态，（处理中、成功、失败、已退款）
* 0 -> 交易成功
* 1 -> 交易部分成功
* X -> 交易失败
* 9 -> 支付中，具体状态未知
* A -> 已撤销
* C -> 已关闭
* R -> 已退款
* E -> 已冲正
*
*
*
*
* 已撤销
*/
@Getter
@AllArgsConstructor
public enum SepaStatus {
SUCCESS("0", "成功"),
FAIL("FAIL", "失败"),
PENDING("PENDING", "处理中"),
PROCESSING("PROCESSING", "处理中"),
REFUNDED("REFUNDED", "已退款");
PARTIALLY_SUCCESS("1", "交易部分成功"),
FAIL("X", "失败"),
PENDING("9", "处理中"),
A("A", "已撤销"),
C("C", "已关闭"),
R("R", "已退款"),
E("E", "已冲正");
/**

6
ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/impl/EasypayServiceImpl.java
View File

@ -777,11 +777,9 @@ public class EasypayServiceImpl implements IEasypayService {
divideDetail.setFee(BigDecimal.valueOf(separateRespInfo.getSepaPlatStlmAmount() - separateRespInfo.getSepaStlmAmount()));
SepaStatus sepaStatus = SepaStatus.getByValue(separateRespInfo.getSepaStatus());
switch (sepaStatus) {
case SUCCESS -> divideDetail.setStatus(DivideStatus.SUCCESS.getCode());
case FAIL -> divideDetail.setStatus(DivideStatus.FAIL.getCode());
case SUCCESS, PARTIALLY_SUCCESS -> divideDetail.setStatus(DivideStatus.SUCCESS.getCode());
case FAIL, A, C, R, E -> divideDetail.setStatus(DivideStatus.FAIL.getCode());
case PENDING -> divideDetail.setStatus(DivideStatus.PENDING.getCode());
case REFUNDED -> divideDetail.setStatus(DivideStatus.REFUNDED.getCode());
case PROCESSING -> divideDetail.setStatus(DivideStatus.PROCESSING.getCode());
default -> divideDetail.setStatus(DivideStatus.PROCESSING.getCode());
}
updateDetailList.add(divideDetail);