Quellcode durchsuchen

加强参数安全

sunxbiao vor 1 Jahr
Ursprung
Commit
1f621a5a2c

+ 9 - 0
merchant_service/src/main/java/com/bjtdba/merchant/controller/HuifuController.java

@@ -67,6 +67,9 @@ public class HuifuController {
67
                 String audit_state = (String) jsonObject.get("audit_state");
67
                 String audit_state = (String) jsonObject.get("audit_state");
68
                 String order_no = (String) jsonObject.get("order_no");
68
                 String order_no = (String) jsonObject.get("order_no");
69
                 String settle_account_id = (String) jsonObject.get("id");
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
                 log.info("汇付返回+++++"+jsonObject.toJSONString());
73
                 log.info("汇付返回+++++"+jsonObject.toJSONString());
71
                 int uid =  hfUserOrderDao.selectByOrderNo(order_no);
74
                 int uid =  hfUserOrderDao.selectByOrderNo(order_no);
72
                 if(audit_state.equals("A")){  //audit_desc
75
                 if(audit_state.equals("A")){  //audit_desc
@@ -138,6 +141,9 @@ public class HuifuController {
138
                 String audit_state = (String) jsonObject.get("audit_state");
141
                 String audit_state = (String) jsonObject.get("audit_state");
139
                 String order_no = (String) jsonObject.get("order_no");
142
                 String order_no = (String) jsonObject.get("order_no");
140
                 String settle_account_id = (String) jsonObject.get("id");
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
                 log.info("汇付返回+++++"+jsonObject.toJSONString());
147
                 log.info("汇付返回+++++"+jsonObject.toJSONString());
142
                 int uid =  hfUserOrderDao.selectByOrderNo(order_no);
148
                 int uid =  hfUserOrderDao.selectByOrderNo(order_no);
143
                 if(audit_state.equals("A")){  //audit_desc
149
                 if(audit_state.equals("A")){  //audit_desc
@@ -208,6 +214,9 @@ public class HuifuController {
208
                 String audit_state = (String) jsonObject.get("audit_state");
214
                 String audit_state = (String) jsonObject.get("audit_state");
209
                 String order_no = (String) jsonObject.get("order_no");
215
                 String order_no = (String) jsonObject.get("order_no");
210
                 String settle_account_id = (String) jsonObject.get("id");
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
                 log.info("汇付返回阿里+++++"+jsonObject.toJSONString());
220
                 log.info("汇付返回阿里+++++"+jsonObject.toJSONString());
212
                 int uid =  hfUserOrderDao.selectByOrderNo(order_no);
221
                 int uid =  hfUserOrderDao.selectByOrderNo(order_no);
213
                 if(audit_state.equals("A")){  //audit_desc
222
                 if(audit_state.equals("A")){  //audit_desc