diff --git a/.drone.yml b/.drone.yml index c55c31a..09d55d9 100644 --- a/.drone.yml +++ b/.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 diff --git a/internal/controllers/getController.go b/internal/controllers/getController.go index fd91db5..5aeb226 100644 --- a/internal/controllers/getController.go +++ b/internal/controllers/getController.go @@ -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" diff --git a/views/order_info.html b/views/order_info.html index 3508b43..2d14b14 100644 --- a/views/order_info.html +++ b/views/order_info.html @@ -118,7 +118,11 @@