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-02-22 17:45:51 +08:00
parent fecac3d818
commit 199bc98697
3 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -236,7 +236,7 @@ class StoreConsumptionUserDao extends BaseDao
*/ */
public function send($consumption, float $rate, int $userId, string $groupOrderIds, float $amount, $status = -2, $type = 1) public function send($consumption, float $rate, int $userId, string $groupOrderIds, float $amount, $status = -2, $type = 1)
{ {
$title = $type == StoreConsumptionUser::TYPE_TWO ? '现金抵扣补贴' : '无门槛实物通用补贴'; $title = $type == StoreConsumptionUser::TYPE_TWO ? '春耕采购补贴' : '春耕采购余额';
$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) {
@ -271,7 +271,7 @@ class StoreConsumptionUserDao extends BaseDao
} }
$userBillRepository->incBill($userId, 'red_pack', "red_pack_{$type}", [ $userBillRepository->incBill($userId, 'red_pack', "red_pack_{$type}", [
'link_id' => $model['coupon_user_id'], 'link_id' => $model['coupon_user_id'],
'status' => 1, 'status' => $status == -1 ?: 1,
'title' => '获得' . $title, 'title' => '获得' . $title,
'number' => $couponPrice, 'number' => $couponPrice,
'mark' => '获得' . $title . $couponPrice . ",订单金额：{$amount}", 'mark' => '获得' . $title . $couponPrice . ",订单金额：{$amount}",

9
app/common/repositories/store/order/StoreOrderCreateRepository.php
View File

@ -186,11 +186,7 @@ class StoreOrderCreateRepository extends StoreOrderRepository
$presellType = 0; $presellType = 0;
$consumption_coupon_id = 0; $consumption_coupon_id = 0;
$fn = []; $fn = [];
if (in_array($source, [0, 2, 103])) {
$enabledPlatformCoupon = true; $enabledPlatformCoupon = true;
} else {
$enabledPlatformCoupon = false;
}
$order_total_postage = 0; $order_total_postage = 0;
$platformCoupon = []; $platformCoupon = [];
if ($isPlatformCard) { if ($isPlatformCard) {
@ -549,9 +545,7 @@ class StoreOrderCreateRepository extends StoreOrderRepository
// if ($total_true_price > 0) { // if ($total_true_price > 0) {
$StoreCouponUser = app()->make(StoreCouponUserRepository::class); $StoreCouponUser = app()->make(StoreCouponUserRepository::class);
$platformCoupon = $StoreCouponUser->validUserPlatformCoupon($uid); $platformCoupon = $StoreCouponUser->validUserPlatformCoupon($uid);
$platformConsumption = [];
//消费金 //消费金
if ($source == 103) {
$ConsumptionWhere = [ $ConsumptionWhere = [
'uid' => $uid, 'uid' => $uid,
'status' => 0, 'status' => 0,
@ -564,7 +558,6 @@ class StoreOrderCreateRepository extends StoreOrderRepository
$item['describe'] = '仅限平台指定商家商品可使用'; $item['describe'] = '仅限平台指定商家商品可使用';
return $item; return $item;
}); });
}
// } // }
$usePlatformCouponId = 0; $usePlatformCouponId = 0;
@ -756,7 +749,7 @@ class StoreOrderCreateRepository extends StoreOrderRepository
$order_model = $orderInfo['order_model']; $order_model = $orderInfo['order_model'];
$order_extend = $orderInfo['order_extend']; $order_extend = $orderInfo['order_extend'];
if ($pay_type == 'balance' && $orderInfo['source'] != 103 && $orderInfo['source'] != 105) { if ($pay_type == 'balance' && $orderInfo['source'] != 103 && $orderInfo['source'] != 105) {
throw new ValidateException('余额支付只能用于里海云仓'); // throw new ValidateException('余额支付只能用于里海云仓');
} }
// 以下判断无意义，v2CartIdByOrderInfo 已经判断过收货地址或自提地址 // 以下判断无意义，v2CartIdByOrderInfo 已经判断过收货地址或自提地址
// if (!$orderInfo['order_delivery_status']) { // if (!$orderInfo['order_delivery_status']) {

2
crmeb/listens/ActivateConsumptionListen.php
View File

@ -6,6 +6,7 @@ use app\common\model\store\consumption\StoreConsumption;
use app\common\model\store\consumption\StoreConsumptionUser; use app\common\model\store\consumption\StoreConsumptionUser;
use app\common\model\store\order\StoreOrder; use app\common\model\store\order\StoreOrder;
use app\common\model\system\merchant\Merchant; use app\common\model\system\merchant\Merchant;
use app\common\model\user\UserBill;
use crmeb\interfaces\ListenerInterface; use crmeb\interfaces\ListenerInterface;
use crmeb\services\TimerService; use crmeb\services\TimerService;
@ -36,6 +37,7 @@ class ActivateConsumptionListen extends TimerService implements ListenerInterfac
$item->start_time = date('Y-m-d H:i:s'); $item->start_time = date('Y-m-d H:i:s');
$item->end_time = date('Y-m-d H:i:s', strtotime('+1 year')); $item->end_time = date('Y-m-d H:i:s', strtotime('+1 year'));
$item->save(); $item->save();
UserBill::where('link_id', $item['coupon_user_id'])->where('type', 'red_pack_2')->update(['status', 1]);
} }
} }
}); });