Compare commits

..

No commits in common. "2cc7204c7fa4b8df5ad5ca9f63a393ec3414a133" and "c5532cd2ddc17c4e82816b858776a4f84cc074b1" have entirely different histories.

3 changed files with 83 additions and 69 deletions

View File

@ -1,47 +1,45 @@
-- CREATE OR ALTER FUNCTION pricing.approval_logic;
CREATE OR ALTER FUNCTION pricing.approval_logic( CREATE OR ALTER FUNCTION pricing.approval_logic(
@target numeric(20,5), @target numeric(20,5),
@last_norm numeric(20,5), @last_norm numeric(20,5),
@list_eff numeric(20,5), @list_eff numeric(20,5),
@last_date date, @last_date date,
@floor_pct numeric(10,5) = 0.95, @floor_pct numeric(10,5) = 0.05,
@cap_last_pct numeric(10,5) = 1.00, @cap_last_pct numeric(10,5) = 1.00,
@cap_list_pct numeric(10,5) = 1.00 @cap_list_pct numeric(10,5) = 1.00
) )
RETURNS @ret TABLE ( RETURNS @ret TABLE (
approval_price numeric(20,5), guidance_price numeric(20,5),
approval_reason nvarchar(4000) guidance_reason nvarchar(4000)
) )
AS AS
BEGIN BEGIN
DECLARE DECLARE
@base_price numeric(20,5), -- starting point (target if available, else last_norm, else list_eff) @base_price numeric(20,5),
@after_floor numeric(20,5), -- base but limited to x% lower than last price @after_floor numeric(20,5),
@after_cap_last numeric(20,5), -- previous step but limited to x% higher than last price @after_cap_last numeric(20,5),
@final_price numeric(20,5), -- previous step but limited to x% higher than list price @final_price numeric(20,5),
@reason nvarchar(4000) = N''; -- logic source of price @reason nvarchar(4000) = N'';
-- Early exit if nothing to work with -- no target → early return
IF @target IS NULL AND @last_norm IS NULL AND @list_eff IS NULL IF @target IS NULL
BEGIN BEGIN
INSERT INTO @ret VALUES (NULL, N'No target, last, or list available'); INSERT INTO @ret VALUES (NULL, N'No target price available');
RETURN; RETURN;
END; END;
-- Pick starting base price -- start from target
SET @base_price = COALESCE(@target, @last_norm, @list_eff); SET @base_price = @target;
-- Step 1: use base price unless it's more than x% below last price -- Step 1: floor vs last_norm (only if it raises price)
SET @after_floor = @base_price; SET @after_floor = @base_price;
IF @last_norm IS NOT NULL IF @last_norm IS NOT NULL AND @floor_pct > 0
SET @after_floor = ROUND( SET @after_floor = ROUND(
CASE WHEN @base_price >= @last_norm*@floor_pct CASE WHEN @base_price >= @last_norm*(1-@floor_pct)
THEN @base_price THEN @base_price
ELSE @last_norm*@floor_pct ELSE @last_norm*(1-@floor_pct)
END, 5); END, 5);
-- Step 2: use price from previous step but don't allow it to be x% above last price -- Step 2: cap vs last_norm (only if it lowers price)
SET @after_cap_last = @after_floor; SET @after_cap_last = @after_floor;
IF @last_norm IS NOT NULL IF @last_norm IS NOT NULL
SET @after_cap_last = ROUND( SET @after_cap_last = ROUND(
@ -50,7 +48,7 @@ BEGIN
ELSE @last_norm*@cap_last_pct ELSE @last_norm*@cap_last_pct
END, 5); END, 5);
-- Step 3: use price from last step, but don't allow it to be more than x% above list price -- Step 3: cap vs list_eff (only if it lowers price)
SET @final_price = @after_cap_last; SET @final_price = @after_cap_last;
IF @list_eff IS NOT NULL IF @list_eff IS NOT NULL
SET @final_price = ROUND( SET @final_price = ROUND(
@ -59,23 +57,35 @@ BEGIN
ELSE @list_eff*@cap_list_pct ELSE @list_eff*@cap_list_pct
END, 5); END, 5);
-- Reason text -- Build explanation
SET @reason = IF @last_norm IS NULL AND @list_eff IS NULL
CASE BEGIN
WHEN @target IS NOT NULL THEN N'Using target price' SET @reason = N'No prior sale or list; using target price';
WHEN @last_norm IS NOT NULL THEN N'Using last price as base' END
WHEN @list_eff IS NOT NULL THEN N'Using list price as base' ELSE
END; BEGIN
SET @reason = N'Using target price';
IF @last_norm IS NOT NULL AND @after_floor > @base_price -- mention floor only if it raised the price
SET @reason = N'Last price drop limit'; IF @last_norm IS NOT NULL AND @floor_pct > 0 AND @after_floor > @base_price
SET @reason += N', floored to ' + FORMAT(@floor_pct*100, '0.##') + N'% below last price';
IF @last_norm IS NOT NULL AND @after_cap_last < @after_floor -- mention last cap only if it lowered the price
SET @reason = N'Last price increase limit'; IF @last_norm IS NOT NULL AND @after_cap_last < @after_floor
SET @reason += CASE WHEN @cap_last_pct = 1
THEN N', capped to not exceed last price'
ELSE N', capped to ' + FORMAT(@cap_last_pct*100,'0.##') + N'% of last price'
END;
-- mention list cap only if it lowered the price
IF @list_eff IS NOT NULL AND @final_price < @after_cap_last
SET @reason += CASE WHEN @cap_list_pct = 1
THEN N', capped to not exceed list price'
ELSE N', capped to ' + FORMAT(@cap_list_pct*100,'0.##') + N'% of list price'
END;
END;
IF @list_eff IS NOT NULL AND @final_price < @after_cap_last
SET @reason = N'List price ceiling';
INSERT INTO @ret VALUES (@final_price, @reason); INSERT INTO @ret VALUES (@final_price, @reason);
RETURN; RETURN;
END; END;

