feat(views/order_info): 在订单信息页面中新增轮询订单号字段并更新相关逻辑

- 在订单信息页面中添加了轮询订单号输入框，增强了用户输入的灵活性。
- 更新了获取订单的逻辑，确保轮询订单号能够正确传递并处理。
- 优化了前端请求的 URL，确保数据获取的准确性。

internal/controllers/getController.go

@@ -746,6 +746,7 @@ func (c *GetController) GetOrder() {
 	freeStatus := strings.TrimSpace(c.GetString("freeStatus"))
 	cardData := strings.TrimSpace(c.GetString("cardData"))
 	roadUid := strings.TrimSpace(c.GetString("roadUid"))
+	poolCodeId := strings.TrimSpace(c.GetString("poolCodeId"))
 
 	params := make(map[string]string)
 	params["create_time__gte"] = startTime
@@ -758,6 +759,8 @@ func (c *GetController) GetOrder() {
 	params["pay_type_code"] = payWayCode
 	params["ex_value__icontains"] = cardData
 	params["road_uid"] = roadUid
+	params["pool_order_id__icontains"] = poolCodeId
+
 	switch freeStatus {
 	case "free":
 		params["free"] = "yes"

views/order_info.html

@@ -72,6 +72,10 @@
                 <span>商户订单号：</span>
                 <input id="search-order-merchant-order-id" type="text" value="">
             </label>
+            <label for="">
+                <span>轮询订单号：</span>
+                <input id="search-order-pool-code" type="text" value="">
+            </label>
             <label>
                 <span>本系统订单号：</span>
                 <input id="search-order-bank-order-id" type="text" value="">
@@ -86,10 +90,15 @@
                     <option value="cancel">放弃支付</option>
                 </select>
             </label>
-            <label for="">
+            <!-- <label for="">
                 上游名称：
                 <select id="search-order-supplier-name" name="">
                 </select>
+            </label> -->
+            <label for="">
+                通道名称：
+                <select id="search-order-road-name" name="">
+                </select>
             </label>
             <!--        <label for="">-->
             <!--            支付类型：-->
@@ -394,7 +403,7 @@
     //将上游通道供应商写入
     function setSupplier() {
         $.ajax({
-            url: "get/all/road",
+            url: "/get/product",
             success: function (res) {
                 if (res.Code === 404) {
                     window.parent.location = "/login.html";
@@ -402,9 +411,9 @@
                     alert("没有获取到上游供应商数据");
                 } else {
                     let str = '<option value="' + "" + '">' + "请选择" + '</option>';
-                    for (let i = 0; i < res.RoadInfoList.length; i++) {
+                    for (let key in res.ProductMap) {
-                        let v = res.RoadInfoList[i];
+                        let v = res.ProductMap[key];
-                        str = str + '<option value="' + v.RoadUid + '">' + v.RoadName + '</option>'
+                        str = str + '<option value="' + key + '">' + v + '</option>'
                     }
                     $("#search-order-supplier-name").html(str);
                 }
@@ -415,6 +424,29 @@
         });
     }
 
+    function setRoadInfo() {
+        $.ajax({
+            url: "/get/all/road",
+            success: function (res) {
+                if (res.Code === 404) {
+                    window.parent.location = "/login.html";
+                } else if (res.Code === -1) {
+                    alert("没有获取到上游供应商数据");
+                } else {
+                    let str = '<option value="' + "" + '">' + "请选择" + '</option>';
+                    for (let key in res.RoadInfoList) {
+                        let v = res.RoadInfoList[key];
+                        str = str + '<option value="' + v.RoadUid + '">' + v.RoadName + '</option>'
+                    }
+                    $("#search-order-road-name").html(str);
+                }
+            },
+            error: function () {
+                alert("系统异常，请稍后再试1");
+            }
+        });
+    }
+
     //获取搜索去的参数
     function getOrderSearchValues() {
         let displayCount = $("#display_count").val();
@@ -426,9 +458,11 @@
         let merchantName = $("#search-order-merchant-name").val();
         let cardData = $("#search-order-card-data").val();
         let merchantOrderId = $("#search-order-merchant-order-id").val();
+        let poolCodeId = $("#search-order-pool-code").val();
         let bankOrderId = $("#search-order-bank-order-id").val();
         let orderStatus = $("#search-order-status").val();
         let supplierUid = $("#search-order-supplier-name").val();
+        let roadUid = $("#search-order-road-name").val();
         let payWayCode = $("#search-order-pay-way-code").val();
         let freeStatus = $("#search-order-free-status").val();
         return {
@@ -445,7 +479,9 @@
             "cardData": cardData,
             "supplierUid": supplierUid,
             "payWayCode": payWayCode,
-            "freeStatus": freeStatus
+            "freeStatus": freeStatus,
+            "roadUid": roadUid,
+            "poolCodeId": poolCodeId
         };
     }
 
@@ -800,7 +836,9 @@
     }
 
     function AjaxOrderList(dataJSON) {
-        dataJSON["roadUid"] = "{{.roadUid}}"
+        if (dataJSON["roadUid"] === "") {
+            dataJSON["roadUid"] = "{{.roadUid}}"
+        }
         $.ajax({
             url: "/get/order",
             data: dataJSON,
@@ -888,6 +926,7 @@
         let s = dateFtt("yyyy-MM-dd hh:mm:ss", day);
         $("#search-order-start-time").val();
         setSupplier();
+        setRoadInfo();
         let dataJSON = getOrderSearchValues();
         AjaxOrderList(dataJSON);
     });