mkm/shop-php
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整补贴余额查询

Browse Source
This commit is contained in:
luofei 2024-03-16 16:43:56 +08:00
parent 67382cfdf0
commit 33b33288e6
4 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
app/common/dao/store/StoreActivityUserDao.php
View File

@ -281,34 +281,36 @@ class StoreActivityUserDao extends BaseDao
/** /**
* 红包余额统计 * 红包余额统计
* @param int $userId * @param int $userId
* @return array * @return array|array[]
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
*/ */
public function total(int $userId) public function total(int $userId)
{ {
$totalAmount = StoreConsumptionUser::where('uid', $userId) $totalAmount = StoreConsumptionUser::where('uid', $userId)
->whereIn('type', [StoreConsumptionUser::TYPE_ONE, StoreConsumptionUser::TYPE_TWO]) ->whereIn('type', [StoreConsumptionUser::TYPE_ONE, StoreConsumptionUser::TYPE_TWO])
->where('status', StoreConsumptionUser::STATUS_UNUSED) ->whereIn('status', [StoreConsumptionUser::STATUS_UNUSED, StoreConsumptionUser::STATUS_REPEAL])
->field('SUM(balance) as total_amount,type') ->field('balance,type')
->group('type')
->select()->toArray(); ->select()->toArray();
$totalAmount = reset_index($totalAmount, 'type');
$result = [ $result = [
[ '1' => [
'type' => 1, 'type' => 1,
'total_amount' => 0.00 'total_amount' => 0.00,
'type_cn' => StoreConsumptionUser::TYPE_MAP[1],
], ],
[ '2' => [
'type' => 2, 'type' => 2,
'total_amount' => 0.00 'total_amount' => 0.00,
'type_cn' => StoreConsumptionUser::TYPE_MAP[2],
] ]
]; ];
foreach ($result as &$item) { foreach ($totalAmount as $item) {
if (isset($totalAmount[$item['type']])) { if (isset($result[$item['type']])) {
$item['total_amount'] = $totalAmount[$item['type']]['total_amount']; $result[$item['type']]['total_amount']= bcadd($result[$item['type']]['total_amount'], $item['balance'], 2);
} }
$item['type_cn'] = StoreConsumptionUser::TYPE_MAP[$item['type']];
} }
return $result; return array_values($result);
} }
} }

6
app/common/dao/store/consumption/StoreConsumptionUserDao.php
View File

@ -52,6 +52,7 @@ class StoreConsumptionUserDao extends BaseDao
public $startTime; public $startTime;
public $endTime; public $endTime;
public $billExtra; public $billExtra;
public $onlyBill = false; // 是否只写入用户账单
protected function getModel(): string protected function getModel(): string
{ {
@ -241,11 +242,13 @@ class StoreConsumptionUserDao extends BaseDao
$model = StoreConsumptionUser::where('uid', $userId)->where('type', StoreConsumptionUser::TYPE_TWO)->find(); $model = StoreConsumptionUser::where('uid', $userId)->where('type', StoreConsumptionUser::TYPE_TWO)->find();
$couponPrice = bcmul($amount, $rate, 2); $couponPrice = bcmul($amount, $rate, 2);
if (!empty($model) && $model['type'] == $type) { if (!empty($model) && $model['type'] == $type) {
if (!$this->onlyBill) {
$model->coupon_price = bcadd($model->coupon_price, $couponPrice, 2); $model->coupon_price = bcadd($model->coupon_price, $couponPrice, 2);
$model->balance = bcadd($model->balance, $couponPrice, 2); $model->balance = bcadd($model->balance, $couponPrice, 2);
if ($model->status != StoreConsumptionUser::STATUS_UNUSED) { if ($model->status != StoreConsumptionUser::STATUS_UNUSED) {
$model->status = StoreConsumptionUser::STATUS_UNUSED; $model->status = StoreConsumptionUser::STATUS_UNUSED;
} }
}
} else { } else {
$model = new StoreConsumptionUser(); $model = new StoreConsumptionUser();
$model->coupon_id = $consumption['coupon_id']; $model->coupon_id = $consumption['coupon_id'];
@ -260,6 +263,9 @@ class StoreConsumptionUserDao extends BaseDao
$model->end_time = $this->endTime ?: '2026-01-15 23:59:59'; $model->end_time = $this->endTime ?: '2026-01-15 23:59:59';
$model->type = $type; $model->type = $type;
$model->status = $status; $model->status = $status;
if ($this->onlyBill === true) {
$model->status = StoreConsumptionUser::STATUS_REPEAL;
}
} }
if (!$model->save()) { if (!$model->save()) {
throw new \Exception('发放失败'); throw new \Exception('发放失败');

1
app/controller/api/store/merchant/Merchant.php
View File

@ -301,6 +301,7 @@ class Merchant extends BaseController
if (empty($merchantInfo)) { if (empty($merchantInfo)) {
return app('json')->fail('参数错误'); return app('json')->fail('参数错误');
} }
$merchantInfo['paid_margin'] = $merchantInfo['paid_margin'] > $merchantInfo['margin'] ? $merchantInfo['margin'] : $merchantInfo['paid_margin'];
$merchantInfo['unpaid_margin'] = bcsub($merchantInfo['margin'], $merchantInfo['paid_margin'], 2); $merchantInfo['unpaid_margin'] = bcsub($merchantInfo['margin'], $merchantInfo['paid_margin'], 2);
if ($merchantInfo['margin'] <= 0) { if ($merchantInfo['margin'] <= 0) {
$merchantInfo['unpaid_margin'] = 0; $merchantInfo['unpaid_margin'] = 0;

4
crmeb/listens/SendSubsidyCouponListen.php
View File

@ -43,8 +43,10 @@ class SendSubsidyCouponListen extends TimerService implements ListenerInterface
'coupon_id' => $consumption['coupon_id'], 'coupon_id' => $consumption['coupon_id'],
'sale_amount' => $item['amount'], 'sale_amount' => $item['amount'],
'purchase_amount' => $purchaseAmount, 'purchase_amount' => $purchaseAmount,
'status' => -1,
]; ];
$consumptionRepo->send($consumption, 1, $merchant->uid, 0, $amount, StoreConsumptionUser::STATUS_UNUSED, StoreConsumptionUser::TYPE_TWO); $consumptionRepo->onlyBill = true;
$consumptionRepo->send($consumption, 1, $merchant->uid, 0, $amount, StoreConsumptionUser::STATUS_REPEAL, StoreConsumptionUser::TYPE_TWO);
$count++; $count++;
} }
} }