更新文件

app/admin/controller/HotList.php

@@ -7,7 +7,6 @@ use app\admin\logic\HotListLogic;
 use app\common\basics\AdminBase;
 use app\common\server\JsonServer;
 use think\facade\Db;
-use app\common\enum\GoodsEnum;
 
 class HotList extends AdminBase
 {

app/admin/controller/Index.php

@@ -31,6 +31,7 @@ use think\facade\Config;
 use app\admin\logic\shop\LocalStoreLogic;
 use app\admin\logic\distribution\ApplyLogic;
 
+
 class Index extends AdminBase
 {
     /**
@@ -89,8 +90,7 @@ class Index extends AdminBase
     private static function get_unaudited()
     {
         $data['localStoreCount'] = LocalStoreLogic::get_unaudited_data();
-//        $data['distributionMemberCount'] = ApplyLogic::get_unaudited_data();
-        $data['distributionMemberCount'] = 0;
+        $data['distributionMemberCount'] = ApplyLogic::get_unaudited_data();
         return $data;
     }
 }

app/admin/controller/Login.php

@@ -24,16 +24,7 @@ namespace app\admin\controller;
 use app\admin\logic\LoginLogic;
 use app\admin\validate\LoginValidate;
 use app\common\basics\AdminBase;
-use app\common\enum\NoticeEnum;
-use app\common\enum\PayEnum;
-use app\common\logic\AccountLogLogic;
-use app\common\model\AccountLog;
-use app\common\model\billions\Billions;
-use app\common\model\user\User;
 use app\common\server\JsonServer;
-use app\common\server\WeChatServer;
-use EasyWeChat\Factory;
-use app\common\model\RechargeOrder;
 
 class Login extends AdminBase
 {

app/admin/controller/distribution/DistributionMember.php

@@ -4,7 +4,6 @@ namespace app\admin\controller\distribution;
 use app\admin\logic\distribution\DistributionLevelLogic;
 use app\admin\logic\distribution\DistributionMemberLogic;
 use app\common\basics\AdminBase;
-use app\common\model\distribution\DistributionMemberApply;
 use app\common\server\JsonServer;
 
 /**
@@ -118,6 +117,7 @@ class DistributionMember extends AdminBase
     {
         $params = $this->request->get();
         $user = DistributionMemberLogic::getMemberApply($params);
+
         return view('', [
             'user' => $user
         ]);

app/admin/controller/finance/Finance.php

@@ -21,8 +21,8 @@ namespace app\admin\controller\finance;
 
 use app\common\basics\AdminBase;
 use app\admin\logic\finance\FinanceLogic;
-use app\common\server\JsonServer;
 use think\facade\View;
+use app\common\server\JsonServer;
 
 /**
  * 财务中心
@@ -38,6 +38,7 @@ class Finance extends AdminBase
             $result = FinanceLogic::shop($post);
             return JsonServer::success('', $result);
         }
+        
         View::assign('shop', FinanceLogic::shop());
         return view();
     }

app/admin/controller/finance/User.php

@@ -72,6 +72,7 @@ class User extends AdminBase
             date('Y-m-d 23:59:59', time())
         ];
         $summary = WithdrawLogic::summary();
+     
         return view('', [
             'today' => $today,
             'yesterday' => $yesterday,

app/admin/controller/goods/Goods.php

@@ -23,15 +23,11 @@ namespace app\admin\controller\goods;
 use app\common\basics\AdminBase;
 use app\common\enum\GoodsEnum;
 use app\common\model\goods\GoodsBrand;
-use app\common\model\goods\Goodscontact;
 use app\common\model\goods\GoodsItem;
 use app\common\model\goods\GoodsUnit;
 use app\common\model\Freight;
 use app\common\model\goods\Supplier;
 use app\common\model\goods\Goods as GoodsModel;
-use app\common\model\order\Order;
-use app\common\model\order\OrderGoods;
-use app\common\model\user\UserAddress;
 use app\common\server\JsonServer;
 use app\admin\logic\goods\CategoryLogic as MallCategoryLogic;
 use app\admin\logic\goods\GoodsLogic;
@@ -39,8 +35,12 @@ use app\admin\logic\goods\ColumnLogic;
 use app\shop\logic\goods\CategoryLogic as ShopCategoryLogic;
 use think\exception\ValidateException;
 use app\admin\validate\goods\GoodsValidate;
-use EasyWeChat\Factory;
 use weixin\Getgzopenid;
+use app\common\model\order\Order;
+use app\common\model\order\OrderGoods;
+use app\common\model\user\UserAddress;
+use app\common\model\goods\Goodscontact;
+
 /**
  * 商品管理
  * Class Goods
@@ -156,41 +156,6 @@ class Goods extends AdminBase
             }
             return JsonServer::error('设置失败');
         }
-//        $a = \app\common\model\goods\Goods::where("del",0)->select();
-//        foreach($a as $k=>$v){
-//            $d = array();
-//            $gi = GoodsItem::where("goods_id",$v['id'])->select();
-//            foreach($gi as $key=>$value){
-//                $da = array();
-//                if($key==0){
-//                    if($v['wholesale_percent'] >0){
-//                        $d['wholesale_price'] = round($value['wh_price']*(100+$v['wholesale_percent'])/100,2);
-//                    }
-//                    if($v['purchase_percent'] >0){
-//                        $d['purchase_price'] = round($value['pu_price']*(100+$v['purchase_percent'])/100,2);
-//                    }
-//                    if($v['issuing_percent'] >0){
-//                        $d['issuing_price'] = round($value['is_price']*(100+$v['issuing_percent'])/100,2);
-//                    }
-//                    if(!empty($d)){
-//                        $goods_msg = \app\common\model\goods\Goods::where("id",$v['id'])->update($d);
-//                    }
-//                }
-//                if($v['wholesale_percent'] >0){
-//                    $da['wholesale_pce'] = round($value['wh_price']*(100+$v['wholesale_percent'])/100,2);
-//                }
-//                if($v['purchase_percent'] >0){
-//                    $da['purchase_price'] = round($value['pu_price']*(100+$v['purchase_percent'])/100,2);
-//                }
-//                if($v['issuing_percent'] >0){
-//                    $da['issuing_price'] = round($value['is_price']*(100+$v['issuing_percent'])/100,2);
-//                }
-//                if(!empty($da)){
-//                    GoodsItem::where("id",$value['id'])->update($da);
-//                }
-//
-//            }
-//        }
         $goods_id = $this->request->get('goods_id', '', 'intval');
         $goods_detail = GoodsModel::find($goods_id);
         $goods_detail['column_ids'] = $goods_detail['column_ids'] ? explode(',', $goods_detail['column_ids']) : [];

app/admin/controller/setting/PayConfig.php

@@ -145,4 +145,5 @@ class PayConfig extends AdminBase
         }
         return view('', ['info' => PayConfigLogic::info('xiny')]);
     }
+
 }

app/admin/controller/shop/LocalStore.php

@@ -47,6 +47,18 @@ class LocalStore extends AdminBase
         ]);
     }
     
+    
+    public function del() {
+        if ($this->request->isAjax()) {
+            $post = $this->request->post();
+            if (LocalStoreLogic::del($post['id'])) {
+                return JsonServer::success('删除成功');
+            }
+        }
+        
+        return JsonServer::success('删除成功');
+    }
+
     /**
      * @notes 审核操作
      */
@@ -94,8 +106,9 @@ class LocalStore extends AdminBase
     {
         if ($this->request->isAjax()) {
             $post = $this->request->post();
+ 
             if ($post['lstore_id'] > 0){
-                $result = LocalStoreLogic::getPayImage($post['lstore_id']);
+                $result = LocalStoreLogic::getPayImage($post['user_id'], $post['lstore_id']);
                 if ($result['pay_image']) {
                     $path = parse_url($result['pay_image'])['path'];
                     $url = (string)url("index/download/downloadLocalStoreErcodeImage", ['url' => $path], false, true);