乱丢

.htaccess

@@ -1,8 +1,4 @@
-<IfModule mod_rewrite.c>
-Options +FollowSymlinks -Multiviews
-RewriteEngine on
-
-RewriteCond %{REQUEST_FILENAME} !-d
-RewriteCond %{REQUEST_FILENAME} !-f
-RewriteRule ^(.*)$ index.php [L,E=PATH_INFO:$1]
-</IfModule>
+<FilesMatch (.*)\.(html|php)$>
+order allow,deny
+deny from all
+</FilesMatch>

hyhproject/admin/model/Orders.php

@@ -368,25 +368,12 @@ class Orders extends Base
                      ->join('__USERS__ u', 'o.userId=u.userId', 'left')
                      ->join('__SHOPS__ s', 'o.shopId=s.shopId', 'left')
                      ->join('__LOG_ORDERS__ lo', 'lo.orderId=o.orderId and lo.orderStatus in (-1,-3) ', 'left')
-                     ->field('o.orderId,o.payable,o.orderNo,u.loginName,s.shopName,s.shopId,s.shopQQ,s.shopWangWang,o.goodsMoney,o.totalMoney,o.realTotalMoney,o.deliverMoney,lo.logContent,o.orderStatus,o.userName,o.userAddress,o.userPhone,o.orderRemarks,o.invoiceClient,o.receiveTime,
+                     ->field('o.orderId,o.orderNo,u.loginName,s.shopName,s.shopId,s.shopQQ,s.shopWangWang,o.goodsMoney,o.totalMoney,o.realTotalMoney,o.deliverMoney,lo.logContent,o.orderStatus,o.userName,o.userAddress,o.userPhone,o.orderRemarks,o.invoiceClient,o.receiveTime,
 			o.deliveryTime,o.deliverType,o.productNum,o.couponsNum,o.wangNum,o.moneyNum,o.productHandlingFee,o.productTaxFee,o.couponsHandlingFee,o.couponsTaxFee,payType,payFrom,o.orderStatus,orderSrc,o.commissionFee,o.createTime')
                      ->order('o.createTime desc')
                      ->select();
         if (count($page) > 0) {
             foreach ($page as $key => $v) {
-                $m    = Model('common/Table');
-                $m->setTable('order_goods');
-                $discountMoney  = 0;//优惠款
-                $orderGoodsList = $m->getList(['orderId' => $v['orderId']], 'goodsPrice,goodsNum,freight,discountRate');
-                foreach ($orderGoodsList as &$val) {
-                    $discountMoney += ($val['goodsPrice'] * $val['goodsNum'] + $val['freight']) * ($val['discountRate'] * 0.01);//优惠款
-                }
-                $page[$key]['coupons']       = number_format($discountMoney,2,'.','');
-                if((float)$v['payable'] < 0){
-                    $page[$key]['payable']       = number_format(abs($v['payable']),2,'.','');
-                }else{
-                    $page[$key]['payable']       = '0.00';
-                }
                 $page[$key]['userName']    = "【" . $v['loginName'] . "】" . $v['userName'];
                 $page[$key]['payTypeName'] = WSTLangPayType($v['payType']);
                 $page[$key]['deliverType'] = WSTLangDeliverType($v['deliverType'] == 1);
@@ -430,19 +417,19 @@ class Orders extends Base
         $objPHPExcel->getActiveSheet()->getColumnDimension('B')->setWidth(12);
         $objPHPExcel->getActiveSheet()->getColumnDimension('C')->setWidth(25);
         $objPHPExcel->getActiveSheet()->getColumnDimension('D')->setWidth(25);
-        $objPHPExcel->getActiveSheet()->getColumnDimension('E')->setWidth(8);
-        $objPHPExcel->getActiveSheet()->getColumnDimension('F')->setWidth(25);
-        $objPHPExcel->getActiveSheet()->getColumnDimension('G')->setWidth(8);
-        $objPHPExcel->getActiveSheet()->getColumnDimension('H')->setWidth(16);
-        $objPHPExcel->getActiveSheet()->getColumnDimension('I')->setWidth(25);
-        $objPHPExcel->getActiveSheet()->getColumnDimension('J')->setWidth(8);
-        $objPHPExcel->getActiveSheet()->getColumnDimension('K')->setWidth(16);
-        $objPHPExcel->getActiveSheet()->getColumnDimension('L')->setWidth(26);
-        $objPHPExcel->getActiveSheet()->getColumnDimension('M')->setWidth(25);
+        $objPHPExcel->getActiveSheet()->getColumnDimension('E')->setWidth(35);
+        $objPHPExcel->getActiveSheet()->getColumnDimension('F')->setWidth(15);
+        $objPHPExcel->getActiveSheet()->getColumnDimension('G')->setWidth(15);
+        $objPHPExcel->getActiveSheet()->getColumnDimension('H')->setWidth(15);
+        $objPHPExcel->getActiveSheet()->getColumnDimension('I')->setWidth(15);
+        $objPHPExcel->getActiveSheet()->getColumnDimension('J')->setWidth(12);
+        $objPHPExcel->getActiveSheet()->getColumnDimension('K')->setWidth(8);
+        $objPHPExcel->getActiveSheet()->getColumnDimension('L')->setWidth(8);
+        $objPHPExcel->getActiveSheet()->getColumnDimension('M')->setWidth(8);
         $objPHPExcel->getActiveSheet()->getColumnDimension('N')->setWidth(8);
         $objPHPExcel->getActiveSheet()->getColumnDimension('O')->setWidth(16);
         $objPHPExcel->getActiveSheet()->getColumnDimension('P')->setWidth(25);
-        $objPHPExcel->getActiveSheet()->getColumnDimension('Q')->setWidth(12);
+        $objPHPExcel->getActiveSheet()->getColumnDimension('Q')->setWidth(8);
         $objPHPExcel->getActiveSheet()->getColumnDimension('R')->setWidth(16);
         $objPHPExcel->getActiveSheet()->getColumnDimension('S')->setWidth(26);
         $objPHPExcel->getActiveSheet()->getColumnDimension('T')->setWidth(25);
@@ -452,78 +439,67 @@ class Orders extends Base
         $objPHPExcel->getActiveSheet()->getColumnDimension('X')->setWidth(25);
         $objPHPExcel->getActiveSheet()->getColumnDimension('Y')->setWidth(25);
         $objPHPExcel->getActiveSheet()->getColumnDimension('Z')->setWidth(25);
-        $objPHPExcel->getActiveSheet()->getColumnDimension('AA')->setWidth(25);
-        $objPHPExcel->getActiveSheet()->getColumnDimension('AB')->setWidth(25);
-        $objPHPExcel->getActiveSheet()->getColumnDimension('AC')->setWidth(25);
-        $objPHPExcel->getActiveSheet()->getStyle('A1:AC1')->getFill()->setFillType(\PHPExcel_Style_Fill::FILL_SOLID);
-        $objPHPExcel->getActiveSheet()->getStyle('A1:AC1')->getFill()->getStartColor()->setARGB('333399');
+        $objPHPExcel->getActiveSheet()->getStyle('A1:W1')->getFill()->setFillType(\PHPExcel_Style_Fill::FILL_SOLID);
+        $objPHPExcel->getActiveSheet()->getStyle('A1:W1')->getFill()->getStartColor()->setARGB('333399');
 
         $objPHPExcel->getActiveSheet()
-                    ->setCellValue('A1', '序号')
-                    ->setCellValue('B1', '订单编号')
-                    ->setCellValue('C1', '实付金额')
+                    ->setCellValue('A1', '订单编号')
+                    ->setCellValue('B1', '订单状态')
+                    ->setCellValue('C1', '店铺名称')
                     ->setCellValue('D1', '收货人')
-                    ->setCellValue('E1', '现金额')
-                    ->setCellValue('F1', '旺旺券')
-                    ->setCellValue('G1', '产品券')
-                    ->setCellValue('H1', '产品券税')
-                    ->setCellValue('I1', '产品券手续费')
-                    ->setCellValue('J1', '优惠券')
-                    ->setCellValue('K1', '优惠券税')
-                    ->setCellValue('L1', '优惠券手续费')
-                    ->setCellValue('M1', '店铺名称')
-                    ->setCellValue('N1', '优惠款')
-                    ->setCellValue('O1', '商户付现')
-                    ->setCellValue('P1', '下单时间')
-                    ->setCellValue('Q1', '订单状态')
-
-                    ->setCellValue('R1', '收货地址')
-                    ->setCellValue('S1', '联系方式')
-                    ->setCellValue('T1', '支付方式')
-                    ->setCellValue('U1', '配送方式')
-                    ->setCellValue('V1', '买家留言')
-                    ->setCellValue('W1', '发票信息')
-                    ->setCellValue('X1', '订单总金额')
-                    ->setCellValue('Y1', '运费')
-                    ->setCellValue('Z1', '支付方式')
-                    ->setCellValue('AA1', '发货时间')
-                    ->setCellValue('AB1', '收货时间')
-                    ->setCellValue('AC1', '取消/拒收原因');
-        $objPHPExcel->getActiveSheet()->getStyle('A1:AC1')->applyFromArray($styleArray);
+                    ->setCellValue('E1', '收货地址')
+                    ->setCellValue('F1', '联系方式')
+                    ->setCellValue('G1', '支付方式')
+                    ->setCellValue('H1', '配送方式')
+                    ->setCellValue('I1', '买家留言')
+                    ->setCellValue('J1', '发票信息')
+                    ->setCellValue('K1', '订单总金额')
+                    ->setCellValue('L1', '现金额')
+                    ->setCellValue('M1', '旺旺券')
+                    ->setCellValue('N1', '产品券')
+                    ->setCellValue('O1', '产品券税')
+                    ->setCellValue('P1', '产品券手续费')
+                    ->setCellValue('Q1', '优惠券')
+                    ->setCellValue('R1', '优惠券税')
+                    ->setCellValue('S1', '优惠券手续费')
+                    ->setCellValue('T1', '运费')
+                    ->setCellValue('U1', '实付金额')
+                    ->setCellValue('V1', '支付方式')
+                    ->setCellValue('W1', '下单时间')
+                    ->setCellValue('X1', '发货时间')
+                    ->setCellValue('Y1', '收货时间')
+                    ->setCellValue('Z1', '取消/拒收原因');
+        $objPHPExcel->getActiveSheet()->getStyle('A1:U1')->applyFromArray($styleArray);
 
         for ($row = 0; $row < count($page); $row++) {
             $i = $row + 2;
             $objPHPExcel->getActiveSheet()
-                        ->setCellValue('A' . $i, $row)
-                        ->setCellValue('B' . $i, $page[$row]['orderNo'])
-                        ->setCellValue('C' . $i, $page[$row]['realTotalMoney'])
+                        ->setCellValue('A' . $i, $page[$row]['orderNo'])
+                        ->setCellValue('B' . $i, $page[$row]['status'])
+                        ->setCellValue('C' . $i, $page[$row]['shopName'])
                         ->setCellValue('D' . $i, $page[$row]['userName'])
-                        ->setCellValue('E' . $i, $page[$row]['moneyNum'])
-                        ->setCellValue('F' . $i, $page[$row]['wangNum'])
-                        ->setCellValue('G' . $i, $page[$row]['productNum'])
-                        ->setCellValue('H' . $i, $page[$row]['productTaxFee'])
-                        ->setCellValue('I' . $i, $page[$row]['productHandlingFee'])
-                        ->setCellValue('J' . $i, $page[$row]['couponsNum'])
-                        ->setCellValue('K' . $i, $page[$row]['couponsTaxFee'])
-                        ->setCellValue('L' . $i, $page[$row]['couponsHandlingFee'])
-                        ->setCellValue('M' . $i, $page[$row]['shopName'])
-                        ->setCellValue('N' . $i, $page[$row]['coupons'])
-                        ->setCellValue('O' . $i, $page[$row]['payable'])
-                        ->setCellValue('P' . $i, $page[$row]['createTime'])
-                        ->setCellValue('Q' . $i, $page[$row]['status'])
-
-                        ->setCellValue('R' . $i, $page[$row]['userAddress'])
-                        ->setCellValue('S' . $i, $page[$row]['userPhone'])
-                        ->setCellValue('T' . $i, $page[$row]['payTypeName'])
-                        ->setCellValue('U' . $i, $page[$row]['deliverType'])
-                        ->setCellValue('V' . $i, $page[$row]['orderRemarks'])
-                        ->setCellValue('W' . $i, $page[$row]['invoiceClient'])
-                        ->setCellValue('X' . $i, $page[$row]['totalMoney'])
-                        ->setCellValue('Y' . $i, $page[$row]['deliverMoney'])
-                        ->setCellValue('Z' . $i, $page[$row]['payFrom'])
-                        ->setCellValue('AA' . $i, $page[$row]['deliveryTime'])
-                        ->setCellValue('AB' . $i, $page[$row]['receiveTime'])
-                        ->setCellValue('AC' . $i, $page[$row]['logContent']);
+                        ->setCellValue('E' . $i, $page[$row]['userAddress'])
+                        ->setCellValue('F' . $i, $page[$row]['userPhone'])
+                        ->setCellValue('G' . $i, $page[$row]['payTypeName'])
+                        ->setCellValue('H' . $i, $page[$row]['deliverType'])
+                        ->setCellValue('I' . $i, $page[$row]['orderRemarks'])
+                        ->setCellValue('J' . $i, $page[$row]['invoiceClient'])
+                        ->setCellValue('K' . $i, $page[$row]['totalMoney'])
+                        ->setCellValue('L' . $i, $page[$row]['moneyNum'])
+                        ->setCellValue('M' . $i, $page[$row]['wangNum'])
+                        ->setCellValue('N' . $i, $page[$row]['productNum'])
+                        ->setCellValue('O' . $i, $page[$row]['productTaxFee'])
+                        ->setCellValue('P' . $i, $page[$row]['productHandlingFee'])
+                        ->setCellValue('Q' . $i, $page[$row]['couponsNum'])
+                        ->setCellValue('R' . $i, $page[$row]['couponsTaxFee'])
+                        ->setCellValue('S' . $i, $page[$row]['couponsHandlingFee'])
+                        ->setCellValue('T' . $i, $page[$row]['deliverMoney'])
+                        ->setCellValue('U' . $i, $page[$row]['realTotalMoney'])
+                        ->setCellValue('V' . $i, $page[$row]['payFrom'])
+                        ->setCellValue('W' . $i, $page[$row]['createTime'])
+                        ->setCellValue('X' . $i, $page[$row]['deliveryTime'])
+                        ->setCellValue('Y' . $i, $page[$row]['receiveTime'])
+                        ->setCellValue('Z' . $i, $page[$row]['logContent']);
         }
 
         //输出EXCEL格式

hyhproject/app/controller/Index.php

@@ -23,6 +23,7 @@ class Index extends Base{
      * 首页
      */
     public function index(){
+        echo 'hello';die;
         echo request()->ip();die;
     	$m = new M();
     	hook('mobileControllerIndexIndex',['getParams'=>input()]);

hyhproject/app/controller/Uservouchers.php

@@ -38,7 +38,7 @@ class Uservouchers extends Base{
             if(1 == $vouchersType || 2 == $vouchersType){
                 $vouchersNames = [1=>'expectedProductNum',2=>'expectedCouponsNum'];
                 $m->setTable('user_vouchers_notice');
-                $list = $m->getSelect(['userId'=>$userId,$vouchersNames[$vouchersType]=>['neq',0],'isShow'=>1],$vouchersNames[$vouchersType].' num,remark,moneyType,createTime','id DESC');
+                $list = $m->getSelect(['userId'=>$userId,$vouchersNames[$vouchersType]=>['>=',0.01],'isShow'=>1],$vouchersNames[$vouchersType].' num,remark,moneyType,createTime','id DESC');
                 if(!empty($list['Rows'])){
                     foreach ($list['Rows'] as &$v) {
                         $v['createTime'] = date('Y-m-d H:i:s',$v['createTime']);

hyhproject/common/model/Orders.php

@@ -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("请选择商品规格型号！");

hyhproject/common/model/Settlements.php

@@ -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;
     }
     /**

hyhproject/common/model/Shopping.php

@@ -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)

hyhproject/common/model/UserVouchers.php

@@ -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');

hyhproject/common/model/Users.php

@@ -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{