family пре 1 година
родитељ
комит
c66f890051

+ 1 - 1
app/command/CinemaSchedCommand.php

@@ -91,7 +91,7 @@ class CinemaSchedCommand extends Command
91
                 'channel_price' => json_encode($value['channel_price'], JSON_FORCE_OBJECT)
91
                 'channel_price' => json_encode($value['channel_price'], JSON_FORCE_OBJECT)
92
             ];
92
             ];
93
             $where = [
93
             $where = [
94
-                'relation_id' => $value['relation_id'], 'sched_sign' => $value['sched_sign'], 'film_sign' => $value['film_sign'], 'cinema_sign' => $value['cinema_sign']
94
+                'relation_id' => $value['relation_id'], 'sched_sign' => $value['sched_sign'], 'film_sign' => $value['film_sign'], 'cinema_sign' => $params['cinema_sign']
95
             ];
95
             ];
96
             $model = Db::name('movie_cinema_sched')->where($where)->find();
96
             $model = Db::name('movie_cinema_sched')->where($where)->find();
97
             if (empty($model)) {
97
             if (empty($model)) {

+ 3 - 1
app/command/CommercialAreaOrderIndependentAccount.php

@@ -36,6 +36,8 @@ class CommercialAreaOrderIndependentAccount extends Command
36
      */
36
      */
37
     private function doCommercialAreaOrderIndependentAccount($excludeMerId = [], $timeLimit = 30)
37
     private function doCommercialAreaOrderIndependentAccount($excludeMerId = [], $timeLimit = 30)
38
     {
38
     {
39
+        $dst_mer_id = systemConfig('mer_365');
40
+
39
         // 商户信息
41
         // 商户信息
40
         $merchants = [];
42
         $merchants = [];
41
 
43
 
@@ -59,7 +61,7 @@ class CommercialAreaOrderIndependentAccount extends Command
59
                 }
61
                 }
60
                 $group_order = Db::name('store_group_order')->alias('sgo')->where('sgo.group_order_id', $value['group_order_id'])->find();
62
                 $group_order = Db::name('store_group_order')->alias('sgo')->where('sgo.group_order_id', $value['group_order_id'])->find();
61
                 // @todo 分账账号 496:表示{会员专区}账户;商贸区分账如下:成本分账到商户,利润分账到{会员专区}账户
63
                 // @todo 分账账号 496:表示{会员专区}账户;商贸区分账如下:成本分账到商户,利润分账到{会员专区}账户
62
-                $independentAccount = $storeOrderRepository->getIndependentAccount($value, $group_order, 496, $merchants[$value['mer_id']]['hf_member_id']);
64
+                $independentAccount = $storeOrderRepository->getIndependentAccount($value, $group_order, $dst_mer_id, $merchants[$value['mer_id']]['hf_member_id']);
63
 
65
 
64
                 // @todo 预分账处理
66
                 // @todo 预分账处理
65
                 $isSuccessed = $storeOrderRepository->prepareExecuteIndependentAccount(
67
                 $isSuccessed = $storeOrderRepository->prepareExecuteIndependentAccount(

+ 3 - 1
app/command/GreatLifeOrderIndependentAccount.php

@@ -44,6 +44,8 @@ class GreatLifeOrderIndependentAccount extends Command
44
      */
44
      */
45
     private function doGreatLifeOrderIndependentAccount($merId = [], $timeLimit = 30)
45
     private function doGreatLifeOrderIndependentAccount($merId = [], $timeLimit = 30)
46
     {
46
     {
47
+        $dst_mer_id = systemConfig('mer_365');
48
+
47
         // 商户信息
49
         // 商户信息
48
         $merchants = [];
50
         $merchants = [];
49
 
51
 
@@ -69,7 +71,7 @@ class GreatLifeOrderIndependentAccount extends Command
69
                 $group_order = Db::name('store_group_order')->alias('sgo')->where('sgo.group_order_id', $value['group_order_id'])->find();
71
                 $group_order = Db::name('store_group_order')->alias('sgo')->where('sgo.group_order_id', $value['group_order_id'])->find();
70
 
72
 
71
                 // 分账账号 496:表示{会员专区}账户,精彩生活区分账到{会员专区}账户
73
                 // 分账账号 496:表示{会员专区}账户,精彩生活区分账到{会员专区}账户
72
-                $independentAccount = $storeOrderRepository->getIndependentAccount($value, $group_order, 496, $merchants[$value['mer_id']]['hf_member_id']);
74
+                $independentAccount = $storeOrderRepository->getIndependentAccount($value, $group_order, $dst_mer_id, $merchants[$value['mer_id']]['hf_member_id']);
73
 
75
 
74
                 // @todo 预分账处理 496:表示{会员专区}账户,精彩生活区分账到{会员专区}账户,故:hf_platform_member_id 为入账账户
76
                 // @todo 预分账处理 496:表示{会员专区}账户,精彩生活区分账到{会员专区}账户,故:hf_platform_member_id 为入账账户
75
                 $isSuccessed = $storeOrderRepository->prepareExecuteIndependentAccount(
77
                 $isSuccessed = $storeOrderRepository->prepareExecuteIndependentAccount(