This commit is contained in:
Your Name
2020-06-10 13:23:50 +08:00
parent 1371b0a37a
commit 3d19b6129b
477 changed files with 86 additions and 117 deletions
.htaccess.user.iniH5B854518.wgtapp-release.apkapp_download.html
app_download_files
hyhproject.tar.gz
hyhproject
static/app2
css
img
+.png1.png11223456.png2.png2_0.png2_1.png3.png4.png5.pngac1111_title.pngacbg1111.pngactivity_jt.pngadds_title_bg1.pngadds_title_bg2.pngadds_title_bg3.pngadds_title_bg4.pngadds_title_bg5.pngaixin.pngbanner_ectin.pngbe.pngbeiwang.pngbeiwanglu.pngbg_miaosha.pngbg_pay_list.pngbianji.pngbianji3.pngbianji9.pngbianjiblack.pngbianjihei.pngbutton.pngbutton2.pngcainixihuan.pngclass.pngclassmenu.pngclose.pngcom.pngcommon.jscost1.pngcost2.pngcost3.pngcost_1.pngcost_2.pngcost_3.pngdaifahuo.pngdaifukuan.pngdaishouhuo.pngdel.pngdelete.pngdianhuaben.pngdianpu.pngdingwei1.pngdis_log.pngditudingwei.pngdituzhibiao.pngect.pngect_address.pngect_index_title.pngect_list.pngect_list1.pngect_list_bg.pngect_pre.pngect_pre_log.pngect_right.pngect_setting.pngect_wall.pngect_wall1.pngeye.pngfaxianhaohuo1.pngfeichangdapai.pngfenlei.pngfenx111.pnggod_bg.pnggod_rech.pnggod_shop .pnggod_shopp.pnggod_success.pnggod_success_shop.pnggothere.pnggouwuche.pnggouwuquan.pngguangshangchang.pngguangshangchang1.pnghaitunlogo.pngheart.pnghot_title.pnghui.pnghukou.jpgicon-test-copy.pngicon_1.pngicon_10.pngicon_2.pngicon_3.pngicon_4.pngicon_5.pngicon_6.pngicon_7.pngicon_8.pngicon_9.pngicon_ac1111left.pngicon_ac1111right.pngicon_back.pngicon_car.pngicon_check0.pngicon_check1.pngicon_clock.pngicon_close.pngicon_down.pngicon_ect111111.pngicon_eye.pngicon_juzitoutiao.pngicon_market.pngicon_menu.pngicon_more.pngicon_msg.pngicon_msg1.pngicon_phone1.pngicon_photo.pngicon_pwd1.pngicon_right.pngicon_rocket.pngicon_s.pngicon_search.pngicon_search1.pngicon_select.pngicon_select1.pngicon_shop.pngicon_smjd.pngicon_sscl.pngicon_star.pngicon_user1.pngicon_ziying.pngicon_zy1.pngicon_zy2.pngicon_zy3.pngicon_zy4.pngicon_zy5.pngimail.pngimail2.pngimg_white.pngjia.pngjian.pngjifen.pngjingpintuijian.pngjuan.pngjuan_yes.pngjxyh.pngkaidian.pngkong.pnglianxishangjia4.pnglikelogo.pnglikelogo1.pnglikelogoon.pngloginbg.jpgmarker_red_sprite.pngmeirigengxin.pngmenu.pngmenu_dian.pngmiaoshabg.pngms_1.pngmu.pngmuji_quan.pngmujiimg.pngmy_bg.pngnav_0_0.pngnav_0_1.pngnav_1_0.pngnav_1_1.pngnav_2_0.pngnav_2_1.pngnav_2_in.pngnav_2_out.pngnav_3_0.pngnav_3_1.pngnav_4_0.pngnav_4_1.pngnews_title.pngnext_title.pngoc_logo1.pngoc_logo2.pngoc_logo3.pngoc_logo4.pngoc_shop.pngorder-icons.pngorderdetail.pngpaihangbang.pngpengyou.pngphone1.pngpingjia.pngpingpaijie.pngpingzheng.pngpingzheng1.pngpingzheng2.pngpingzheng3.pngpingzheng4.pngpinzhishishang.pngpjhx.pngpjhx1.pngpjimg.pngpos.pngqidong_bg.jpgrecommend.pngrecommend_title1.pngrecommend_title2.pngrecommend_title3.pngrenzheng.pngrenzheng1.pngsanjiaoshang.pngsanjiaoxia.pngsaoyisao.pngsaoyisao1.pngsaved_resourcesaved_resource(1)saved_resource(2)saved_resource(3)saved_resource(4)saved_resource(5)search1.pngsend.pngsetting.pngsetting_lock1.pngsetting_user1.pngshangchang.pngshangchangkefu.pngshangxin.pngshare.pngshoplogo.pngsite_logo.pngsousuo.pngspotmkrs.pngstart.pngtanhao.pngtianjia.pngtime_bg.pngtime_icon.pngtime_more.pngtimer_logo.pngtitle_ac11next.pngtitle_brand.pngtitle_miaosha.pngtitle_miaoshaqu.pngtitle_news.pngtitle_pp.pngtitle_zhekouqu.pngtixian.pngtixian6.pngtouxiang.jpgtrade.pngtrade1.pngtrue.jpgtuijian.pngweiba.pngxiajiantou.pngxianshiqianggou.pngxiaodian.pngxinyongka.pngyoujiantou.pngyuan.pngzan1.pngzan2.png
js
addessay.jsaddgoods.1.jsaddgoods.2.jsaddgoods.jsaddhhrrz.jsaddmemorandum.jsaddproperties.jsaddqrbb.jsaddqrrz.jsaddshopping.jsaddyhk.jsapplicationopen.jsappraise.jsbill.jscancellation.jscash-out.jschoiceness.jscommercial.jscommon.jscompare.jscomplain.jsconfirmOrder.jscooperative.jsdetails.jsdiscounts.jsdistribution.jseditAddress.jsessay.jsessaylist.jsfriends.jsfriendsList.jsgoodslist.jsguide.jshelpGet.jshhrrz.jshome.jshome_new.jsincome-details.jsindent.jsindentcon.jsindex.jsindividual.jsinvest.jsinvestdetail.jsjquery-3.2.1.min.jsjquery-ui.min.jsjquery.cookie.jsjquery.qtip.min.jsjquery.validate.min.jslogin.jslogistics.jslogisticscon.jslrz.bundle.jsmain_guide.jsmapcommon.jsmemorandumlist.jsmui.jsmui.min.jsmy.jsmy_help_sale.jsmyshop.jsmyshops.jsnotepad.jsorder_con.jsorder_out.jspaymentVoucher.jsperfect-scrollbar.min.jsphotoswipe-ui-default.min.jsphotoswipe.jspj.jsplupload.full.min.jsproperties.jsqrbb.jsqrcode.jsqrrz.jsrecommend.jsreg.jsregister.jsregister1.jsreviewsmanage.jssaoyisao.jsself_shop.jssetting.jssetting_address.jssetting_fogetPayPwd.jssetting_fogetPwd.jssetting_loginInfo.jssetting_payPwd.jssetting_phone.jssetting_pwd.jssetting_recive.jssetting_user.jsshangdu.jsshop_decorate.jsshop_indent.jsshop_indentcon.jsshoperUploadVoucher.jsshopgoodlist.jsshoppingcart.jsshopsList.jsshopsetting.jsstart.jsstore_commodity.jsstore_home.1.jsstore_home.jsstore_info.jsstoreout.jssupermarket.jsswiper.min.jstest.jstrade_rule.jsupload.jsupload1.jsuploadVoucher.jsuploader.jsuploaderBatch.jsuploadqiniu.jsvouchers.jsyhk.jszepto.min.jszhugouba.jszhuweiba.js

