From cb59011a339e19d2535ff4c9bb29b2a1de5de114 Mon Sep 17 00:00:00 2001
From: macbook <418170129@qq.com>
Date: Mon, 18 Jan 2021 00:44:29 +0800
Subject: [PATCH] 开通会员赠送优惠券
---
addons/shopro/model/Coupons.php | 2 +-
application/api/controller/PackageOrder.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/addons/shopro/model/Coupons.php b/addons/shopro/model/Coupons.php
index d025c9a..da0b699 100644
--- a/addons/shopro/model/Coupons.php
+++ b/addons/shopro/model/Coupons.php
@@ -154,7 +154,7 @@ class Coupons extends Model
if ($coupon) {
if($u->package_coupons_time > 0){
// 开通会员后赠送的优惠券
- if($u->package_coupons_time > time()){
+ if($u->package_coupons_time >= time()){
$coupon->user_coupons_id = $u->id;
$coupon->status_code = 'no_use';
$coupon->status_name = '未使用';
diff --git a/application/api/controller/PackageOrder.php b/application/api/controller/PackageOrder.php
index 2c9ba1a..eac8a5b 100644
--- a/application/api/controller/PackageOrder.php
+++ b/application/api/controller/PackageOrder.php
@@ -273,7 +273,7 @@ class PackageOrder extends Base
->alias('pc')
->join('shopro_coupons sc','pc.coupons_id = sc.id')
->where('pc.package_id',$order['package_id'])
- ->field('pc.coupons_id,')
+ ->field('pc.coupons_id,pc.give_num,pc.exipre_days')
->select();
$user_coupons_data = [];
foreach ($package_coupons as $v) {
--
libgit2 0.24.0