feat(order): 添加隐藏重复卡密订单筛选功能
- 在订单查询接口中新增 hideDuplicateCard 参数支持 - 使用 lancet 库进行参数类型转换以判断是否隐藏重复订单 - 修改前端页面筛选表单,将复选框替换为下拉选择框 - 更新 JavaScript 代码以适配新的筛选控件取值方式 - 调整后端逻辑以正确处理布尔值类型的筛选条件 - 注释掉旧的部署脚本配置避免干扰当前构建流程
This commit is contained in:
20
.drone.yml
20
.drone.yml
@@ -26,16 +26,16 @@ steps:
|
||||
- docker push git.oceanpay.cc/danial/kami_boss_${DRONE_BRANCH}:${DRONE_BUILD_NUMBER}
|
||||
- docker push git.oceanpay.cc/danial/kami_boss_${DRONE_BRANCH}:latest
|
||||
- docker logout git.oceanpay.cc
|
||||
- name: deploy to docker compose
|
||||
environment:
|
||||
DOCKER_LOGIN:
|
||||
from_secret: docker_login
|
||||
DOCKER_TOKEN:
|
||||
from_secret: docker_token
|
||||
commands:
|
||||
- docker login git.oceanpay.cc -u $DOCKER_LOGIN -p $DOCKER_TOKEN
|
||||
- BRANCH=${DRONE_BRANCH} VERSION=${DRONE_BUILD_NUMBER} docker compose -f /data/kami/docker-compose.yaml --profile boss up -d
|
||||
- docker logout git.oceanpay.cc
|
||||
# - name: deploy to docker compose
|
||||
# environment:
|
||||
# DOCKER_LOGIN:
|
||||
# from_secret: docker_login
|
||||
# DOCKER_TOKEN:
|
||||
# from_secret: docker_token
|
||||
# commands:
|
||||
# - docker login git.oceanpay.cc -u $DOCKER_LOGIN -p $DOCKER_TOKEN
|
||||
# - BRANCH=${DRONE_BRANCH} VERSION=${DRONE_BUILD_NUMBER} docker compose -f /data/kami/docker-compose.yaml --profile boss up -d
|
||||
# - docker logout git.oceanpay.cc
|
||||
trigger:
|
||||
branch:
|
||||
- develop
|
||||
|
||||
@@ -15,6 +15,7 @@ import (
|
||||
"boss/internal/service"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"github.com/duke-git/lancet/v2/convertor"
|
||||
"sort"
|
||||
"strings"
|
||||
"time"
|
||||
@@ -777,6 +778,7 @@ func (c *GetController) GetOrder() {
|
||||
roadUid := strings.TrimSpace(c.GetString("roadUid"))
|
||||
poolCodeId := strings.TrimSpace(c.GetString("poolCodeId"))
|
||||
message := strings.TrimSpace(c.GetString("message"))
|
||||
hideDuplicateCard := strings.TrimSpace(c.GetString("hideDuplicateCard"))
|
||||
|
||||
params := make(map[string]string)
|
||||
params["create_time__gte"] = startTime
|
||||
@@ -792,6 +794,14 @@ func (c *GetController) GetOrder() {
|
||||
params["pool_order_id__icontains"] = poolCodeId
|
||||
params["card_return_data__icontains"] = message
|
||||
|
||||
if hideDuplicateCardBool, err := convertor.ToBool(hideDuplicateCard); err != nil {
|
||||
if hideDuplicateCardBool {
|
||||
params["is_replace"] = "1"
|
||||
} else {
|
||||
params["is_replace"] = "0"
|
||||
}
|
||||
}
|
||||
|
||||
switch freeStatus {
|
||||
case "free":
|
||||
params["free"] = "yes"
|
||||
@@ -936,7 +946,14 @@ func (c *GetController) GetOrderSummary() {
|
||||
params["ex_value__icontains"] = cardData
|
||||
params["road_uid"] = roadUid
|
||||
params["card_return_data__icontains"] = message
|
||||
|
||||
hideDuplicateCard := strings.TrimSpace(c.GetString("hideDuplicateCard"))
|
||||
if hideDuplicateCardBool, err := convertor.ToBool(hideDuplicateCard); err != nil {
|
||||
if hideDuplicateCardBool {
|
||||
params["is_replace"] = "1"
|
||||
} else {
|
||||
params["is_replace"] = "0"
|
||||
}
|
||||
}
|
||||
switch freeStatus {
|
||||
case "free":
|
||||
params["free"] = "yes"
|
||||
|
||||
@@ -118,7 +118,11 @@
|
||||
</label>
|
||||
<label for="">
|
||||
<span>隐藏卡密重复订单:</span>
|
||||
<input id="search-hide-duplicate-card" type="checkbox" value="false"/>
|
||||
<select id="search-hide-duplicate-card" name="">
|
||||
<option value="">请选择</option>
|
||||
<option value="true">是</option>
|
||||
<option value="false">否</option>
|
||||
</select>
|
||||
</label>
|
||||
<!-- <label for="">
|
||||
上游名称:
|
||||
@@ -575,7 +579,7 @@
|
||||
let payWayCode = $("#search-order-pay-way-code").val();
|
||||
let freeStatus = $("#search-order-free-status").val();
|
||||
let message = $("#search-order-message").val();
|
||||
let hideDuplicateCard = $("#search-hide-duplicate-card").is(":checked");
|
||||
let hideDuplicateCard = $("#search-hide-duplicate-card").val();
|
||||
return {
|
||||
displayCount: displayCount,
|
||||
currentPage: currentPage,
|
||||
|
||||
Reference in New Issue
Block a user