Merge #68 into master from cc_20260313_ws_wallet
网商钱包分账对接
* cc_20260313_ws_wallet: (9 commits squashed)
- fix:新店开通网商钱包
- fix:网商钱包开通回调修改
- fix
- fix
- fix:关闭网商开通回调接口验签
- Merge branch 'master' into cc_20260313_ws_wallet
# Conflicts:
#	coolstore-partner-service/src/main/java/com/cool/store/service/wallet/WalletService.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/wallet/impl/WalletServiceImpl.java
#	coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniWalletController.java
- fix:钱包批量转账新增钱包类型字段
- fix:网商钱包分账对接
- fix
Signed-off-by: 王非凡 <accounts_67eba0c5fee9c49c80c8e2b4@mail.teambition.com>
Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>
CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/68
This commit is contained in:
@@ -18,7 +18,8 @@ public enum AllocationPayStatusEnum {
|
||||
PAID(1, "已支付"),
|
||||
FAIL(2, "支付失败"),
|
||||
PAYING(3, "支付中"),
|
||||
CANCEL(4, "已取消")
|
||||
CANCEL(4, "已取消"),
|
||||
UNPAID(5, "未支付"),
|
||||
;
|
||||
|
||||
private final Integer status;
|
||||
|
||||
Reference in New Issue
Block a user