hefei 1 рік тому
батько
коміт
5052decae9

+ 1 - 1
app/command/CommercialAreaOrderIndependentAccount.php

@@ -61,7 +61,7 @@ class CommercialAreaOrderIndependentAccount extends Command
61 61
 
62 62
             // @todo 预分账处理
63 63
             $isSuccessed = $storeOrderRepository->prepareExecuteIndependentAccount(
64
-                $value, $group_order, $independentAccount['api_key'], $independentAccount['hf_member_id'], $independentAccount['hf_platform_member_id'], $value['cost'], $value['con_pri']
64
+                $value, $group_order, $independentAccount['api_key'], $independentAccount['hf_member_id'], $independentAccount['hf_platform_member_id'], bcsub($value['total_price'] , $value['con_pri'],2), $value['con_pri']
65 65
             );
66 66
             if ($isSuccessed) {
67 67
                 Db::name("log")->insert(array('data' => '商贸区-订单分账:' . json_encode($value, JSON_FORCE_OBJECT)));// 日志记录

+ 1 - 1
app/command/HuafeiOrderIndependentAccount.php

@@ -53,7 +53,7 @@ class HuafeiOrderIndependentAccount extends Command
53 53
         // 订单状态(0:待发货;1:待收货;2:待评价;3:已完成;4已申请退款;-1:已退款)5未支付 6已取消'
54 54
         $status = [2];
55 55
         // 普通订单
56
-        $cursor = Db::table('rrx_order_huafei')->where('is_independentaccount', 0)->whereIn('status', $status)->cursor();
56
+        $cursor = Db::table('rrx_order_huafei')->where('is_independentaccount', 0)->where('gzc',1)->whereIn('status', $status)->cursor();
57 57
 
58 58
         /** @var StoreOrderRepository $storeOrderRepository */
59 59
         $storeOrderRepository = app()->make(StoreOrderRepository::class);