czg_team/chaozhanggui
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/super-shopkeeper/chaozhanggui

Browse Source
This commit is contained in:
liuyingfang
2023-06-17 15:20:44 +08:00
parent d5b9107c6e d22b69d8c0
commit df19a15049
7 changed files with 965 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantChannelStatus.java
View File

@@ -349,7 +349,7 @@ public class MerchantChannelStatus {
String status = merchantChannelStatus.getStatus();
String thirdStatus = merchantChannelStatus.getThirdStatus();
if (!MerchantChannelStatus.AUDIT_STATUS_EXAMINING.equals(status) || !AUDIT_THIRD_STATUS_WAITING.equals(thirdStatus)) {
if (MerchantChannelStatus.AUDIT_STATUS_REJECT.equals(status)||!MerchantChannelStatus.AUDIT_STATUS_EXAMINING.equals(status) || !AUDIT_THIRD_STATUS_WAITING.equals(thirdStatus)) {
MsgException.throwException("不符合商户审核条件");
}
}