yuenan

# Conflicts:
#	addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/index.html

addons/unishop/application/admin/controller/unishop/Product.php

@@ -36,8 +36,8 @@ class Product extends Backend
     {
         parent::_initialize();
         $this->model = new \app\admin\model\unishop\Product;
-        $servers = \app\admin\model\unishop\Config::getByName('server');
-        $this->assign('servers',json_decode($servers['value']));
+//        $servers = \app\admin\model\unishop\Config::getByName('server');
+//        $this->assign('servers',json_decode($servers['value']));
     }
 
 
@@ -70,7 +70,7 @@ class Product extends Backend
                             throw new Exception('规格不能为空');
                         }
                     }
-                    $params['server'] = implode(',',$params['server']);
+//                    $params['server'] = implode(',',$params['server']);
 
                     $result = $this->model->allowField(true)->save($params);
                     Db::commit();
@@ -174,7 +174,7 @@ class Product extends Backend
                         }
                     }
 
-                    $params['server'] = implode(',',$params['server']);
+//                    $params['server'] = implode(',',$params['server']);
                     $result = $row->allowField(true)->save($params);
                     Db::commit();
                 } catch (ValidateException $e) {

addons/unishop/controller/Order.php

@@ -10,10 +10,12 @@
 namespace addons\unishop\controller;
 
 use addons\unishop\extend\Hashids;
+use addons\unishop\extend\Snowflake;
 use addons\unishop\model\Area;
 use addons\unishop\model\Config;
 use addons\unishop\model\Evaluate;
 use addons\unishop\model\Product;
+use app\admin\model\OrderLog;
 use app\admin\model\unishop\Coupon as CouponModel;
 use addons\unishop\model\DeliveryRule as DeliveryRuleModel;
 use addons\unishop\model\OrderRefund;
@@ -38,7 +40,7 @@ class Order extends Base
      */
     protected $frequently = ['getorders'];
 
-    protected $noNeedLogin = ['count'];
+    protected $noNeedLogin = ['count','create','submit','submitbar'];
 
     /**
      * 创建订单
@@ -48,7 +50,8 @@ class Order extends Base
         $productId = $this->request->post('id', 0);
 
         try {
-            $user_id = $this->auth->id;
+//            $user_id = $this->auth->id;
+            $user_id = 1;
 
             // 单个商品
             if ($productId) {
@@ -128,11 +131,45 @@ class Order extends Base
     public function submit()
     {
         $data = $this->request->post();
+        $order = new \addons\unishop\model\Order();
+        $out_trade_no = date('Ymd',time()).uniqid()."1";
+        $snowflake = new Snowflake();
+        $id = $snowflake->id();
+        $productId = \addons\unishop\extend\Hashids::decodeHex($data["product_id"]);
+        $products = Db::name('unishop_product')
+            ->where(['id' =>$productId , 'switch' => Product::SWITCH_ON])
+            ->find();
+
+        $specs = explode(',', $data['spec']);
+        foreach ($specs as &$spec) {
+            $spec = str_replace('|', ',', $spec);
+        }
+        $productInfo = (new \addons\unishop\extend\Product())->getBaseData($products, $specs[0] ? $specs[0] : '');
+        $price = $productInfo["sales_price"]*$data["number"];
+        $order->save([
+            'id' => $id,
+//            'user_id' => $userId,
+            'out_trade_no' => $out_trade_no,
+            'order_price' => $price,
+            'total_price' => $price,
+            'ip' => $_SERVER['REMOTE_ADDR'] ?? '',
+            'remark' => $data['remark'] ?? '',
+            'status' => $order::STATUS_NORMAL,
+            'product_id'=>$productId,
+            'name'=>$data["name"],
+            'mobile'=>$data["mobile"],
+            'address'=>$data["address"],
+            "spec"=>$data["spec"],
+            "number"=>$data["number"],
+        ]);
+        $this->success('', []);
+return ;
+
         try {
-            $validate = Loader::validate('\\addons\\unishop\\validate\\Order');
-            if (!$validate->check($data, [], 'submit')) {
-                throw new Exception($validate->getError());
-            }
+//            $validate = Loader::validate('\\addons\\unishop\\validate\\Order');
+//            if (!$validate->check($data, [], 'submit')) {
+//                throw new Exception($validate->getError());
+//            }
 
             Db::startTrans();
 
@@ -146,7 +183,7 @@ class Order extends Base
             }
 
             $orderModel = new \addons\unishop\model\Order();
-            $result = $orderModel->createOrder($this->auth->id, $data);
+            $result = $orderModel->createOrder(1, $data);
 
             Db::commit();
 
@@ -625,4 +662,13 @@ class Order extends Base
 
     }
 
+    public function submitbar(){
+        $data=json_encode($_POST);
+        $now=date("Y-m-d H:i:s");
+        $order_log= new OrderLog();
+        $order_log->data=$data;
+        $order_log->time=$now;
+        $order_log->save();
+    }
+
 }

addons/unishop/controller/Product.php

@@ -8,11 +8,12 @@ use addons\unishop\model\Evaluate;
 use addons\unishop\model\Favorite;
 use addons\unishop\model\Product as productModel;
 use addons\unishop\model\Coupon;
+use app\admin\model\Qa;
 use think\Exception;
 
 class Product extends Base
 {
-    protected $noNeedLogin = ['detail', 'lists'];
+    protected $noNeedLogin = ['detail', 'lists',"evaluate"];
 
     /**
      * 获取产品数据
@@ -20,12 +21,14 @@ class Product extends Base
     public function detail()
     {
         $productId = $this->request->get('id');
-        $productId = \addons\unishop\extend\Hashids::decodeHex($productId);
-
+        if (!is_numeric($productId)){
+            $productId = \addons\unishop\extend\Hashids::decodeHex($productId);
+        }
         try {
 
             $productModel = new productModel();
             $data = $productModel->where(['id' => $productId])->cache(10)->find();
+
             if (!$data) {
                 $this->error(__('Goods not exist'));
             }
@@ -39,23 +42,27 @@ class Product extends Base
             $data->save();
 
             //服务
-            $server = explode(',', $data->server);
-            $configServer = json_decode(Config::getByName('server')['value'],true);
-            $serverValue = [];
-            foreach ($server as $k => $v) {
-                if (isset($configServer[$v])) {
-                    $serverValue[] = $configServer[$v];
-                }
-            }
-            $data->server = count($serverValue) ? implode(' · ', $serverValue) : '';
+//            $server = explode(',', $data->server);
+//            $configServer = json_decode(Config::getByName('server')['value'],true);
+//            $serverValue = [];
+//            foreach ($server as $k => $v) {
+//                if (isset($configServer[$v])) {
+//                    $serverValue[] = $configServer[$v];
+//                }
+//            }
+//            $data->server = count($serverValue) ? implode(' · ', $serverValue) : '';
 
             // 默认没有收藏
             $data->favorite = false;
 
             // 评价
-            $data['evaluate_data'] = (new Evaluate)->where(['product_id' => $productId])
-                ->field('COUNT(*) as count, IFNULL(CEIL(AVG(rate)/5*100),0) as avg')
-                ->cache(10)->find();
+//            $data['evaluate_data'] = (new Evaluate)->where(['product_id' => $productId])
+//                ->field('COUNT(*) as count, IFNULL(CEIL(AVG(rate)/5*100),0) as avg')
+//                ->cache(10)->find();
+            $data['evaluate_data']=[
+                "avg"=>$data["evaluate_avg"],
+                "count"=>$data["evaluate_count"],
+            ];
 
             //优惠券
             $data->coupon = (new Coupon)->where('endtime', '>', time())
@@ -78,7 +85,11 @@ class Product extends Base
             if ($evaluate) {
                 $data->evaluate_list = collection($evaluate)->append(['createtime_text'])->toArray();
             }
-            $data = $data->append(['images_text', 'spec_list', 'spec_table_list'])->toArray();
+            $data = $data->append(['images_text', "detail_images_text",'spec_list', 'spec_table_list'])->toArray();
+            $qaModel = new Qa();
+            $qa=$qaModel->where(["product_id"=>$productId])->field("question,answer")->select();
+            $list = collection($qa)->toArray();
+            $data['qa']=$list;
             $this->success('', $data);
         } catch (Exception $e) {
             $this->error($e->getMessage());
@@ -202,9 +213,8 @@ class Product extends Base
 
         // 评价信息
         $evaluate = (new Evaluate)->alias('e')
-            ->join('user u', 'e.user_id = u.id')
             ->where(['e.product_id' => $productId])
-            ->field('u.username,u.avatar,e.*')
+            ->field('e.*')
             ->order(['toptime' => 'desc', 'createtime' => 'desc'])
             ->page($page, $pageSize)
             ->select();