细化日志文案

app/common/repositories/store/order/StoreOrderRepository.php

@@ -886,6 +886,15 @@ class StoreOrderRepository extends BaseRepository
                     unset($order['cartInfo'], $order['orderInfo']);
                     $_order = $this->dao->create($order);
 
+                    $make = '商贸区';
+                    if ($_order->mer_id == 439) {
+                        $make = '精彩生活区';
+                    } else if ($_order->mer_id == 496) {
+                        $make = '会员专区';
+                    } else if ($_order->mer_id == 491) {
+                        $make = '复购区';
+                    }
+
                     //组合支付逻辑
 
                     $groupOrder['er'] = 0;
@@ -920,7 +929,7 @@ class StoreOrderRepository extends BaseRepository
                             Db::name("user_sign_vr")->insert([
                                 'uid' => $uid,
                                 'number' => $array_fzone_paytype['price'],
-                                'mark' => "购买商品消费VR",
+                                'mark' => "购买{$make}商品消费VR",
                                 'desc' => "VR",
                                 'order_type' => 0,
                                 'order_id' => $_order->order_id,
@@ -935,7 +944,7 @@ class StoreOrderRepository extends BaseRepository
                                 'status' => 1,
                                 'order_type' => 0,
                                 'order_id' => $_order->order_id,
-                                'mark' => '购买商品消费积分',
+                                'mark' => "购买{$make}商品消费积分",
                                 'desc' => '',
                                 'surplus' => $pricepri,
                                 'pm' => 2
@@ -999,7 +1008,7 @@ class StoreOrderRepository extends BaseRepository
                             Db::name("user_sign_vr")->insert([
                                 'uid' => $uid,
                                 'number' => $array_fzone_paytype['price'],
-                                'mark' => "购买商品消费VR",
+                                'mark' => "购买{$make}商品消费VR",
                                 'desc' => "VR",
                                 'order_type' => 0,
                                 'order_id' => $_order->order_id,
@@ -1011,7 +1020,7 @@ class StoreOrderRepository extends BaseRepository
                                 'uid' => $uid,
                                 'number' => $array_fzone_paytype['other'],
                                 'status' => 1,
-                                'mark' => '购买商品消费京豆',
+                                'mark' => "购买{$make}商品消费京豆",
                                 'addtime' => time(),
                                 'surplus' => $pricepri,
                                 'settlement_time' => date('Y-m-d H:i:s'),
@@ -1057,7 +1066,7 @@ class StoreOrderRepository extends BaseRepository
                                 $log_data = [
                                     'uid' => $uid,
                                     'number' => $array_fzone_paytype['price'],
-                                    'mark' => "购买商品消费VR",
+                                    'mark' => "购买{$make}商品消费VR",
                                     'desc' => "VR",
                                     'order_id' => $_order->order_id,
                                     'surplus' => $vrpri,
@@ -1131,7 +1140,7 @@ class StoreOrderRepository extends BaseRepository
                             $log_data = [
                                 'uid' => $uid,
                                 'number' => $array_fzone_paytype['price'],
-                                'mark' => "购买会员专区商品消费VR:" . $array_fzone_paytype['price'],
+                                'mark' => "购买{$make}商品消费VR",
                                 'desc' => "VR",
                                 'order_id' => $_order->order_id,
                                 'surplus' => $vrpri,
@@ -1160,7 +1169,7 @@ class StoreOrderRepository extends BaseRepository
                                         $log_data = [
                                             'uid' => $uid,
                                             'number' => $array_fzone_paytype['other'],
-                                            'mark' => "购买商品消费VR",
+                                            'mark' => "购买{$make}商品消费VR",
                                             'desc' => "VR",
                                             'order_id' => $_order->order_id,
                                             'surplus' => $total_vr,
@@ -1205,7 +1214,7 @@ class StoreOrderRepository extends BaseRepository
                             $log_data = [
                                 'uid' => $uid,
                                 'number' => $array_fzone_paytype['price'],
-                                'mark' => "购买复购区商品消费复购金:" . $array_fzone_paytype['price'],
+                                'mark' => "购买{$make}商品消费复购金",
                                 'desc' => "复购金",
                                 'order_id' => $_order->order_id,
                                 'surplus' => $fugoupri,

app/controller/api/Notify.php

@@ -805,7 +805,7 @@ class Notify
                                             'uid' => $user_data['uid'],
                                             'number' => $array_fzone_paytype['other'],
                                             'status' => 1,
-                                            'mark' => '购买商品消费京豆',
+                                            'mark' => '购买' . $wenan . '商品消费京豆',
                                             'addtime' => time(),
                                             'surplus' => $jdpri,
                                             'settlement_time' => date('Y-m-d H:i:s'),

app/controller/merchant/store/order/RefundOrder.php

@@ -131,9 +131,11 @@ class RefundOrder extends BaseController
                 ->find();
             $make = '商贸区';
             if ($store_order_info['mer_id'] == 439) {
-                $make = '精彩生活';
+                $make = '精彩生活区';
             } else if ($store_order_info['mer_id'] == 496) {
                 $make = '会员专区';
+            } else if ($store_order_info['mer_id'] == 491) {
+                $make = '复购区';
             }
 
             // 如果是组合支付 现金 + 积分 则需要把积分退回
@@ -170,7 +172,7 @@ class RefundOrder extends BaseController
                         'uid' => $store_order_info['uid'],
                         'number' => $array_fzone_paytype['other'],
                         'status' => 1,
-                        'mark' => '购买商品消费京豆',
+                        'mark' => "{$make}商品申请退款退回京豆",
                         'addtime' => time(),
                         'surplus' => $jingdoupri,
                         'settlement_time' => date('Y-m-d H:i:s'),