From 3fc91cd2d3852c195344f6b8290a95dc9e818cc9 Mon Sep 17 00:00:00 2001 From: zhenhui <1276357500@qq.com> Date: Mon, 27 Jul 2026 16:52:07 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E5=95=86=E5=93=81=E5=85=91?= =?UTF-8?q?=E6=8D=A2=E9=9C=80=E8=A6=81=E6=B5=81=E6=B0=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/mall/Order.php | 1 - app/api/controller/v1/Playx.php | 17 ---------- app/common/library/MallBonusGrantPush.php | 6 ---- app/common/model/MallItem.php | 1 - app/common/model/MallOrder.php | 2 -- app/process/AngpowImportJobs.php | 2 -- web/src/lang/backend/en/mall/item.ts | 2 -- web/src/lang/backend/en/mall/order.ts | 1 - web/src/lang/backend/en/mall/playxOrder.ts | 1 - web/src/lang/backend/zh-cn/mall/item.ts | 2 -- web/src/lang/backend/zh-cn/mall/order.ts | 1 - web/src/lang/backend/zh-cn/mall/playxOrder.ts | 1 - web/src/views/backend/mall/item/index.vue | 7 ---- web/src/views/backend/mall/item/popupForm.vue | 34 ++----------------- web/src/views/backend/mall/order/index.vue | 1 - .../views/backend/mall/playxOrder/index.vue | 1 - 16 files changed, 2 insertions(+), 78 deletions(-) diff --git a/app/admin/controller/mall/Order.php b/app/admin/controller/mall/Order.php index 776e4ea..1926f88 100644 --- a/app/admin/controller/mall/Order.php +++ b/app/admin/controller/mall/Order.php @@ -36,7 +36,6 @@ class Order extends Backend 'mall_item_id', 'points_cost', 'amount', - 'multiplier', 'external_transaction_id', 'grant_status', 'fail_reason', diff --git a/app/api/controller/v1/Playx.php b/app/api/controller/v1/Playx.php index b8db64a..79167ab 100644 --- a/app/api/controller/v1/Playx.php +++ b/app/api/controller/v1/Playx.php @@ -1004,7 +1004,6 @@ SELECT t.item_type, t.item_score, t.item_amount, - t.item_multiplier, t.item_category, t.item_category_title, t.sort_key @@ -1022,7 +1021,6 @@ FROM ( 0 AS item_type, 0 AS item_score, 0 AS item_amount, - 0 AS item_multiplier, '' AS item_category, '' AS item_category_title, CONCAT(LPAD(cl.create_time, 10, '0'), '_1_', LPAD(cl.id, 10, '0')) AS sort_key @@ -1044,7 +1042,6 @@ FROM ( COALESCE(i.type, 0) AS item_type, COALESCE(i.score, 0) AS item_score, COALESCE(i.amount, 0) AS item_amount, - COALESCE(i.multiplier, 0) AS item_multiplier, COALESCE(i.category, '') AS item_category, COALESCE(i.category_title, '') AS item_category_title, CONCAT(LPAD(o.create_time, 10, '0'), '_2_', LPAD(o.id, 10, '0')) AS sort_key @@ -1067,7 +1064,6 @@ FROM ( COALESCE(i.type, 0) AS item_type, COALESCE(i.score, 0) AS item_score, COALESCE(i.amount, 0) AS item_amount, - COALESCE(i.multiplier, 0) AS item_multiplier, COALESCE(i.category, '') AS item_category, COALESCE(i.category_title, '') AS item_category_title, CONCAT(LPAD(o.update_time, 10, '0'), '_3_', LPAD(o.id, 10, '0')) AS sort_key @@ -1090,7 +1086,6 @@ FROM ( 0 AS item_type, 0 AS item_score, 0 AS item_amount, - 0 AS item_multiplier, '' AS item_category, '' AS item_category_title, CONCAT(LPAD(pl.create_time, 10, '0'), '_4_', LPAD(pl.id, 10, '0')) AS sort_key @@ -1158,7 +1153,6 @@ SQL; 'type' => $row['item_type'] ?? 0, 'score' => $row['item_score'] ?? 0, 'amount' => $row['item_amount'] ?? 0, - 'multiplier' => $row['item_multiplier'] ?? 0, 'category' => $row['item_category'] ?? '', 'category_title' => $row['item_category_title'] ?? '', ] : null, @@ -1420,10 +1414,6 @@ SQL; } $playxUserId = strval($asset->playx_user_id); - $multiplier = intval($item->multiplier ?? 0); - if ($multiplier <= 0) { - $multiplier = 1; - } $amount = floatval($item->amount ?? 0); Db::startTrans(); @@ -1439,7 +1429,6 @@ SQL; 'mall_item_id' => $item->id, 'points_cost' => $item->score, 'amount' => $amount, - 'multiplier' => $multiplier, 'external_transaction_id' => $orderNo, 'grant_status' => MallOrder::GRANT_NOT_SENT, 'create_time' => time(), @@ -1566,10 +1555,6 @@ SQL; } $playxUserId = strval($asset->playx_user_id); - $multiplier = intval($item->multiplier ?? 0); - if ($multiplier <= 0) { - $multiplier = 1; - } $amount = floatval($item->amount ?? 0); Db::startTrans(); @@ -1585,7 +1570,6 @@ SQL; 'mall_item_id' => $item->id, 'points_cost' => $item->score, 'amount' => $amount, - 'multiplier' => $multiplier, 'external_transaction_id' => $orderNo, 'grant_status' => MallOrder::GRANT_NOT_APPLICABLE, 'create_time' => time(), @@ -1692,7 +1676,6 @@ SQL; 'rewardName' => $item->title ?? '', 'category' => $item->category ?? 'daily', 'categoryTitle' => $item->category_title ?? '', - 'multiplier' => $order->multiplier, ], ]); $data = json_decode(strval($res->getBody()), true); diff --git a/app/common/library/MallBonusGrantPush.php b/app/common/library/MallBonusGrantPush.php index 1c97278..2e5bbff 100644 --- a/app/common/library/MallBonusGrantPush.php +++ b/app/common/library/MallBonusGrantPush.php @@ -77,10 +77,6 @@ final class MallBonusGrantPush $start = gmdate('Y-m-d\TH:i:s\Z', strtotime(strval($order->start_time))); $end = gmdate('Y-m-d\TH:i:s\Z', strtotime(strval($order->end_time))); - $multiplier = intval($order->multiplier ?? 0); - if ($multiplier <= 0) { - $multiplier = 1; - } $payload = [ 'merchant_code' => $merchantCode, @@ -96,8 +92,6 @@ final class MallBonusGrantPush 'member_inbox_message' => 'Congratulations! You received an angpow.', 'category' => strval($item->category ?? ''), 'category_title' => strval($item->category_title ?? ''), - 'one_time_turnover' => 'yes', - 'multiplier' => $multiplier, ], ], 'currency_visual' => [ diff --git a/app/common/model/MallItem.php b/app/common/model/MallItem.php index e57c376..c2ef450 100644 --- a/app/common/model/MallItem.php +++ b/app/common/model/MallItem.php @@ -29,7 +29,6 @@ class MallItem extends Model 'create_time' => 'integer', 'update_time' => 'integer', 'amount' => 'float', - 'multiplier' => 'integer', ]; public function admin(): \think\model\relation\BelongsTo diff --git a/app/common/model/MallOrder.php b/app/common/model/MallOrder.php index e272371..4a3d6ec 100644 --- a/app/common/model/MallOrder.php +++ b/app/common/model/MallOrder.php @@ -16,7 +16,6 @@ use support\think\Model; * @property int $mall_item_id * @property int $points_cost * @property float $amount - * @property int $multiplier * @property string $external_transaction_id * @property string $grant_status * @property string|null $fail_reason @@ -58,7 +57,6 @@ class MallOrder extends Model 'update_time' => 'integer', 'points_cost' => 'integer', 'amount' => 'float', - 'multiplier' => 'integer', 'retry_count' => 'integer', 'mall_address_id' => 'integer', ]; diff --git a/app/process/AngpowImportJobs.php b/app/process/AngpowImportJobs.php index 6244924..c093b3f 100644 --- a/app/process/AngpowImportJobs.php +++ b/app/process/AngpowImportJobs.php @@ -281,8 +281,6 @@ class AngpowImportJobs 'member_inbox_message' => 'Congratulations! You received an angpow.', 'category' => strval($item->category ?? ''), 'category_title' => strval($item->category_title ?? ''), - 'one_time_turnover' => 'yes', - 'multiplier' => $order->multiplier, ]; } diff --git a/web/src/lang/backend/en/mall/item.ts b/web/src/lang/backend/en/mall/item.ts index 77224b5..8031d32 100644 --- a/web/src/lang/backend/en/mall/item.ts +++ b/web/src/lang/backend/en/mall/item.ts @@ -19,8 +19,6 @@ export default { amount_apply_suggested: 'Use suggested amount', amount_ratio_missing: 'Mall points-to-cash reference ratio is unavailable; enter cash amount manually.', points_to_cash_ratio_label: 'Reference ratio', - multiplier: 'Turnover multiplier', - multiplier_tip: 'Turnover requirement sent with bonus/withdraw grant.', category: 'Category', category_title: 'Category title', admin_id: 'Created by', diff --git a/web/src/lang/backend/en/mall/order.ts b/web/src/lang/backend/en/mall/order.ts index af511ba..959e8ca 100644 --- a/web/src/lang/backend/en/mall/order.ts +++ b/web/src/lang/backend/en/mall/order.ts @@ -17,7 +17,6 @@ export default { mallitem__title: 'Product title', points_cost: 'Points spent', amount: 'Cash amount', - multiplier: 'Turnover multiplier', external_transaction_id: 'Order number', grant_status: 'Grant status', 'grant_status NOT_SENT': 'Not sent', diff --git a/web/src/lang/backend/en/mall/playxOrder.ts b/web/src/lang/backend/en/mall/playxOrder.ts index 8feef78..725f511 100644 --- a/web/src/lang/backend/en/mall/playxOrder.ts +++ b/web/src/lang/backend/en/mall/playxOrder.ts @@ -14,7 +14,6 @@ export default { mallitem__title: 'title', points_cost: 'points_cost', amount: 'amount', - multiplier: 'multiplier', external_transaction_id: 'external_transaction_id', grant_status: 'grant_status', 'grant_status NOT_SENT': 'NOT_SENT', diff --git a/web/src/lang/backend/zh-cn/mall/item.ts b/web/src/lang/backend/zh-cn/mall/item.ts index 8bc7aad..f62d30f 100644 --- a/web/src/lang/backend/zh-cn/mall/item.ts +++ b/web/src/lang/backend/zh-cn/mall/item.ts @@ -19,8 +19,6 @@ export default { amount_apply_suggested: '填入建议金额', amount_ratio_missing: '暂未读取到商城「积分兑现金参考比例」，建议金额无法计算；现金面值请手工填写。', points_to_cash_ratio_label: '当前参考比例', - multiplier: '流水倍数', - multiplier_tip: '红利/提现发放时一并推送的流水倍数要求。', category: '红利业务类别', category_title: '类别展示名', admin_id: '创建管理员', diff --git a/web/src/lang/backend/zh-cn/mall/order.ts b/web/src/lang/backend/zh-cn/mall/order.ts index 6378622..916ef54 100644 --- a/web/src/lang/backend/zh-cn/mall/order.ts +++ b/web/src/lang/backend/zh-cn/mall/order.ts @@ -17,7 +17,6 @@ export default { mallitem__title: '商品标题', points_cost: '消耗积分', amount: '现金面值', - multiplier: '流水倍数', external_transaction_id: '订单号', grant_status: '推送playX状态', 'grant_status NOT_SENT': '未发送', diff --git a/web/src/lang/backend/zh-cn/mall/playxOrder.ts b/web/src/lang/backend/zh-cn/mall/playxOrder.ts index 0b1f585..32880c1 100644 --- a/web/src/lang/backend/zh-cn/mall/playxOrder.ts +++ b/web/src/lang/backend/zh-cn/mall/playxOrder.ts @@ -14,7 +14,6 @@ export default { mallitem__title: '商品标题', points_cost: '消耗积分', amount: '现金面值', - multiplier: '流水倍数', external_transaction_id: '订单号', grant_status: '推送playX状态', 'grant_status NOT_SENT': '未发送', diff --git a/web/src/views/backend/mall/item/index.vue b/web/src/views/backend/mall/item/index.vue index caacf9f..0606047 100644 --- a/web/src/views/backend/mall/item/index.vue +++ b/web/src/views/backend/mall/item/index.vue @@ -127,13 +127,6 @@ const baTable = new baTableClass( sortable: false, operator: 'RANGE', }, - { - label: t('mall.item.multiplier'), - prop: 'multiplier', - align: 'center', - sortable: false, - operator: 'eq', - }, { label: t('mall.item.category'), prop: 'category', diff --git a/web/src/views/backend/mall/item/popupForm.vue b/web/src/views/backend/mall/item/popupForm.vue index e918396..c8368c1 100644 --- a/web/src/views/backend/mall/item/popupForm.vue +++ b/web/src/views/backend/mall/item/popupForm.vue @@ -101,7 +101,7 @@ :placeholder="t('Please input field', { field: t('mall.item.score') })" /> - +
{{ amountBlockHelp }}
 - > = reactive({ trigger: 'blur', }, ], - multiplier: [ - { - validator: (rule: any, val: any, callback: Function) => { - if (!isBonusOrWithdraw.value) return callback() - if (val === '' || val === null || val === undefined) { - return callback(new Error(t('Please input field', { field: t('mall.item.multiplier') }))) - } - const num = Number(val) - if (!Number.isFinite(num) || !Number.isInteger(num)) { - return callback(new Error(t('Please enter the correct field', { field: t('mall.item.multiplier') }))) - } - if (num < 0) { - return callback(new Error(t('Please enter the correct field', { field: t('mall.item.multiplier') }))) - } - return callback() - }, - trigger: 'blur', - }, - ], category: [ { validator: (rule: any, val: any, callback: Function) => { diff --git a/web/src/views/backend/mall/order/index.vue b/web/src/views/backend/mall/order/index.vue index 6a2f5a5..1335602 100644 --- a/web/src/views/backend/mall/order/index.vue +++ b/web/src/views/backend/mall/order/index.vue @@ -124,7 +124,6 @@ const baTable = new baTableClass( }, { label: t('mall.order.points_cost'), prop: 'points_cost', align: 'center', minWidth: 90, operator: 'RANGE', sortable: false }, { label: t('mall.order.amount'), prop: 'amount', align: 'center', minWidth: 90, operator: 'RANGE', sortable: false }, - { label: t('mall.order.multiplier'), prop: 'multiplier', align: 'center', minWidth: 90, operator: 'eq', sortable: false }, { label: t('mall.order.external_transaction_id'), prop: 'external_transaction_id', diff --git a/web/src/views/backend/mall/playxOrder/index.vue b/web/src/views/backend/mall/playxOrder/index.vue index 7d09eb3..fafc84b 100644 --- a/web/src/views/backend/mall/playxOrder/index.vue +++ b/web/src/views/backend/mall/playxOrder/index.vue @@ -69,7 +69,6 @@ const baTable = new baTableClass( { label: t('mall.playxOrder.mallitem__title'), prop: 'mallItem.title', align: 'center', operatorPlaceholder: t('Fuzzy query'), sortable: false, operator: 'LIKE' }, { label: t('mall.playxOrder.points_cost'), prop: 'points_cost', align: 'center', operator: 'RANGE', sortable: false }, { label: t('mall.playxOrder.amount'), prop: 'amount', align: 'center', operator: 'RANGE', sortable: false }, - { label: t('mall.playxOrder.multiplier'), prop: 'multiplier', align: 'center', operator: 'eq', sortable: false }, { label: t('mall.playxOrder.external_transaction_id'), prop: 'external_transaction_id', align: 'center', operatorPlaceholder: t('Fuzzy query'), sortable: false, operator: 'LIKE' }, { label: t('mall.playxOrder.grant_status'),