From 0b8ac4a192188d123a2b0381ed6a1017e7b0b9d9 Mon Sep 17 00:00:00 2001 From: kanade Date: Thu, 24 Nov 2022 14:33:39 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8F=96=E6=B6=88=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/.drone.yml b/.drone.yml index 94439a2..84dbdc7 100644 --- a/.drone.yml +++ b/.drone.yml @@ -63,19 +63,6 @@ steps: - echo "172.31.211.15 git.oa00.com" >> /etc/hosts - git clone $DRONE_REMOTE_URL . - git checkout $DRONE_COMMIT - - name: restore-cache - image: meltwater/drone-cache - settings: - backend: filesystem - restore: true - cache_key: "gomod" - archive_format: gzip - filesystem_cache_root: "/var/lib/cache" - mount: - - 'mod.pkg' - volumes: - - name: cache - path: "/var/lib/cache" # Do stuff.. - name: build image: golang:1.16-alpine3.13 @@ -83,19 +70,6 @@ steps: GOMODCACHE: '/drone/src/mod.pkg' commands: - GOPROXY=https://goproxy.cn GOSUMDB=off CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -ldflags "-X recook/configs.environment=debug" -tags=jsoniter -v -o ./bin/server ./main.go - - name: rebuild-cache - image: meltwater/drone-cache - settings: - backend: filesystem - rebuild: true - cache_key: "gomod" - archive_format: gzip - filesystem_cache_root: "/var/lib/cache" - mount: - - 'mod.pkg' - volumes: - - name: cache - path: "/var/lib/cache" - name: docker image: plugins/docker settings: @@ -108,10 +82,6 @@ steps: from_secret: docker_password tags: - latest -volumes: - - name: cache - host: - path: "/tmp/cache" trigger: branch: - test From 2067466251a723817928ecb7a8fc96beb7004a5e Mon Sep 17 00:00:00 2001 From: kanade Date: Fri, 25 Nov 2022 13:20:31 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/api/mobile/pay/wxpay/query.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/internal/api/mobile/pay/wxpay/query.go b/internal/api/mobile/pay/wxpay/query.go index 45cab2f..4dc2f95 100755 --- a/internal/api/mobile/pay/wxpay/query.go +++ b/internal/api/mobile/pay/wxpay/query.go @@ -64,6 +64,15 @@ func QueryOrderPay(c *gin.Context) { if orderInfo.Status == 1 || orderInfo.Status == 0 { back.Suc(c, "", map[string]interface{}{"status": orderInfo.Status}) } else { + if orderInfo.Status == 3 && orderInfo.IsSplit { + if err, status := queryMore(p.OrderID); err != nil { + back.Fail(c, err.Error()) + return + } else { + back.Suc(c, "", map[string]interface{}{"status": status}) + return + } + } back.Fail(c, "当前状态不可查询") } }