diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index f982997..1d0c38a 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -76,28 +76,20 @@ jobs: docker: needs: changes runs-on: runner + name: ${{ matrix.name }} strategy: fail-fast: false matrix: - include: - - name: bff - dockerfile: bff/Dockerfile - - name: product - dockerfile: services/product/Dockerfile - - name: admin - dockerfile: services/admin/Dockerfile - - name: user - dockerfile: services/user/Dockerfile - - name: ad - dockerfile: services/ad/Dockerfile - - name: chore - dockerfile: services/chore/Dockerfile - - name: express - dockerfile: services/express/Dockerfile - - name: sale - dockerfile: services/sale/Dockerfile - - name: wecom - dockerfile: services/wecom/Dockerfile + name: + - bff + - product + - admin + - user + - ad + - chore + - express + - sale + - wecom env: BUILD_LIST: ${{ needs.changes.outputs.build_list }} NAME: lone/${{ matrix.name }} @@ -124,8 +116,12 @@ jobs: - name: Docker build if: steps.check.outputs.build == 'yes' run: | + case "${{ matrix.name }}" in + bff) dockerfile="bff/Dockerfile" ;; + *) dockerfile="services/${{ matrix.name }}/Dockerfile" ;; + esac docker buildx use default - docker buildx build --builder default --load -f "${{ matrix.dockerfile }}" -t "${{ vars.REGISTRY }}/$NAME:latest" . + docker buildx build --builder default --load -f "$dockerfile" -t "${{ vars.REGISTRY }}/$NAME:latest" . - name: Docker push if: steps.check.outputs.build == 'yes' diff --git a/README.md b/README.md index 8388bf7..393cc34 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,8 @@ rpc/scripts/gen-rpc.sh order 3.nacos 加配置 4.增加 etc/order.yaml 配置文件 5.Dockerfile 文件 -6.gitea 配置,修改这行。SERVICES="bff product admin user ad chore express sale wecom" +6.changes 里的 SERVICES="..." + docker.strategy.matrix.include 加一行 { name: xxx, dockerfile: services/xxx/Dockerfile } ``` diff --git a/services/product/internal/logic/convert.go b/services/product/internal/logic/convert.go index 177434d..db70b38 100644 --- a/services/product/internal/logic/convert.go +++ b/services/product/internal/logic/convert.go @@ -22,16 +22,16 @@ func toProductItem(row dao.Info) *product.Item { Subhead: row.Subhead, Content: row.Content, ModelCode: row.ModelCode, - Price: float64(row.Price), - StorePrice: float64(row.StorePrice), - SalePrice: float64(row.SalePrice), - SharePrice: float64(row.SharePrice), - AgentPrice: float64(row.AgentPrice), + Price: utils.RoundFloat(float64(row.Price)), + StorePrice: utils.RoundFloat(float64(row.StorePrice)), + SalePrice: utils.RoundFloat(float64(row.SalePrice)), + SharePrice: utils.RoundFloat(float64(row.SharePrice)), + AgentPrice: utils.RoundFloat(float64(row.AgentPrice)), SaleReward: row.SaleReward, SalesModel: uint32(row.SalesModel), Waybill: row.Waybill, Status: uint32(row.Status), - Weight: float64(row.Weight), + Weight: utils.RoundFloat(float64(row.Weight)), IsIndex: uint32(row.IsIndex), IndexImage: row.IndexImage, Cubage: row.Cubage,