|
@@ -241,7 +241,7 @@ class Order extends Base
|
|
*/
|
|
*/
|
|
public function getDelivery()
|
|
public function getDelivery()
|
|
{
|
|
{
|
|
- $cityId = $this->request->get('city_id', 0);
|
|
|
|
|
|
+ $cityId = $this->request->request('city_id', 0);
|
|
$delivery = (new DeliveryRuleModel())->getDelivetyByArea($cityId);
|
|
$delivery = (new DeliveryRuleModel())->getDelivetyByArea($cityId);
|
|
$this->success('', $delivery['list']);
|
|
$this->success('', $delivery['list']);
|
|
}
|
|
}
|
|
@@ -287,9 +287,9 @@ class Order extends Base
|
|
public function getOrders()
|
|
public function getOrders()
|
|
{
|
|
{
|
|
// 0=全部,1=待付款,2=待发货,3=待收货,4=待评价,5=售后
|
|
// 0=全部,1=待付款,2=待发货,3=待收货,4=待评价,5=售后
|
|
- $type = $this->request->get('type', 0);
|
|
|
|
- $page = $this->request->get('page', 1);
|
|
|
|
- $pagesize = $this->request->get('pagesize', 10);
|
|
|
|
|
|
+ $type = $this->request->request('type', 0);
|
|
|
|
+ $page = $this->request->request('page', 1);
|
|
|
|
+ $pagesize = $this->request->request('pagesize', 10);
|
|
try {
|
|
try {
|
|
|
|
|
|
$orderModel = new \addons\unishop\model\Order();
|
|
$orderModel = new \addons\unishop\model\Order();
|
|
@@ -314,7 +314,7 @@ class Order extends Base
|
|
*/
|
|
*/
|
|
public function cancel()
|
|
public function cancel()
|
|
{
|
|
{
|
|
- $order_id = $this->request->get('order_id', 0);
|
|
|
|
|
|
+ $order_id = $this->request->request('order_id', 0);
|
|
$order_id = \addons\unishop\extend\Hashids::decodeHex($order_id);
|
|
$order_id = \addons\unishop\extend\Hashids::decodeHex($order_id);
|
|
|
|
|
|
$orderModel = new \addons\unishop\model\Order();
|
|
$orderModel = new \addons\unishop\model\Order();
|
|
@@ -356,7 +356,7 @@ class Order extends Base
|
|
*/
|
|
*/
|
|
public function delete()
|
|
public function delete()
|
|
{
|
|
{
|
|
- $order_id = $this->request->get('order_id', 0);
|
|
|
|
|
|
+ $order_id = $this->request->request('order_id', 0);
|
|
$order_id = \addons\unishop\extend\Hashids::decodeHex($order_id);
|
|
$order_id = \addons\unishop\extend\Hashids::decodeHex($order_id);
|
|
|
|
|
|
$orderModel = new \addons\unishop\model\Order();
|
|
$orderModel = new \addons\unishop\model\Order();
|
|
@@ -390,7 +390,7 @@ class Order extends Base
|
|
*/
|
|
*/
|
|
public function received()
|
|
public function received()
|
|
{
|
|
{
|
|
- $order_id = $this->request->get('order_id', 0);
|
|
|
|
|
|
+ $order_id = $this->request->request('order_id', 0);
|
|
$order_id = \addons\unishop\extend\Hashids::decodeHex($order_id);
|
|
$order_id = \addons\unishop\extend\Hashids::decodeHex($order_id);
|
|
|
|
|
|
$orderModel = new \addons\unishop\model\Order();
|
|
$orderModel = new \addons\unishop\model\Order();
|
|
@@ -589,7 +589,7 @@ class Order extends Base
|
|
*/
|
|
*/
|
|
public function detail()
|
|
public function detail()
|
|
{
|
|
{
|
|
- $order_id = $this->request->get('order_id', 0);
|
|
|
|
|
|
+ $order_id = $this->request->request('order_id', 0);
|
|
$order_id = \addons\unishop\extend\Hashids::decodeHex($order_id);
|
|
$order_id = \addons\unishop\extend\Hashids::decodeHex($order_id);
|
|
|
|
|
|
try {
|
|
try {
|