hefei 1 год назад
Родитель
Сommit
e616d018f4

+ 1 - 0
app/common/repositories/merchant/order/OrderMerchantRepository.php

@@ -1798,6 +1798,7 @@ class OrderMerchantRepository extends BaseRepository
1798
             "source" => $source,
1798
             "source" => $source,
1799
             "type_shop" => $type_shop
1799
             "type_shop" => $type_shop
1800
         ];
1800
         ];
1801
+        if($status == 1) $data['take_time'] = time();
1801
         Db::name("user_bill")->insert($data);
1802
         Db::name("user_bill")->insert($data);
1802
 
1803
 
1803
         if ($type_shop == 0) {
1804
         if ($type_shop == 0) {

+ 4 - 3
app/common/repositories/store/order/StoreOrderRepository.php

@@ -4578,6 +4578,7 @@ class StoreOrderRepository extends BaseRepository
4578
             "source" => $source,
4578
             "source" => $source,
4579
             "type_shop" => $type_shop
4579
             "type_shop" => $type_shop
4580
         ];
4580
         ];
4581
+        if($status == 1) $data['take_time'] = time();//结算时间
4581
         log::info("开始添加user——bills");
4582
         log::info("开始添加user——bills");
4582
         log::info($data);
4583
         log::info($data);
4583
         Db::name("user_bill")->insert($data);
4584
         Db::name("user_bill")->insert($data);
@@ -9551,11 +9552,11 @@ class StoreOrderRepository extends BaseRepository
9551
         if($array_fzone_paytype['note'] != "现金"){
9552
         if($array_fzone_paytype['note'] != "现金"){
9552
             $pay_type = 4;
9553
             $pay_type = 4;
9553
         }
9554
         }
9554
-
9555
+        $take_time = '';
9555
         $sm_status = 0;//储存当前用户是否有实名的状态
9556
         $sm_status = 0;//储存当前用户是否有实名的状态
9556
 
9557
 
9557
         if ($order_from_mer['mer_id'] == 496) {
9558
         if ($order_from_mer['mer_id'] == 496) {
9558
-
9559
+            $take_time = time();
9559
             //如果是会员区的直推就即刻到账
9560
             //如果是会员区的直推就即刻到账
9560
             if ($comm_order_type == 3) {
9561
             if ($comm_order_type == 3) {
9561
                 Db::name('user')->where("uid", $con_data['uid'])->update(['brokerage_price' => $con_data['brokerage_price'] + $num]);
9562
                 Db::name('user')->where("uid", $con_data['uid'])->update(['brokerage_price' => $con_data['brokerage_price'] + $num]);
@@ -9629,7 +9630,7 @@ class StoreOrderRepository extends BaseRepository
9629
             'order_type' => 1,//1自营  2 第三方  订单类型
9630
             'order_type' => 1,//1自营  2 第三方  订单类型
9630
             'is_red_brokerage' => 0,//1红积分对冲佣金 0正常佣金
9631
             'is_red_brokerage' => 0,//1红积分对冲佣金 0正常佣金
9631
             'gzc' => $sm_status,//养老金是否已进入公证处log表0:未进入。1:已进入
9632
             'gzc' => $sm_status,//养老金是否已进入公证处log表0:未进入。1:已进入
9632
-            'take_time' => '',//结算时间
9633
+            'take_time' => $take_time,//结算时间
9633
             'district_id' => '',//
9634
             'district_id' => '',//
9634
             'street_id' => '',//
9635
             'street_id' => '',//
9635
             'month' => '',//月份
9636
             'month' => '',//月份

+ 3 - 3
app/controller/api/Notify.php

@@ -1661,11 +1661,11 @@ class Notify
1661
          if($array_fzone_paytype['note'] != "现金"){
1661
          if($array_fzone_paytype['note'] != "现金"){
1662
              $pay_type = 4;
1662
              $pay_type = 4;
1663
          }
1663
          }
1664
-
1664
+        $take_time = '';
1665
         $sm_status = 0;//储存当前用户是否有实名的状态
1665
         $sm_status = 0;//储存当前用户是否有实名的状态
1666
 
1666
 
1667
         if($order_from_mer['mer_id'] == 496){
1667
         if($order_from_mer['mer_id'] == 496){
1668
-        
1668
+            $take_time = time();
1669
             //如果是会员区的直推就即刻到账
1669
             //如果是会员区的直推就即刻到账
1670
             if($comm_order_type == 3){
1670
             if($comm_order_type == 3){
1671
                 Db::name('user')->where("uid",$con_data['uid'])->update(['brokerage_price'=> $con_data['brokerage_price'] + $num]);
1671
                 Db::name('user')->where("uid",$con_data['uid'])->update(['brokerage_price'=> $con_data['brokerage_price'] + $num]);
@@ -1739,7 +1739,7 @@ class Notify
1739
             'order_type'=>1,//1自营  2 第三方  订单类型
1739
             'order_type'=>1,//1自营  2 第三方  订单类型
1740
             'is_red_brokerage'=>0,//1红积分对冲佣金 0正常佣金
1740
             'is_red_brokerage'=>0,//1红积分对冲佣金 0正常佣金
1741
             'gzc'=> $sm_status,//养老金是否已进入公证处log表0:未进入。1:已进入
1741
             'gzc'=> $sm_status,//养老金是否已进入公证处log表0:未进入。1:已进入
1742
-            'take_time'=>'',//结算时间
1742
+            'take_time'=>$take_time,//结算时间
1743
             'district_id'=>'',//
1743
             'district_id'=>'',//
1744
             'street_id'=>'',//
1744
             'street_id'=>'',//
1745
             'month'=>'',//月份
1745
             'month'=>'',//月份