|
|
@@ -67,6 +67,9 @@ public class HuifuController {
|
|
67
|
67
|
String audit_state = (String) jsonObject.get("audit_state");
|
|
68
|
68
|
String order_no = (String) jsonObject.get("order_no");
|
|
69
|
69
|
String settle_account_id = (String) jsonObject.get("id");
|
|
|
70
|
+ if (settle_account_id == null || settle_account_id.isEmpty()) {
|
|
|
71
|
+ settle_account_id = (String) jsonObject.get("settle_account_id");
|
|
|
72
|
+ }
|
|
70
|
73
|
log.info("汇付返回+++++"+jsonObject.toJSONString());
|
|
71
|
74
|
int uid = hfUserOrderDao.selectByOrderNo(order_no);
|
|
72
|
75
|
if(audit_state.equals("A")){ //audit_desc
|
|
|
@@ -138,6 +141,9 @@ public class HuifuController {
|
|
138
|
141
|
String audit_state = (String) jsonObject.get("audit_state");
|
|
139
|
142
|
String order_no = (String) jsonObject.get("order_no");
|
|
140
|
143
|
String settle_account_id = (String) jsonObject.get("id");
|
|
|
144
|
+ if (settle_account_id == null || settle_account_id.isEmpty()) {
|
|
|
145
|
+ settle_account_id = (String) jsonObject.get("settle_account_id");
|
|
|
146
|
+ }
|
|
141
|
147
|
log.info("汇付返回+++++"+jsonObject.toJSONString());
|
|
142
|
148
|
int uid = hfUserOrderDao.selectByOrderNo(order_no);
|
|
143
|
149
|
if(audit_state.equals("A")){ //audit_desc
|
|
|
@@ -208,6 +214,9 @@ public class HuifuController {
|
|
208
|
214
|
String audit_state = (String) jsonObject.get("audit_state");
|
|
209
|
215
|
String order_no = (String) jsonObject.get("order_no");
|
|
210
|
216
|
String settle_account_id = (String) jsonObject.get("id");
|
|
|
217
|
+ if (settle_account_id == null || settle_account_id.isEmpty()) {
|
|
|
218
|
+ settle_account_id = (String) jsonObject.get("settle_account_id");
|
|
|
219
|
+ }
|
|
211
|
220
|
log.info("汇付返回阿里+++++"+jsonObject.toJSONString());
|
|
212
|
221
|
int uid = hfUserOrderDao.selectByOrderNo(order_no);
|
|
213
|
222
|
if(audit_state.equals("A")){ //audit_desc
|