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

Compare commits

base: czg_team:f4e82e9952f56df247dee0691bb40f108f34ee17
Branches Tags
czg_team:master czg_team:test czg_team:prod czg_team:dev czg_team:pay czg_team:backup-250910
...
compare: czg_team:3537cf4dbde69e6947c429679254fad19581dadd
Branches Tags
czg_team:test czg_team:prod czg_team:dev czg_team:pay czg_team:backup-250910 czg_team:master

2 Commits
f4e82e9952 ... 3537cf4dbd

Author SHA1 Message Date
wangw
3537cf4dbd Merge remote-tracking branch 'origin/pay' into pay 2026-01-08 17:01:47 +08:00
wangw
c7b13dcf6b 查询 2026-01-08 17:01:36 +08:00
1 changed files with 4 additions and 4 deletions
Expand all files Collapse all files

8
cash-api/order-server/src/main/java/com/czg/task/EntryManagerTask.java
View File

@@ -60,8 +60,8 @@ public class EntryManagerTask {
for (ShopDirectMerchant shopDirectMerchant : list) {
String wechatMerchantId = "";
String alipayMerchantId = "";
if (PayCst.EntryStatus.NEED_QUERY_LIST.contains(shopDirectMerchant.getWechatStatus())) {
QueryStatusResp wechatStatus = EntryManager.queryWechatEntryStatus(shopDirectMerchant.getMerchantCode());
if (PayCst.EntryStatus.NEED_QUERY_LIST.contains(shopDirectMerchant.getWechatStatus()) && StrUtil.isNotBlank(shopDirectMerchant.getWechatApplyId())) {
QueryStatusResp wechatStatus = EntryManager.queryWechatEntryStatus(shopDirectMerchant.getWechatApplyId());
shopDirectMerchant.setWechatStatus(wechatStatus.getStatus());
shopDirectMerchant.setWechatErrorMsg(wechatStatus.getFailReason());
shopDirectMerchant.setWechatSignUrl(wechatStatus.getSignUrl());
@@ -69,8 +69,8 @@ public class EntryManagerTask {
wechatMerchantId = wechatStatus.getThirdMerchantId();
}
}
if (PayCst.EntryStatus.NEED_QUERY_LIST.contains(shopDirectMerchant.getAlipayStatus())) {
QueryStatusResp alipayStatus = EntryManager.queryAlipayEntryStatus(shopDirectMerchant.getMerchantCode());
if (PayCst.EntryStatus.NEED_QUERY_LIST.contains(shopDirectMerchant.getAlipayStatus()) && StrUtil.isNotBlank(shopDirectMerchant.getAlipayOrderId())) {
QueryStatusResp alipayStatus = EntryManager.queryAlipayEntryStatus(shopDirectMerchant.getAlipayOrderId());
shopDirectMerchant.setAlipayStatus(alipayStatus.getStatus());
shopDirectMerchant.setAlipayErrorMsg(alipayStatus.getFailReason());
shopDirectMerchant.setAlipaySignUrl(alipayStatus.getSignUrl());