地址，订单

addons/unishop/controller/Address.php

@@ -25,7 +25,7 @@ class Address extends Base
      * 允许频繁访问的接口
      * @var array
      */
-    protected $frequently = ['area','all','info'];
+    protected $frequently = ['area'];
 
     /**
      * @ApiTitle    (全部收货地址)
@@ -53,11 +53,11 @@ class Address extends Base
         $pagesize = input('pagesize', 15);
 
         $data = (new AddressModel())
-            /*->with([
+            ->with([
                 'province' => function($query) {$query->field('id,name');},
                 'city' => function($query) {$query->field('id,name');},
                 'area' => function($query) {$query->field('id,name');}
-            ])*/
+            ])
             ->where('user_id', $this->auth->id)
             ->order(['is_default' => 'desc', 'id' => 'desc'])
             ->limit(($page - 1) * $pagesize, $pagesize)
@@ -242,11 +242,11 @@ class Address extends Base
     {
         $id = input('id');
         $address = (new AddressModel())
-           /* ->with([
+            ->with([
                 'province' => function($query) {$query->field('id,name');},
                 'city' => function($query) {$query->field('id,name');},
                 'area' => function($query) {$query->field('id,name');}
-            ])*/
+            ])
             ->where(['id' => $id, 'user_id' => $this->auth->id])->find()->toArray();
         $this->success('', $address);
     }

addons/unishop/controller/Order.php

@@ -35,7 +35,7 @@ class Order extends Base
      * 允许频繁访问的接口
      * @var array
      */
-    protected $frequently = ['getorders','getOrders','detail','refund_reason'];
+    protected $frequently = ['getorders','getOrders','detail'];
 
     protected $noNeedLogin = ['count'];
 
@@ -313,7 +313,7 @@ class Order extends Base
      */
     public function getOrders()
     {
-        // 0=全部,1=待付款,3=待核销,4=已完成
+        // 0=全部,1=待付款,3=待核销,4=已完成,40=待评价
         $type = input('type', 0);
         $page = input('page', 1);
         $pagesize = input('pagesize', 10);
@@ -373,10 +373,10 @@ class Order extends Base
             $order->save();
 
             //归还优惠券
-            $coupon_user_id = Db::name('unishop_order_extend')->where('order_id',$order_id)->value('coupon_user_id');
+            /*$coupon_user_id = Db::name('unishop_order_extend')->where('order_id',$order_id)->value('coupon_user_id');
             if(!empty($coupon_user_id)){
                 Db::name('unishop_coupon_user')->where('id',$coupon_user_id)->where('user_id',$this->auth->id)->update(['status'=>0]);
-            }
+            }*/
 
             $this->success('取消成功', true);
         }
@@ -467,7 +467,7 @@ class Order extends Base
         $this->success('退订成功', true);
     }
     // 退款
-    public function old_refund($order, $refund_price)
+    private function old_refund($order, $refund_price)
     {
 
         $table = 'unishop_order';
@@ -682,6 +682,7 @@ class Order extends Base
     {
         $rate = input('rate', 5);
         $anonymous = input('anonymous', 0);
+        $images = input('images','','trim');
         $comment = input('comment');
         $order_id = input('order_id', 0);
         $order_id = \addons\unishop\extend\Hashids::decodeHex($order_id);
@@ -710,6 +711,7 @@ class Order extends Base
             $evaluate->product_id = $product_id;
             $evaluate->rate = $rate;
             $evaluate->anonymous = $anonymous;
+            $evaluate->images = $images;
             $evaluate->comment = $comment;
             $evaluate->spec = $orderProduct->spec;
             $result = $evaluate->save();

addons/unishop/model/Order.php

@@ -72,6 +72,7 @@ class Order extends Model
 //    const TYPE_DELIVES = 2; // 待发货
     const TYPE_RECEIVE = 3; // 待核销
     const TYPE_COMMENT = 4; // 已完成
+    const TYPE_NOCOMMENT = 40; // 待评价
 //    const TYPE_REFUND = 5; // 售后
 //    const TYPE_REFUSE = 6; // 拒绝退款
 //    const TYPE_OFF = 9; // 订单关闭
@@ -176,6 +177,9 @@ class Order extends Model
             case $data['have_paid'] != self::PAID_NO && $data['have_received'] != self::RECEIVED_NO && $data['status'] == self::STATUS_NORMAL:
                 $state = self::TYPE_COMMENT;
                 break;
+            case $data['have_paid'] != self::PAID_NO && $data['have_received'] != self::RECEIVED_NO && $data['have_commented'] != self::COMMENTED_NO && $data['status'] == self::STATUS_NORMAL:
+                $state = self::TYPE_NOCOMMENT;
+                break;
             case $data['status'] == self::STATUS_CANCEL:
                 $state = self::TYPE_CANCEL;
                 break;
@@ -199,6 +203,7 @@ class Order extends Model
             1 => '待付款',
             3 => '待核销',
             4 => '已完成',
+            40 => '待评价',
             20 => '已取消',
         ];
         if($state == 20 && $refund_status == 3){
@@ -334,7 +339,7 @@ class Order extends Model
     /**
      * 获取我的订单
      * @param int $userId 用户id
-     * @param int $state 0=全部,1=待付款,3=待核销,4=已完成
+     * @param int $state 0=全部,1=待付款,3=待核销,4=已完成,40=待评价
      */
     public function getOrdersByType($userId, $state = 0, $page = 1, $pageSize = 10)
     {
@@ -366,6 +371,14 @@ class Order extends Model
                 $condition['status'] = ['=', self::STATUS_NORMAL];
                 $orderBy = 'have_received';
                 break;
+            case self::TYPE_NOCOMMENT:                                                //40=待评价
+                $condition['have_paid'] = ['>', self::PAID_NO];
+                $condition['have_delivered'] = ['>', self::DELIVERED_NO];
+                $condition['have_received'] = ['>', self::RECEIVED_NO];
+                $condition['have_commented'] = ['=', self::COMMENTED_NO];
+                $condition['status'] = ['=', self::STATUS_NORMAL];
+                $orderBy = 'have_received';
+                break;
             /*case self::TYPE_REFUND:
                 $condition['have_paid'] = ['>', self::PAID_NO];
                 $condition['status'] = ['=', self::STATUS_REFUND];