|
|
@@ -1824,7 +1824,7 @@ class GoodsController extends Curd
|
|
|
'order_status_storage' => $params['order_status_storage'],
|
|
|
'order_platform' => $params['order_platform'],
|
|
|
'order_remark' => $params['order_remark'] ?? '',
|
|
|
- 'order_discount_json' => !empty($orderAmount['goodsIds']) && in_array($goods['goods_id'], $orderAmount['goodsIds']) ? json_encode($discountJson) : '[]',
|
|
|
+ 'order_discount_json' => (!empty($orderAmount['goodsIds']) && in_array($goods['goods_id'], $orderAmount['goodsIds'])) || (empty($orderAmount['goodsIds']) && !empty($orderAmount['amount'])) ? json_encode($discountJson) : '[]',
|
|
|
'order_config_json' => $params['order_config_json'] ?? '[]',
|
|
|
'order_express_json' => $params['order_express_json'] ?? '[]',
|
|
|
'order_extend_json' => $params['order_extend_json'] ? json_encode($params['order_extend_json']) : '[]',
|
gorden