订单状态设置为宏

app/admin/model/order/StoreOrder.php

@@ -403,27 +403,27 @@ HTML;
         else if ($status == 8)
             return $model;
         else if ($status == 0)//未支付
-            return $model->where($alert . 'paid', 0)->where($alert . 'status', 0)->where($alert . 'refund_status', 0)->where($alert . 'is_del', 0);
+            return $model->where($alert . 'paid', 0)->where($alert . 'status', ORDER_WAITING_SHIP)->where($alert . 'refund_status', REFUND_NO)->where($alert . 'is_del', 0);
         else if ($status == 1)//已支付 未发货
-            return $model->where($alert . 'paid', 1)->where($alert . 'status', 0)->where($alert . 'shipping_type', 1)->where($alert . 'refund_status', 0)->where($alert . 'is_del', 0);
+            return $model->where($alert . 'paid', 1)->where($alert . 'status', ORDER_WAITING_SHIP)->where($alert . 'shipping_type', SHIPPING_EXPRESS)->where($alert . 'refund_status', REFUND_NO)->where($alert . 'is_del', 0);
         else if ($status == 2)//已支付  待收货
-            return $model->where($alert . 'paid', 1)->where($alert . 'status', 1)->where($alert . 'shipping_type', 1)->where($alert . 'refund_status', 0)->where($alert . 'is_del', 0);
+            return $model->where($alert . 'paid', 1)->where($alert . 'status', ORDER_WAITING_RECEIPT)->where($alert . 'shipping_type', SHIPPING_EXPRESS)->where($alert . 'refund_status', REFUND_NO)->where($alert . 'is_del', 0);
         else if ($status == 5)//已支付  待核销
-            return $model->where($alert . 'paid', 1)->where($alert . 'status', 0)->where($alert . 'shipping_type', 2)->where($alert . 'refund_status', 0)->where($alert . 'is_del', 0);
+            return $model->where($alert . 'paid', 1)->where($alert . 'status', ORDER_WAITING_SHIP)->where($alert . 'shipping_type', SHIPPING_SELF_COLLECT)->where($alert . 'refund_status', REFUND_NO)->where($alert . 'is_del', 0);
         else if ($status == 3)// 已支付  已收货  待评价
-            return $model->where($alert . 'paid', 1)->where($alert . 'status', 2)->where($alert . 'refund_status', 0)->where($alert . 'is_del', 0);
+            return $model->where($alert . 'paid', 1)->where($alert . 'status', ORDER_RECEIPTED)->where($alert . 'refund_status', REFUND_NO)->where($alert . 'is_del', 0);
         else if ($status == 4)// 交易完成
-            return $model->where($alert . 'paid', 1)->where($alert . 'status', 3)->where($alert . 'refund_status', 0)->where($alert . 'is_del', 0);
+            return $model->where($alert . 'paid', 1)->where($alert . 'status', ORDER_WAITING_COMMENT)->where($alert . 'refund_status', REFUND_NO)->where($alert . 'is_del', 0);
         else if ($status == -1)//退款中
-            return $model->where($alert . 'paid', 1)->where($alert . 'refund_status', 1)->where($alert . 'is_del', 0);
+            return $model->where($alert . 'paid', 1)->where($alert . 'refund_status', REFUNDING)->where($alert . 'is_del', 0);
         else if ($status == -2)//已退款
-            return $model->where($alert . 'paid', 1)->where($alert . 'refund_status', 2)->where($alert . 'is_del', 0);
+            return $model->where($alert . 'paid', 1)->where($alert . 'refund_status', REFUNDED)->where($alert . 'is_del', 0);
         else if ($status == -3)//退款
             return $model->where($alert . 'paid', 1)->where($alert . 'refund_status', 'in', '1,2')->where($alert . 'is_del', 0);
         else if ($status == -4)//已删除
             return $model->where($alert . 'is_del', 1);
         else if ($status == 9)//已卖出
-            return $model->where($alert . 'paid', 1)->where($alert . 'refund_status', 0)->where($alert . 'is_del', 0);
+            return $model->where($alert . 'paid', 1)->where($alert . 'refund_status', REFUND_NO)->where($alert . 'is_del', 0);
         else
             return $model;
     }

app/common.php

@@ -11,6 +11,24 @@
 
 // 应用公共文件
 
+// 订单常量
+// 订单状态（-1 : 申请退款 -2 : 退货成功 0：待发货；1：待收货；2：已收货；3：待评价；-1：已退款）
+define('ORDER_REFUND_REQUSTED', -1);
+define('ORDER_REFUNDED', -2);
+define('ORDER_WAITING_SHIP', 0);
+define('ORDER_WAITING_RECEIPT', 1);
+define('ORDER_RECEIPTED', 2);
+define('ORDER_WAITING_COMMENT', 3);
+// 退款状态
+// 0 未退款 1 申请中 2 已退款
+define('REFUND_NO', 0);
+define('REFUNDING', 1);
+define('REFUNDED', 2);
+// 配送方式
+// 配送方式 1=快递 ，2=门店自提
+define('SHIPPING_EXPRESS', 1);
+define('SHIPPING_SELF_COLLECT', 2);
+
 
 if (!function_exists('exception')) {
     /**