|
|
@@ -487,7 +487,7 @@ class ShopController extends BaseController {
|
|
|
$uname = Info::getUserNameByUserId(\Yii::$app->user->id);
|
|
|
$orderSn = \Yii::$app->request->get('orderSn');
|
|
|
|
|
|
- $condition = " AND ORDER_TYPE='FX' AND (USER_ID=:USER_ID OR CREATE_USER='$uname') AND SN=:SN AND O.IS_DELETE = 0";
|
|
|
+ $condition = " AND (USER_ID=:USER_ID OR CREATE_USER='$uname') AND SN=:SN AND O.IS_DELETE = 0";
|
|
|
$params = [
|
|
|
':USER_ID' => \Yii::$app->user->id,
|
|
|
':SN' => $orderSn,
|
|
|
@@ -502,7 +502,6 @@ class ShopController extends BaseController {
|
|
|
['LEFT JOIN', OrderGoods::tableName() . ' AS OG', 'OG.ORDER_SN=O.SN'],
|
|
|
],
|
|
|
]);
|
|
|
- LoggerTool::info($data);
|
|
|
if (!$data['list']) {
|
|
|
$condition .= ' AND (O.STATUS = :NOT_PAID OR O.STATUS = :FAIL_PAID)';
|
|
|
$params[':NOT_PAID'] = \Yii::$app->params['orderStatus']['notPaid']['value']; // 待支付
|
|
|
@@ -516,11 +515,8 @@ class ShopController extends BaseController {
|
|
|
['LEFT JOIN', ApproachOrderGoods::tableName() . ' AS OG', 'OG.ORDER_SN=O.SN'],
|
|
|
],
|
|
|
]);
|
|
|
- LoggerTool::notice($data);
|
|
|
}
|
|
|
|
|
|
- LoggerTool::error($data);
|
|
|
-
|
|
|
$userId = '';
|
|
|
$userName = '';
|
|
|
$address = '';
|