|  | @@ -357,7 +357,7 @@ class Order extends Base
 | 
											
												
													
														|  |          if ($order['have_paid'] != \addons\unishop\model\Order::PAID_NO) {
 |  |          if ($order['have_paid'] != \addons\unishop\model\Order::PAID_NO) {
 | 
											
												
													
														|  |              $this->error('此订单已支付,无法取消');
 |  |              $this->error('此订单已支付,无法取消');
 | 
											
												
													
														|  |          }
 |  |          }
 | 
											
												
													
														|  | -        if ($order['have_delivered'] != \addons\unishop\model\Order::DELIVERED_NO) {
 |  | 
 | 
											
												
													
														|  | 
 |  | +        if ($order['have_received'] != \addons\unishop\model\Order::RECEIVED_NO) {
 | 
											
												
													
														|  |              $this->error('此订单已核销,无法取消');
 |  |              $this->error('此订单已核销,无法取消');
 | 
											
												
													
														|  |          }
 |  |          }
 | 
											
												
													
														|  |  
 |  |  
 | 
											
										
											
												
													
														|  | @@ -393,12 +393,12 @@ class Order extends Base
 | 
											
												
													
														|  |          if ($order['have_paid'] == \addons\unishop\model\Order::PAID_NO) {
 |  |          if ($order['have_paid'] == \addons\unishop\model\Order::PAID_NO) {
 | 
											
												
													
														|  |              $this->error('未支付订单,直接取消即可');
 |  |              $this->error('未支付订单,直接取消即可');
 | 
											
												
													
														|  |          }
 |  |          }
 | 
											
												
													
														|  | -        if ($order['have_delivered'] != \addons\unishop\model\Order::DELIVERED_NO) {
 |  | 
 | 
											
												
													
														|  | 
 |  | +        if ($order['have_received'] != \addons\unishop\model\Order::RECEIVED_NO) {
 | 
											
												
													
														|  |              $this->error('此订单已核销,无法退订');
 |  |              $this->error('此订单已核销,无法退订');
 | 
											
												
													
														|  |          }
 |  |          }
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |          Db::startTrans();
 |  |          Db::startTrans();
 | 
											
												
													
														|  | -        if ($order['status'] == \addons\unishop\model\Order::STATUS_NORMAL && $order['have_paid'] == \addons\unishop\model\Order::DELIVERED_NO) {
 |  | 
 | 
											
												
													
														|  | 
 |  | +        if ($order['status'] == \addons\unishop\model\Order::STATUS_NORMAL && $order['have_received'] == \addons\unishop\model\Order::RECEIVED_NO) {
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |              $refund_amount = $order['total_price'];
 |  |              $refund_amount = $order['total_price'];
 | 
											
												
													
														|  |              $refund_status = 3;
 |  |              $refund_status = 3;
 | 
											
										
											
												
													
														|  | @@ -444,7 +444,7 @@ class Order extends Base
 | 
											
												
													
														|  |      // 退款
 |  |      // 退款
 | 
											
												
													
														|  |      public function old_refund($order, $refund_price)
 |  |      public function old_refund($order, $refund_price)
 | 
											
												
													
														|  |      {
 |  |      {
 | 
											
												
													
														|  | -
 |  | 
 | 
											
												
													
														|  | 
 |  | +        return true;
 | 
											
												
													
														|  |          $table = 'unishop_order';
 |  |          $table = 'unishop_order';
 | 
											
												
													
														|  |          $remark = '订单退款';
 |  |          $remark = '订单退款';
 | 
											
												
													
														|  |  
 |  |  
 |