lisang
/
jeepay
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
xiaoyu 2022-02-09 17:54:54 +08:00
parent bdcb71005b 137db44117
commit 2e62a74513
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
jeepay-payment/src/main/java/com/jeequan/jeepay/pay/service/PayOrderDivisionProcessService.java
View File

@ -90,14 +90,10 @@ public class PayOrderDivisionProcessService {
throw new BizException("订单不存在");
}
// 订单不是成功状态 || 分账状态不正确
if(payOrder.getState() != PayOrder.STATE_SUCCESS ||
(
payOrder.getDivisionState() != PayOrder.DIVISION_STATE_WAIT_TASK
&& payOrder.getDivisionState() != PayOrder.DIVISION_STATE_UNHAPPEN
)){
log.error("{}, 订单状态或分账状态不正确", logPrefix);
throw new BizException("订单状态或分账状态不正确");
// 分账状态不正确
if(payOrder.getDivisionState() != PayOrder.DIVISION_STATE_WAIT_TASK && payOrder.getDivisionState() != PayOrder.DIVISION_STATE_UNHAPPEN){
log.error("{}, 分账状态不正确", logPrefix);
throw new BizException("分账状态不正确");
}
//更新订单为： 分账任务处理中

2
jeepay-z-codegen/pom.xml
View File

@ -23,7 +23,7 @@
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>8.0.18</version>
<version>8.0.28</version>
</dependency>
<dependency>