|
@@ -1098,8 +1098,11 @@ HTML;
|
|
|
// 'keyword4' => $postageData['delivery_name'],
|
|
// 'keyword4' => $postageData['delivery_name'],
|
|
|
// 'keyword5' => $postageData['delivery_id']
|
|
// 'keyword5' => $postageData['delivery_id']
|
|
|
// ]);
|
|
// ]);
|
|
|
|
|
+ if ($goodsName === ''){
|
|
|
|
|
+ $goodsName = '测试商品';
|
|
|
|
|
+ }
|
|
|
$group = array_merge($group, [
|
|
$group = array_merge($group, [
|
|
|
- 'thing4' => !empty($goodsName) ? $goodsName : '测试',
|
|
|
|
|
|
|
+ 'thing4' => $goodsName,
|
|
|
'character_string2' => $order['pay_type'] == 'offline' ? '线下支付' : date('Y/m/d H:i', $order['pay_time']),
|
|
'character_string2' => $order['pay_type'] == 'offline' ? '线下支付' : date('Y/m/d H:i', $order['pay_time']),
|
|
|
'phone_number21' => $order['user_address'],
|
|
'phone_number21' => $order['user_address'],
|
|
|
'thing13' => $postageData['delivery_name'],
|
|
'thing13' => $postageData['delivery_name'],
|