@ -323,8 +323,6 @@ class Orders extends Base{
// 验证商品规格是否已选
foreach ($carts['carts'] as $v) {
foreach ($v['list'] as $val) {
// 坑啊判断下会死嘛 ---- 20200116
if($val['isSpec']!=1)continue;
$id = Db::name('goods_specs')->where(['shopId'=>$val['shopId'],'goodsId'=>$val['goodsId']])->column('id');
if($id && $val['goodsSpecId'] == ''){
return WSTReturn("请选择商品规格型号!");

@ -189,20 +189,19 @@ class Settlements extends Base
// 1,推荐人获得预获产品券时限上日有消费≥10元为优惠款的50%。
// refPreProductYdGTMoney refPreProductYesInSaleScale
// 2,推荐人获得预获产品券时限上日有消费<10元为优惠款的25% refPreProductNoInSaleScale
// 20200114 -- 说用不上,注释
// $m->setTable('user_trees');
// $pid = $m->getField(['uid'=>$shops['userId']],'pid');
// if($pid && $pInfo = getUserInfo(['userId'=>$pid,'dataFlag'=>1,'userStatus'=>1],'userId') && 3 != $order->goodsType){//有推荐人并且推荐人状态正常
// $yesterdayBuyMoney = Model('common/Orders')->getYesterdayBuyMoney($pid,'realTotalMoney');
// if($yesterdayBuyMoney >= dataConf('refPreProductYdGTMoney')){//大于设定值
// $refProductMoney = round($discountMoney * (dataConf('refPreProductYesInSaleScale')*0.01),2);//1
// }else{
// $refProductMoney = round($discountMoney * (dataConf('refPreProductNoInSaleScale')*0.01),2);//2
// }
// if($refProductMoney > 0){
// Model('common/UserVouchers')->insertVouchersNotice($pid,$orderId,$refProductMoney,0,'交易订单【'.$order->orderNo.'】推荐所得');
// }
// }
$m->setTable('user_trees');
$pid = $m->getField(['uid'=>$shops['userId']],'pid');
if($pid && $pInfo = getUserInfo(['userId'=>$pid,'dataFlag'=>1,'userStatus'=>1],'userId') && 3 != $order->goodsType){//有推荐人并且推荐人状态正常
$yesterdayBuyMoney = Model('common/Orders')->getYesterdayBuyMoney($pid,'realTotalMoney');
if($yesterdayBuyMoney >= dataConf('refPreProductYdGTMoney')){//大于设定值
$refProductMoney = round($discountMoney * (dataConf('refPreProductYesInSaleScale')*0.01),2);//1
}else{
$refProductMoney = round($discountMoney * (dataConf('refPreProductNoInSaleScale')*0.01),2);//2
}
if($refProductMoney > 0){
Model('common/UserVouchers')->insertVouchersNotice($pid,$orderId,$refProductMoney,0,'交易订单【'.$order->orderNo.'】推荐所得');
}
}
return true;
}
/**

@ -161,9 +161,9 @@ class Shopping extends Base{
// COS('.$lat.'*PI()/180)*COS(lat*PI()/180)*POW(SIN(('.$lng.'*PI()/180-lng*PI()/180)/2),2)))*1000) AS distance';
$order = 'distance ASC';
//纬度
//$where['s.lat']=array('between',array($start['left-bottom']['lat'],$start['left-top']['lat']));
$where['s.lat']=array('between',array($start['left-bottom']['lat'],$start['left-top']['lat']));
//经度
//$where['s.lng']=array('between',array($start['left-bottom']['lng'],$start['right-bottom']['lng']));
$where['s.lng']=array('between',array($start['left-bottom']['lng'],$start['right-bottom']['lng']));
$rs = Db::name('shops s')
->where($where)
->field($field)

0
hyhproject/common/model/UserLevel.php Normal file → Executable file

@ -7,7 +7,6 @@ use think\Db;
*/
class UserVouchers extends Base{
public function startGiveVouchers(){
if('127.0.0.1' != $ip = request()->ip(0) ) return $ip;
set_time_limit(0);
$sm = Model('common/SysSummary');
$sysData= $sm->getInfo('toPayFast,toPaySlow');

@ -104,7 +104,7 @@ class Users extends Base{
->join('user_trees t','u.userId=t.uid')
->join('user_lock l','u.userId=l.userId')
->where(['t.pid'=>$userId,'u.userStatus'=>0,'u.userLevel'=>$userLevel])
->field('u.userId,u.loginName as trueName,u.userPhone,u.userLevel,l.lockReason,l.lockTime,from_unixtime(l.createTime) createTime')
->field('u.userId,u.trueName,u.userPhone,u.userLevel,l.lockReason,l.lockTime,from_unixtime(l.createTime) createTime')
->order('l.id DESC,u.userId DESC')
->paginate(input('pageSize/d'))->toArray();
}else{