From 1d8973015d64ae2dec50e3c2c47b457a1b641457 Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Sun, 6 Dec 2020 20:32:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E5=86=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 get_startup.php                         | 5 -----
 hyhproject/app/controller/UserLevel.php | 6 ++++++
 hyhproject/common/model/Users.php       | 3 +--
 3 files changed, 7 insertions(+), 7 deletions(-)
 delete mode 100755 get_startup.php

diff --git a/get_startup.php b/get_startup.php
deleted file mode 100755
index 6789441..0000000
--- a/get_startup.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php 
-	$data['show']=0;
-	$data['img'][0] = ['src'=>'http://img.juzi199.com/static/app2/img/startup_1.jpg','href'=>''];
-	$data['img'][1] = ['src'=>'http://img.juzi199.com/static/app2/img/startup_1.jpg','href'=>''];	
-	exit(json_encode($data));
\ No newline at end of file
diff --git a/hyhproject/app/controller/UserLevel.php b/hyhproject/app/controller/UserLevel.php
index a228e66..b59dcc1 100755
--- a/hyhproject/app/controller/UserLevel.php
+++ b/hyhproject/app/controller/UserLevel.php
@@ -41,8 +41,14 @@ class UserLevel extends Base
         $goodsType = 3;
         $sm = Model('common/SysSummary');
         $sysData= $sm->getInfo('toPaySlow');
+        $helpSaleInfo = Db::name('user_vouchers_summary')->where(['userId'=>$userId])->find();
+        $helpSaleNum = 0;
+        if (!empty($helpSaleInfo)) {
+            $helpSaleNum = $helpSaleInfo['helpSaleNum'];
+        }
         return [
             'zgTimes'=>Db::name('orders')->where(compact('userId','goodsType'))->count(),
+            'myZgA'=>$helpSaleNum,
             'zgAmounts'=>$sysData['toPaySlow'],
         ];
     }
diff --git a/hyhproject/common/model/Users.php b/hyhproject/common/model/Users.php
index 8b0e518..fd46d27 100755
--- a/hyhproject/common/model/Users.php
+++ b/hyhproject/common/model/Users.php
@@ -443,8 +443,7 @@ class Users extends Base{
                     //二、当【助购值】的值小于设置的【全亮共欢迎您助购所得】值时，按【助购值】全值给予即可。
                     $sm = Model('common/SysSummary');
                     $vm = new UserVouchers();
-                    // registerMaxGetProductCoupon
-                    $get = (float)dataConf('helpSaleCouponsCalBase');
+                    $get = (float)dataConf('registerMaxGetProductCoupon');
                     $ssm = Model('common/Table');
                     $ssm->setTable('sys_summary');
                     $toPayInfo = $ssm->getInfo(['id'=>1],'toPaySlow');