fix：“优化汇付订单查询接口"

src/main/java/com/szwl/controller/TOrderController.java

@@ -4892,8 +4892,8 @@ public class TOrderController {
 
     @ApiOperation("汇付查询订单交易结果")
     @GetMapping("/huifuPayQuery")
-    public Object huifuPayQuery(String queryId, String companyType) {
-        return orderService.huifuPayQuery(queryId, companyType);
+    public Object huifuPayQuery(String queryId, String sn, String companyType) {
+        return orderService.huifuPayQuery(queryId, sn, companyType);
     }
 
 }

src/main/java/com/szwl/service/THuifuMchService.java

@@ -72,5 +72,5 @@ public interface THuifuMchService extends IService<THuifuMch> {
      * @param companyType
      * @return
      */
-    JSONObject payQuery(String queryId, String companyType) throws Exception;
+    JSONObject payQuery(String queryId, String sn, String companyType) throws Exception;
 }

src/main/java/com/szwl/service/TOrderService.java

@@ -154,5 +154,5 @@ public interface TOrderService extends IService<TOrder> {
      * @param companyType
      * @return
      */
-    JSONObject huifuPayQuery(String queryId, String companyType);
+    JSONObject huifuPayQuery(String queryId, String sn, String companyType);
 }

src/main/java/com/szwl/service/impl/THuifuMchServiceImpl.java

@@ -377,7 +377,7 @@ public class THuifuMchServiceImpl extends ServiceImpl<THuifuMchMapper, THuifuMch
     }
 
     @Override
-    public JSONObject payQuery(String queryId, String companyType) throws Exception {
+    public JSONObject payQuery(String queryId, String sn,String companyType) throws Exception {
         String url = "https://api.huifu.com/v2/trade/payment/scanpay/query";
         HuifuBaseCommon.doInit(OppsMerchantConfig.getMerchantConfig());
         JSONObject request = new JSONObject();
@@ -387,7 +387,12 @@ public class THuifuMchServiceImpl extends ServiceImpl<THuifuMchMapper, THuifuMch
             request.put("huifu_id", HuifuConstant.SZ_DIV_HUIFU_ID);
         }
         request.put("org_req_date", DateTools.getCurrentDateYYYYMMDD());
-        request.put("org_hf_seq_id", queryId);
+        if (StrUtil.isNotEmpty(queryId)) {
+            request.put("org_hf_seq_id", queryId);
+        }
+        if (StrUtil.isNotEmpty(sn)) {
+            request.put("org_req_seq_id", sn);
+        }
         // 签名：sign
         String s = JSON.toJSONString(request);
         String s1 = JSON.toJSONString(JSONObject.parseObject(s, TreeMap.class));

src/main/java/com/szwl/service/impl/TOrderServiceImpl.java

@@ -1401,10 +1401,10 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
     }
 
     @Override
-    public JSONObject huifuPayQuery(String queryId, String companyType) {
+    public JSONObject huifuPayQuery(String queryId, String sn, String companyType) {
         JSONObject reslut = new JSONObject();
         try {
-            reslut = huifuMchService.payQuery(queryId, companyType);
+            reslut = huifuMchService.payQuery(queryId, sn, companyType);
         } catch (Exception e) {
             e.printStackTrace();
         }