diff --git a/H5B854518.wgt b/H5B854518.wgt index 37202a5..2bd177f 100644 Binary files a/H5B854518.wgt and b/H5B854518.wgt differ diff --git a/get_version_new.php b/get_version_new.php index 805ea64..3254eb0 100755 --- a/get_version_new.php +++ b/get_version_new.php @@ -2,7 +2,7 @@ $data['version'] = 16; $data['ios_must_update'] = 0; //是否强制更新,0不强制,1强制 $data['must_update'] = 1; //是否强制更新,0不强制,1强制 -$data['apk_version'] = '2.2.1'; +$data['apk_version'] = '2.2.2'; $data['apk_down_url'] = 'http://www.zgqlg.com.cn/H5B854518.wgt'; //$data['ios_version'] = '1.0.0'; $data['ios_appid'] = '1355322179'; diff --git a/hyhproject/common/model/UserVouchers.php b/hyhproject/common/model/UserVouchers.php index d2a5747..0774750 100755 --- a/hyhproject/common/model/UserVouchers.php +++ b/hyhproject/common/model/UserVouchers.php @@ -178,27 +178,16 @@ class UserVouchers extends Base{ } //插入或更新详细表 - $m->setTable('user_vouchers_summary'); - if($summaryInfo = $m->getInfo(['userId'=>$userId],'id,alreadyProductNum,alreadyCouponsNum')){ - if(1 == $isAdd){ - $data['alreadyProductNum'] = $summaryInfo['alreadyProductNum'] + $alreadyProductNum; - $data['alreadyCouponsNum'] = $summaryInfo['alreadyCouponsNum'] + $alreadyCouponsNum; - }else{ - $data['alreadyProductNum'] = $summaryInfo['alreadyProductNum'] - $alreadyProductNum; - $data['alreadyCouponsNum'] = $summaryInfo['alreadyCouponsNum'] - $alreadyCouponsNum; - } - $m->updateInfo(['id'=>$summaryInfo['id']],$data); - }else{ - if(0 == $isAdd){ - $alreadyProductNum *= -1; - $alreadyCouponsNum *= -1; - } - $data = compact('userId','alreadyProductNum','alreadyCouponsNum'); - $data['isGive'] = 1; - $data['giveDate'] = time(); - $data['giveDay'] = 0; - $m->insertInfo($data); - } + $m->setTable('users'); + $summaryInfo = $m->getInfo(['userId'=>$userId],'id,productNum,couponsNum'); + if(1 == $isAdd){ + $data['productNum'] = $summaryInfo['productNum'] + $alreadyProductNum; + $data['couponsNum'] = $summaryInfo['couponsNum'] + $alreadyCouponsNum; + }else{ + $data['productNum'] = $summaryInfo['productNum'] - $alreadyProductNum; + $data['couponsNum'] = $summaryInfo['couponsNum'] - $alreadyCouponsNum; + } + $m->updateInfo(['id'=>$summaryInfo['id']],$data); } /**