Merge branch 'main' into dev
This commit is contained in:
@@ -288,6 +288,7 @@ export type WorkProductRuleRow = {
|
||||
auto_create: boolean
|
||||
reward_amount: number
|
||||
unit_price_fen: number
|
||||
pricing_mode: 'fixed' | 'unit'
|
||||
required_deposit_amount: number
|
||||
deposit_threshold_amount: number
|
||||
sharing_enabled: boolean
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
import type { PoolClient } from 'pg'
|
||||
|
||||
import { query, withTransaction } from '../../db/client.js'
|
||||
import { toPositiveInteger } from './shared.js'
|
||||
import {
|
||||
@@ -354,6 +356,7 @@ export async function upsertWorkProductRule(input: {
|
||||
autoCreate: boolean
|
||||
rewardAmount: number
|
||||
unitPriceFen?: number
|
||||
pricingMode: 'fixed' | 'unit'
|
||||
requiredDepositAmount: number
|
||||
depositThresholdAmount: number
|
||||
sharingEnabled?: boolean
|
||||
@@ -369,8 +372,10 @@ export async function upsertWorkProductRule(input: {
|
||||
matchJson?: string
|
||||
sortOrder: number
|
||||
now: string
|
||||
client?: Pick<PoolClient, 'query'>
|
||||
}): Promise<WorkProductRuleRow | null> {
|
||||
const result = await query<WorkProductRuleRow>(
|
||||
const db = input.client || { query }
|
||||
const result = await db.query<WorkProductRuleRow>(
|
||||
`
|
||||
INSERT INTO work_product_rules (
|
||||
rule_key, provider, platform, shop_id, sku_code, product_name,
|
||||
@@ -381,7 +386,7 @@ export async function upsertWorkProductRule(input: {
|
||||
timeout_minutes, timeout_policy,
|
||||
acceptance_mode, gift_cooldown_hours, gift_cooldown_minutes,
|
||||
requirement_json, match_json,
|
||||
sort_order, created_at, updated_at
|
||||
sort_order, pricing_mode, created_at, updated_at
|
||||
) VALUES (
|
||||
$1, $2, $3, $4, $5, $6,
|
||||
$7, $8, $9, $10, $11,
|
||||
@@ -391,7 +396,7 @@ export async function upsertWorkProductRule(input: {
|
||||
$19, $20,
|
||||
$21, $22, $23,
|
||||
$24::jsonb, $25::jsonb,
|
||||
$26, $27, $28
|
||||
$26, $27, $28, $29
|
||||
)
|
||||
ON CONFLICT (rule_key) DO UPDATE
|
||||
SET
|
||||
@@ -420,6 +425,7 @@ export async function upsertWorkProductRule(input: {
|
||||
requirement_json = EXCLUDED.requirement_json,
|
||||
match_json = EXCLUDED.match_json,
|
||||
sort_order = EXCLUDED.sort_order,
|
||||
pricing_mode = EXCLUDED.pricing_mode,
|
||||
updated_at = EXCLUDED.updated_at
|
||||
RETURNING *
|
||||
`,
|
||||
@@ -450,9 +456,15 @@ export async function upsertWorkProductRule(input: {
|
||||
input.requirementJson,
|
||||
input.matchJson || '{}',
|
||||
input.sortOrder,
|
||||
input.pricingMode,
|
||||
input.now,
|
||||
input.now,
|
||||
],
|
||||
)
|
||||
return getWorkProductRuleByKey(result.rows[0]?.rule_key || input.ruleKey)
|
||||
const ruleKey = result.rows[0]?.rule_key || input.ruleKey
|
||||
const selected = await db.query<WorkProductRuleRow>(
|
||||
`${WORK_PRODUCT_RULE_SELECT} WHERE wpr.rule_key = $1 LIMIT 1`,
|
||||
[ruleKey],
|
||||
)
|
||||
return selected.rows[0] || null
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user