|
@@ -6,13 +6,7 @@ use think\facade\Db;
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
* ============================================================================
|
|
* ============================================================================
|
|
|
- * DSMall多用户商城
|
|
|
|
|
- * ============================================================================
|
|
|
|
|
- * 版权所有 2014-2028 长沙德尚网络科技有限公司,并保留所有权利。
|
|
|
|
|
- * 网站地址: http://www.csdeshang.com
|
|
|
|
|
- * ----------------------------------------------------------------------------
|
|
|
|
|
- * 这不是一个自由软件!您只能在不用于商业目的的前提下对程序代码进行修改和使用 .
|
|
|
|
|
- * 不允许对程序代码以任何形式任何目的的再发布。
|
|
|
|
|
|
|
+ *
|
|
|
* ============================================================================
|
|
* ============================================================================
|
|
|
* 逻辑层模型
|
|
* 逻辑层模型
|
|
|
*/
|
|
*/
|
|
@@ -274,7 +268,6 @@ class Order {
|
|
|
$data['log_role'] = $role;
|
|
$data['log_role'] = $role;
|
|
|
$data['log_user'] = $user;
|
|
$data['log_user'] = $user;
|
|
|
$data['log_msg'] = '修改了运费' . '( ' . $price . ' )';
|
|
$data['log_msg'] = '修改了运费' . '( ' . $price . ' )';
|
|
|
- ;
|
|
|
|
|
$data['log_orderstate'] = $order_info['payment_code'] == 'offline' ? ORDER_STATE_PAY : ORDER_STATE_NEW;
|
|
$data['log_orderstate'] = $order_info['payment_code'] == 'offline' ? ORDER_STATE_PAY : ORDER_STATE_NEW;
|
|
|
$order_model->addOrderlog($data);
|
|
$order_model->addOrderlog($data);
|
|
|
return ds_callback(true, '操作成功');
|
|
return ds_callback(true, '操作成功');
|
|
@@ -362,7 +355,6 @@ class Order {
|
|
|
$data['log_role'] = $role;
|
|
$data['log_role'] = $role;
|
|
|
$data['log_user'] = $user;
|
|
$data['log_user'] = $user;
|
|
|
$data['log_msg'] = '修改了商品费用' . '( ' . $price . ' )';
|
|
$data['log_msg'] = '修改了商品费用' . '( ' . $price . ' )';
|
|
|
- ;
|
|
|
|
|
$data['log_orderstate'] = $order_info['payment_code'] == 'offline' ? ORDER_STATE_PAY : ORDER_STATE_NEW;
|
|
$data['log_orderstate'] = $order_info['payment_code'] == 'offline' ? ORDER_STATE_PAY : ORDER_STATE_NEW;
|
|
|
$order_model->addOrderlog($data);
|
|
$order_model->addOrderlog($data);
|
|
|
} catch (\Exception $e) {
|
|
} catch (\Exception $e) {
|
|
@@ -493,7 +485,8 @@ class Order {
|
|
|
));
|
|
));
|
|
|
//微信模板消息
|
|
//微信模板消息
|
|
|
$param['weixin_param'] = array(
|
|
$param['weixin_param'] = array(
|
|
|
- 'url' => config('ds_config.h5_site_url') . '/member/order_detail?order_id=' . $order_id,
|
|
|
|
|
|
|
+ //'url' => config('ds_config.h5_site_url') . '/member/order_detail?order_id=' . $order_id,
|
|
|
|
|
+ 'url' => config('ds_config.h5_site_url') . '/pages/member/order/OrderDetail?order_id=' . $order_id,
|
|
|
'data' => array(
|
|
'data' => array(
|
|
|
"keyword1" => array(
|
|
"keyword1" => array(
|
|
|
"value" => isset($post['shipping_code']) ? $post['shipping_code'] : '无',
|
|
"value" => isset($post['shipping_code']) ? $post['shipping_code'] : '无',
|
|
@@ -656,7 +649,8 @@ class Order {
|
|
|
));
|
|
));
|
|
|
//微信模板消息
|
|
//微信模板消息
|
|
|
$param['weixin_param'] = array(
|
|
$param['weixin_param'] = array(
|
|
|
- 'url' => config('ds_config.h5_site_url') . '/member/order_detail?order_id=' . $order_info['order_id'],
|
|
|
|
|
|
|
+ //'url' => config('ds_config.h5_site_url') . '/member/order_detail?order_id=' . $order_info['order_id'],
|
|
|
|
|
+ 'url' => config('ds_config.h5_site_url') . '/pages/member/order/OrderDetail?order_id=' . $order_info['order_id'],
|
|
|
'data' => array(
|
|
'data' => array(
|
|
|
"keyword1" => array(
|
|
"keyword1" => array(
|
|
|
"value" => $order_info['order_sn'],
|
|
"value" => $order_info['order_sn'],
|
|
@@ -691,7 +685,8 @@ class Order {
|
|
|
$param['param'] = $param['ali_param'];
|
|
$param['param'] = $param['ali_param'];
|
|
|
|
|
|
|
|
$param['weixin_param'] = array(
|
|
$param['weixin_param'] = array(
|
|
|
- 'url' => config('ds_config.h5_site_url') . '/seller/order_detail?order_id=' . $order_info['order_id'],
|
|
|
|
|
|
|
+ //'url' => config('ds_config.h5_site_url') . '/seller/order_detail?order_id=' . $order_info['order_id'],
|
|
|
|
|
+ 'url' => config('ds_config.h5_store_site_url') . '/pages/seller/order/OrderDetail?order_id=' . $order_info['order_id'],
|
|
|
'data' => array(
|
|
'data' => array(
|
|
|
"keyword1" => array(
|
|
"keyword1" => array(
|
|
|
"value" => $order_info['order_sn'],
|
|
"value" => $order_info['order_sn'],
|