diff --git a/crmeb/app/services/activity/coupon/StoreCouponIssueServices.php b/crmeb/app/services/activity/coupon/StoreCouponIssueServices.php index d6ed3064d..8d6f66fef 100644 --- a/crmeb/app/services/activity/coupon/StoreCouponIssueServices.php +++ b/crmeb/app/services/activity/coupon/StoreCouponIssueServices.php @@ -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'; diff --git a/crmeb/app/services/activity/lottery/LuckLotteryRecordServices.php b/crmeb/app/services/activity/lottery/LuckLotteryRecordServices.php index ad82f605c..858ed8dfe 100644 --- a/crmeb/app/services/activity/lottery/LuckLotteryRecordServices.php +++ b/crmeb/app/services/activity/lottery/LuckLotteryRecordServices.php @@ -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: diff --git a/crmeb/app/services/pay/RechargeServices.php b/crmeb/app/services/pay/RechargeServices.php index 8398e2602..5b1885c40 100644 --- a/crmeb/app/services/pay/RechargeServices.php +++ b/crmeb/app/services/pay/RechargeServices.php @@ -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);