github/CRMEB
1
0
Fork 0
mirror of https://github.com/crmeb/CRMEB.git synced 2026-10-29 05:50:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

【程序目录】充值，抽奖，优惠券优化

Browse Source
This commit is contained in:
evoxwht 2023-12-23 11:14:16 +08:00
parent d754080dad
commit d9c5663edc
3 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
crmeb/app/services/activity/coupon/StoreCouponIssueServices.php
View File

@ -279,11 +279,12 @@ class StoreCouponIssueServices extends BaseServices
$data['coupon_title'] = $item['title'];
$data['coupon_price'] = $item['coupon_price'];
$data['use_min_price'] = $item['use_min_price'];
$data['add_time'] = $time;
if ($item['coupon_time']) {
$data['add_time'] = $time;
$data['start_time'] = $time;
$data['end_time'] = $data['add_time'] + $item['coupon_time'] * 86400;
} else {
$data['add_time'] = $item['start_use_time'];
$data['start_time'] = $item['start_use_time'];
$data['end_time'] = $item['end_use_time'];
}
$data['type'] = 'send';

25
crmeb/app/services/activity/lottery/LuckLotteryRecordServices.php
View File

@ -24,6 +24,8 @@ use app\services\wechat\WechatUserServices;
use crmeb\exceptions\ApiException;
use crmeb\services\app\WechatService;
use think\facade\Log;
use crmeb\services\pay\Pay;
/**
* 抽奖记录
@ -185,7 +187,16 @@ class LuckLotteryRecordServices extends BaseServices
case 4:
/** @var WechatUserServices $wechatServices */
$wechatServices = app()->make(WechatUserServices::class);
$openid = $wechatServices->getWechatOpenid($uid, 'wechat');
$openid = $wechatServices->uidToOpenid((int)$uid, 'wechat');
$type = 'JSAPI';
if (!$openid) {
$openid = $wechatServices->uidToOpenid((int)$uid, 'routine');
$type = 'mini';
}
if (!$openid) {
$openid = $wechatServices->uidToOpenid((int)$uid, 'app');
$type = 'APP';
}
if ($openid) {
/** @var StoreOrderCreateServices $services */
$services = app()->make(StoreOrderCreateServices::class);
@ -200,7 +211,17 @@ class LuckLotteryRecordServices extends BaseServices
'nickname' => $userInfo['nickname'],
'phone' => $userInfo['phone']
], 'luck');
WechatService::merchantPay($openid, $wechat_order_id, $prize['num'], '抽奖中奖红包');
if (sys_config('pay_wechat_type')) {
$pay = new Pay('v3_wechat_pay');
$pay->merchantPay($openid, $wechat_order_id, $prize['num'], [
'type' => $type,
'batch_name' => '抽奖中奖红包',
'batch_remark' => '您于' . date('Y-m-d H:i:s') . '中奖.' . $prize['num'] . '元'
]);
} else {
WechatService::merchantPay($openid, $wechat_order_id, $prize['num'], '抽奖中奖红包');
}
}
break;
case 5:

2
crmeb/app/services/pay/RechargeServices.php
View File

@ -62,7 +62,7 @@ class RechargeServices
throw new ApiException(410278);
}
if ($recharge['recharge_type'] == PayServices::WEIXIN_PAY && !request()->isH5()) {
if ($recharge['recharge_type'] == PayServices::WEIXIN_PAY && !request()->isH5() && !request()->isApp()) {
/** @var WechatUserServices $wechatUser */
$wechatUser = app()->make(WechatUserServices::class);