|
|
@@ -134,12 +134,15 @@ class MemberWealController extends BaseController
|
|
|
util::fail('请填写内容');
|
|
|
}
|
|
|
|
|
|
- // 验证recharge和give值递增
|
|
|
+ // 验证recharge和give值递增,discount值递减
|
|
|
$prevRecharge = -1;
|
|
|
$prevGive = -1;
|
|
|
+ $prevDiscount = 2; // 初始化为大于1的值,确保第一个元素能通过验证
|
|
|
foreach ($data as $index => $item) {
|
|
|
$currentRecharge = floatval($item['recharge'] ?? 0);
|
|
|
$currentGive = floatval($item['give'] ?? 0);
|
|
|
+ $currentDiscount = floatval($item['discount'] ?? 0);
|
|
|
+
|
|
|
if ($currentRecharge <= $prevRecharge) {
|
|
|
util::fail('充值金额必须递增');
|
|
|
}
|
|
|
@@ -148,8 +151,13 @@ class MemberWealController extends BaseController
|
|
|
util::fail('赠送金额必须递增');
|
|
|
}
|
|
|
}
|
|
|
+ if ($currentDiscount >= $prevDiscount) {
|
|
|
+ util::fail('折扣必须递减');
|
|
|
+ }
|
|
|
+
|
|
|
$prevRecharge = $currentRecharge;
|
|
|
$prevGive = $currentGive;
|
|
|
+ $prevDiscount = $currentDiscount;
|
|
|
}
|
|
|
|
|
|
$connection = Yii::$app->db;
|
|
|
@@ -210,6 +218,17 @@ class MemberWealController extends BaseController
|
|
|
if (empty($data)) {
|
|
|
util::fail('没有折扣数据');
|
|
|
}
|
|
|
+
|
|
|
+ // 验证discount值递减
|
|
|
+ $prevDiscount = 2; // 初始化为大于1的值,确保第一个元素能通过验证
|
|
|
+ foreach ($data as $index => $item) {
|
|
|
+ $currentDiscount = floatval($item['discount'] ?? 0);
|
|
|
+ if ($currentDiscount >= $prevDiscount) {
|
|
|
+ util::fail('折扣必须递减');
|
|
|
+ }
|
|
|
+ $prevDiscount = $currentDiscount;
|
|
|
+ }
|
|
|
+
|
|
|
foreach ($data as $k => $v) {
|
|
|
$discount = $v['discount'] ?? 0.95;
|
|
|
$levelSn = $v['levelSn'] ?? 'general';
|