|
|
@@ -42,8 +42,8 @@ class xhUserAssetService
|
|
|
{
|
|
|
$userId = $user['id'];
|
|
|
$merchantId = $merchant['id'];
|
|
|
- $orderId = $order['id'];
|
|
|
- $orderSn = $order['orderSn'];
|
|
|
+ $orderId = isset($order['id']) ? $order['id'] : '';
|
|
|
+ $orderSn = isset($order['orderSn']) ? $order['orderSn'] : '';
|
|
|
$openId = $user['openId'];
|
|
|
$miniOpenId = isset($user['miniOpenId']) ? $user['miniOpenId'] : '';
|
|
|
$growth = isset($upAssetData['growth']) ? $upAssetData['growth'] : 0;
|
|
|
@@ -60,7 +60,6 @@ class xhUserAssetService
|
|
|
}
|
|
|
$typeList = configDict::getConfig('capitalType');//充值支付涉及的流水类型列表
|
|
|
switch ($capitalType) {//根据流水类型定制通知内容
|
|
|
-
|
|
|
case $typeList['xhOrder']['id']://购买商品
|
|
|
$goodsNum = $order['goodsNum'];
|
|
|
$totalFee = $order['actPrice'];
|
|
|
@@ -114,7 +113,6 @@ class xhUserAssetService
|
|
|
}
|
|
|
}
|
|
|
break;
|
|
|
-
|
|
|
case $typeList['xhActiveOrder']['id']://活动报名
|
|
|
$activeId = $order['activeId'];
|
|
|
$active = xhActiveService::getById($activeId);
|
shish