|
|
@@ -15,6 +15,7 @@ use common\models\DecOrder;
|
|
|
use common\models\forms\DeclarationForm;
|
|
|
use common\models\forms\OrderForm;
|
|
|
use common\models\Order;
|
|
|
+use common\models\OrderGoods;
|
|
|
use common\models\ReceiveAddress;
|
|
|
use common\models\Region;
|
|
|
use common\models\ShopGoods;
|
|
|
@@ -43,7 +44,12 @@ class ShopController extends BaseController {
|
|
|
'from' => ShopGoods::tableName(),
|
|
|
]);
|
|
|
foreach ($data['list'] as $key => $value) {
|
|
|
- $data['list'][$key]['DISCOUNT'] = ShopGoods::GOODS_TYPE[$value['TYPE']]['discount'];
|
|
|
+ if ($value['TYPE'] == 1 || $value['TYPE'] == 2) {
|
|
|
+ $data['list'][$key]['DISCOUNT'] = ShopGoods::GOODS_TYPE[$value['TYPE']]['discount'];
|
|
|
+ } else {
|
|
|
+ $data['list'][$key]['DISCOUNT'] = $value['SELL_DISCOUNT']*100;
|
|
|
+ }
|
|
|
+ // $data['list'][$key]['DISCOUNT'] = ShopGoods::GOODS_TYPE[$value['TYPE']]['discount'];
|
|
|
}
|
|
|
return static::notice($data);
|
|
|
}
|
|
|
@@ -79,10 +85,12 @@ class ShopController extends BaseController {
|
|
|
}
|
|
|
$userBalance = [
|
|
|
'points' => 0,
|
|
|
- 'cash' => 0
|
|
|
+ 'cash' => 0,
|
|
|
+ 'exchange' => 0
|
|
|
];
|
|
|
if ($userBonusResult = UserBonus::findOneAsArray(['USER_ID' => $userId])) {
|
|
|
$userBalance['points'] = $userBonusResult['RECONSUME_POINTS'];
|
|
|
+ $userBalance['exchange'] = $userBonusResult['EXCHANGE_POINTS'];
|
|
|
}
|
|
|
if ($userCashResult = UserWallet::findOneAsArray(['USER_ID' => $userId])) {
|
|
|
$userBalance['cash'] = $userCashResult['CASH'];
|
|
|
@@ -130,13 +138,14 @@ class ShopController extends BaseController {
|
|
|
$condition = ' AND USER_ID=:USER_ID AND IS_DEL=0';
|
|
|
$params[':USER_ID'] = \Yii::$app->user->id;
|
|
|
$data = DecOrder::lists($condition, $params, [
|
|
|
- 'select' => 'DO.*,U.USER_NAME USER_NAME,U.REAL_NAME REAL_NAME,RU.USER_NAME REC_USER_NAME,RU.REAL_NAME REC_REAL_NAME,CU.USER_NAME CON_USER_NAME,CU.REAL_NAME CON_REAL_NAME',
|
|
|
+ 'select' => 'DO.*,U.USER_NAME USER_NAME,U.REAL_NAME REAL_NAME,RU.USER_NAME REC_USER_NAME,RU.REAL_NAME REC_REAL_NAME,CU.USER_NAME CON_USER_NAME,CU.REAL_NAME CON_REAL_NAME,OG.*',
|
|
|
'orderBy' => 'DO.CREATED_AT DESC',
|
|
|
'from' => DecOrder::tableName() . ' AS DO',
|
|
|
'join' => [
|
|
|
['LEFT JOIN', User::tableName() . ' AS U', 'DO.TO_USER_ID=U.ID'],
|
|
|
['LEFT JOIN', User::tableName() . ' AS RU', 'DO.REC_USER_ID=RU.ID'],
|
|
|
['LEFT JOIN', User::tableName() . ' AS CU', 'DO.CON_USER_ID=CU.ID'],
|
|
|
+ ['LEFT JOIN', OrderGoods::tableName() . ' AS OG', 'OG.ORDER_SN=DO.ORDER_SN'],
|
|
|
],
|
|
|
]);
|
|
|
return static::notice($data);
|
|
|
@@ -152,11 +161,12 @@ class ShopController extends BaseController {
|
|
|
$condition = " AND ORDER_TYPE='FX' AND (USER_ID=:USER_ID OR CREATE_USER='$uname')";
|
|
|
$params[':USER_ID'] = \Yii::$app->user->id;
|
|
|
$data = Order::lists($condition, $params, [
|
|
|
- 'select' => 'O.*,U.REAL_NAME',
|
|
|
+ 'select' => 'O.*,U.REAL_NAME,OG.*',
|
|
|
'orderBy' => 'O.CREATED_AT DESC',
|
|
|
'from' => Order::tableName() . ' AS O',
|
|
|
'join' => [
|
|
|
['LEFT JOIN', User::tableName() . ' AS U', 'U.ID=O.USER_ID'],
|
|
|
+ ['LEFT JOIN', OrderGoods::tableName() . ' AS OG', 'OG.ORDER_SN=O.SN'],
|
|
|
],
|
|
|
]);
|
|
|
foreach ($data['list'] as $key => $value) {
|
|
|
@@ -178,7 +188,12 @@ class ShopController extends BaseController {
|
|
|
'from' => ShopGoods::tableName(),
|
|
|
]);
|
|
|
foreach ($data['list'] as $key => $value) {
|
|
|
- $data['list'][$key]['DISCOUNT'] = ShopGoods::GOODS_TYPE[$value['TYPE']]['discount'];
|
|
|
+ if ($value['TYPE'] == 1 || $value['TYPE'] == 2) {
|
|
|
+ $data['list'][$key]['DISCOUNT'] = ShopGoods::GOODS_TYPE[$value['TYPE']]['discount'];
|
|
|
+ } else {
|
|
|
+ $data['list'][$key]['DISCOUNT'] = $value['SELL_DISCOUNT']*100;
|
|
|
+ }
|
|
|
+ //$data['list'][$key]['DISCOUNT'] = ShopGoods::GOODS_TYPE[$value['TYPE']]['discount'];
|
|
|
}
|
|
|
return static::notice($data);
|
|
|
}
|
kevin_zhangl