View File

@ -31,6 +31,34 @@ BEGIN
-- Pick starting base price -- Pick starting base price
SET @base_price = COALESCE(@target, @last_norm, @list_eff); SET @base_price = COALESCE(@target, @last_norm, @list_eff);
-- Step 1: use base price unless it's more than x% below last price
SET @after_floor = @base_price;
IF @last_norm IS NOT NULL
SET @after_floor = ROUND(
CASE WHEN @base_price >= @last_norm*@floor_pct
THEN @base_price
ELSE @last_norm*@floor_pct
END, 5);
-- Step 2: use price from previous step but don't allow it to be x% above last price
SET @after_cap_last = @after_floor;
IF @last_norm IS NOT NULL
SET @after_cap_last = ROUND(
CASE WHEN @after_floor <= @last_norm*@cap_last_pct
THEN @after_floor
ELSE @last_norm*@cap_last_pct
END, 5);
-- Step 3: use price from last step, but don't allow it to be more than x% above list price
SET @final_price = @after_cap_last;
IF @list_eff IS NOT NULL
SET @final_price = ROUND(
CASE WHEN @after_cap_last <= @list_eff*@cap_list_pct
THEN @after_cap_last
ELSE @list_eff*@cap_list_pct
END, 5);
-- Reason text -- Reason text
SET @reason = SET @reason =
CASE CASE
@ -39,22 +67,14 @@ BEGIN
WHEN @list_eff IS NOT NULL THEN N'Using list price as base' WHEN @list_eff IS NOT NULL THEN N'Using list price as base'
END; END;
-- Step 1: use base price less than last price, use last price IF @last_norm IS NOT NULL AND @after_floor > @base_price
IF @base_price < @last_norm SET @reason = N'Last price drop limit';
BEGIN
SET @base_price = @last_norm;
SET @reason = N'Last price';
END
-- Step 2: use price from previous step but don't allow it to be x% above last price IF @last_norm IS NOT NULL AND @after_cap_last < @after_floor
IF @base_price > @list_eff SET @reason = N'Last price increase limit';
BEGIN
SET @base_price = @list_eff; IF @list_eff IS NOT NULL AND @final_price < @after_cap_last
SET @reason = N'List price ceiling'; SET @reason = N'List price ceiling';
END
SET @final_price = @base_price;
INSERT INTO @ret VALUES (@final_price, @reason); INSERT INTO @ret VALUES (@final_price, @reason);
RETURN; RETURN;

View File

@ -136,8 +136,8 @@ BEGIN
------------step 6 compute guidance------------ ------------step 6 compute guidance------------
guidance_price NUMERIC(20,5), guidance_price NUMERIC(20,5),
guidance_reason NVARCHAR(MAX), guidance_reason NVARCHAR(MAX),
approval_price NUMERIC(20,5), shown_price NUMERIC(20,5),
approval_reason NVARCHAR(MAX), shown_logic NVARCHAR(MAX),
------------step 7 build json------------------ ------------step 7 build json------------------
expl NVARCHAR(MAX), expl NVARCHAR(MAX),
ui_json NVARCHAR(MAX) ui_json NVARCHAR(MAX)
@ -379,8 +379,6 @@ BEGIN
SET SET
guidance_price = g.guidance_price guidance_price = g.guidance_price
,guidance_reason = g.guidance_reason ,guidance_reason = g.guidance_reason
,approval_price = a.approval_price
,approval_reason = a.approval_reason
FROM @queue q FROM @queue q
CROSS APPLY pricing.guidance_logic( CROSS APPLY pricing.guidance_logic(
TRY_CAST(q.tprice AS NUMERIC(20,5)), TRY_CAST(q.tprice AS NUMERIC(20,5)),
@ -393,19 +391,7 @@ BEGIN
1.0, 1.0,
--cap on list percent --cap on list percent
1.0 1.0
) g ) g;
CROSS APPLY pricing.approval_logic(
TRY_CAST(q.tprice AS NUMERIC(20,5)),
TRY_CAST(q.last_price_norm AS NUMERIC(20,5)),
TRY_CAST(q.listprice_eff AS NUMERIC(20,5)),
TRY_CAST(q.last_date AS DATE),
--allowable price drop percent
.95,
--cap on last price
1.0,
--cap on list percent
1.0
) a;
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
-- Step 8: Assemble structured 'expl' JSON from populated columns. -- Step 8: Assemble structured 'expl' JSON from populated columns.
@ -452,8 +438,6 @@ BEGIN
,q.list_relevance AS list_relevance ,q.list_relevance AS list_relevance
,q.guidance_price AS guidance_price ,q.guidance_price AS guidance_price
,q.guidance_reason AS guidance_reason ,q.guidance_reason AS guidance_reason
,q.approval_price AS approval_price
,q.approval_reason AS approval_reason
-- JSON_QUERY(hist) AS [history] -- JSON_QUERY(hist) AS [history]
FOR JSON PATH, WITHOUT_ARRAY_WRAPPER FOR JSON PATH, WITHOUT_ARRAY_WRAPPER
) )