组合支付分账问题、é—创建订单添加部分字段、修复组合支付拆分字段的脚本

app/command/CommercialAreaOrderIndependentAccount.php

@@ -58,10 +58,11 @@ class CommercialAreaOrderIndependentAccount extends Command
             $group_order = Db::name('store_group_order')->alias('sgo')->where('sgo.group_order_id', $value['group_order_id'])->find();
             // @todo 分账账号 496：表示{会员专区}账户；商贸区分账如下：成本分账到商户，利润分账到{会员专区}账户
             $independentAccount = $storeOrderRepository->getIndependentAccount($value, $group_order, $dst_mer_id, $merchants[$value['mer_id']]['hf_member_id']);
-
+            $mer_price = bcsub($value['total_price'] , $value['con_pri'],2);
+            $platform_price = bcsub($value['fzone_pay_price'],$mer_price,2);
             // @todo 预分账处理
             $isSuccessed = $storeOrderRepository->prepareExecuteIndependentAccount(
-                $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']
+                $value, $group_order, $independentAccount['api_key'], $independentAccount['hf_member_id'], $independentAccount['hf_platform_member_id'], $mer_price, $platform_price
             );
             if ($isSuccessed) {
                 Db::name("log")->insert(array('data' => '商贸区-订单分账：' . json_encode($value, JSON_FORCE_OBJECT)));// 日志记录

app/command/GreatLifeOrderIndependentAccount.php

@@ -63,7 +63,7 @@ class GreatLifeOrderIndependentAccount extends Command
 
             // @todo 预分账处理 496：表示{会员专区}账户，精彩生活区分账到{会员专区}账户，故：hf_platform_member_id 为入账账户
             $isSuccessed = $storeOrderRepository->prepareExecuteIndependentAccount(
-                $value, $group_order, $independentAccount['api_key'], $independentAccount['hf_platform_member_id'], '', $value['pay_price'], 0
+                $value, $group_order, $independentAccount['api_key'], $independentAccount['hf_platform_member_id'], '', $value['fzone_pay_price'], 0
             );
             if ($isSuccessed) {
                 Db::name("log")->insert(array('data' => '精彩生活区-订单分账：' . json_encode($value, JSON_FORCE_OBJECT)));// 日志记录

app/command/repairFzonePayType.php

@@ -0,0 +1,72 @@
+<?php
+declare (strict_types=1);
+
+namespace app\command;
+
+use think\console\Command;
+use think\console\Input;
+use think\console\Output;
+use think\facade\Db;
+
+class repairFzonePayType extends Command
+{
+    protected function configure()
+    {
+        // 指令配置
+        $this->setName('repair_fzone_pay_type')
+            ->setDescription('修复组合支付json数据赋值到对应字段');
+    }
+
+    /**
+     * @param Input $input
+     * @param Output $output
+     * @return void
+     */
+    protected function execute(Input $input, Output $output)
+    {
+        $order_list = Db::name('store_order')->field('order_id,fzone_paytype')->order('order_id asc')->select()->toArray();
+        foreach ($order_list as $value){
+            if(!$value['fzone_paytype']) continue;
+            $array_fzone_paytype = json_decode($value['fzone_paytype'],true);
+            if(!empty($array_fzone_paytype['type'])){
+                $array_fzone_paytype_all = [
+                    'fzone_pay_jingdou' => 0,
+                    'fzone_pay_vr' => 0,
+                    'fzone_pay_jifen' => 0,
+                    'fzone_pay_price' => 0,
+                    'fzone_pay_other' => $array_fzone_paytype['other'],
+                    'fzone_pay_note' => $array_fzone_paytype['note'],
+                    'fzone_pay_type' => $array_fzone_paytype['type'],
+                ];
+                if(!empty($array_fzone_paytype['type'] == 'b1')){
+                    $array_fzone_paytype_all['fzone_pay_vr'] = $array_fzone_paytype['price'];
+                    $array_fzone_paytype_all['fzone_pay_jifen'] = $array_fzone_paytype['other'];
+                }else if(!empty($array_fzone_paytype['type'] == 'b2')){
+                    $array_fzone_paytype_all['fzone_pay_price'] = $array_fzone_paytype['price'];
+                    $array_fzone_paytype_all['fzone_pay_jifen'] = $array_fzone_paytype['other'];
+                }else if(!empty($array_fzone_paytype['type'] == 'b3')){
+                    $array_fzone_paytype_all['fzone_pay_vr'] = $array_fzone_paytype['price'];
+                    $array_fzone_paytype_all['fzone_pay_jingdou'] = $array_fzone_paytype['other'];
+                }else if(!empty($array_fzone_paytype['type'] == 'b4')){
+                    $array_fzone_paytype_all['fzone_pay_price'] = $array_fzone_paytype['price'];
+                    $array_fzone_paytype_all['fzone_pay_jingdou'] = $array_fzone_paytype['other'];
+                }else if(!empty($array_fzone_paytype['type'] == 'b5')){
+                    $array_fzone_paytype_all['fzone_pay_vr'] = $array_fzone_paytype['price'];
+                }else if(!empty($array_fzone_paytype['type'] == 'a1')){
+                    $array_fzone_paytype_all['fzone_pay_vr'] = $array_fzone_paytype['price'];
+                }else if(!empty($array_fzone_paytype['type'] == 'a3')){
+                    $array_fzone_paytype_all['fzone_pay_price'] = $array_fzone_paytype['price'];
+                    $array_fzone_paytype_all['fzone_pay_vr'] = $array_fzone_paytype['other'];
+                }else if(!empty($array_fzone_paytype['type'] == 'c1')){
+                    $array_fzone_paytype_all['fzone_pay_other'] = $array_fzone_paytype['price'];
+                }else{
+                    $array_fzone_paytype_all['fzone_pay_price'] = $array_fzone_paytype['price'];
+                }
+                Db::name('store_order')->where('order_id',$value['order_id'])->update($array_fzone_paytype_all);
+                $output->writeln("订单ID：". $value['order_id'] ."修复成功");
+            }
+        }
+        $output->writeln('执行结束');
+    }
+
+}

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

@@ -122,7 +122,7 @@ class StoreOrderRepository extends BaseRepository
      * @author xaboy
      * @day 2020/8/1
      */
-    public function createOrder(User $user, int $pay_type, $cartId, $addressId, $coupons, $takes, $mark, $psType, $table_id = null, $share_id = 0, $payType, $mer_id = 0, $dacang_id = 0, $distribution_mode = 1, $ziti_address = '', $area_manage_address_ids = '', $youhui_price_key = '', $cartIdAndPayTypMap, $fzone_paytype = '', $getuserofgoodsid = '')
+    public function createOrder(User $user, int $pay_type, $cartId, $addressId, $coupons, $takes, $mark, $psType, $table_id = null, $share_id = 0, $payType, $mer_id = 0, $dacang_id = 0, $distribution_mode = 1, $ziti_address = '', $area_manage_address_ids = '', $youhui_price_key = '', $cartIdAndPayTypMap, $fzone_paytype = '', $getuserofgoodsid = '',$array_fzone_paytype_all = array())
     {
 
 
@@ -783,6 +783,13 @@ class StoreOrderRepository extends BaseRepository
                     'fzone_paytype' => $fzone_paytype,
                     'con_pri' => $product_attr_unique_datas['plate_mer_profit'],//计算商品选中的产品规格，然后计算利润，这个利润会在每周分红中进行分润
                     'user_of_goods_id' => $getuserofgoodsid,
+                    'fzone_pay_jingdou' => $array_fzone_paytype_all['fzone_pay_jingdou'],
+                    'fzone_pay_vr' => $array_fzone_paytype_all['fzone_pay_vr'],
+                    'fzone_pay_jifen' => $array_fzone_paytype_all['fzone_pay_jifen'],
+                    'fzone_pay_price' => $array_fzone_paytype_all['fzone_pay_price'],
+                    'fzone_pay_other' => $array_fzone_paytype_all['fzone_pay_other'],
+                    'fzone_pay_note' => $array_fzone_paytype_all['fzone_pay_note'],
+                    'fzone_pay_type' => $array_fzone_paytype_all['fzone_pay_type'],
                 ];
 
 
@@ -10532,7 +10539,7 @@ class StoreOrderRepository extends BaseRepository
             // @todo 预分账处理 496：表示{会员专区}账户，本区分账到{会员专区}账户，故：hf_platform_member_id 为入账账户
             $isSuccessed = $this->prepareExecuteIndependentAccount(
                 $order, $order_group_data, $independentAccount['api_key'], $independentAccount['hf_platform_member_id'], '',
-                $order['pay_price'], 0
+                $order['fzone_pay_price'], 0
             );
             if ($isSuccessed) {
                 Db::name("store_order")->where('order_sn', $order['order_sn'])->update(['is_independentaccount' => 1]);

app/controller/api/store/order/StoreOrder.php

@@ -456,7 +456,15 @@ class StoreOrder extends BaseController
         //判断组合支付逻辑，积分、VR、京豆
         $userdatas =Db::name("user")->where("uid",$uid)->find();
         $array_fzone_paytype = json_decode($fzone_paytype,true);
-
+        $array_fzone_paytype_all = [
+            'fzone_pay_jingdou' => 0,
+            'fzone_pay_vr' => 0,
+            'fzone_pay_jifen' => 0,
+            'fzone_pay_price' => 0,
+            'fzone_pay_other' => $array_fzone_paytype['other'],
+            'fzone_pay_note' => $array_fzone_paytype['note'],
+            'fzone_pay_type' => $array_fzone_paytype['type'],
+        ];
 
         //会员专区升级产生的user_of_goods订单ID赋值
         $getuserofgoodsid = 1;
@@ -471,7 +479,8 @@ class StoreOrder extends BaseController
                 if($vrpri < 0 || $pricepri < 0){
                     return app('json')->fail("支付失败,VR或积分不足!");
                 }
-
+                $array_fzone_paytype_all['fzone_pay_vr'] = $array_fzone_paytype['price'];
+                $array_fzone_paytype_all['fzone_pay_jifen'] = $array_fzone_paytype['other'];
 
             }else if(!empty($array_fzone_paytype['type'] == 'b2')){
                 //精彩生活现金+积分
@@ -483,7 +492,8 @@ class StoreOrder extends BaseController
                 if($vrpri  < 0 ){
                     return app('json')->fail("支付失败,积分不足!");
                 }
-
+                $array_fzone_paytype_all['fzone_pay_price'] = $array_fzone_paytype['price'];
+                $array_fzone_paytype_all['fzone_pay_jifen'] = $array_fzone_paytype['other'];
 
             }else if(!empty($array_fzone_paytype['type'] == 'b3')){
                 //精彩生活区 VR+京豆
@@ -493,16 +503,18 @@ class StoreOrder extends BaseController
                 if($vrpri < 0 || $pricepri < 0){
                     return app('json')->fail("支付失败,VR或京豆不足!");
                 }
-
+                $array_fzone_paytype_all['fzone_pay_vr'] = $array_fzone_paytype['price'];
+                $array_fzone_paytype_all['fzone_pay_jingdou'] = $array_fzone_paytype['other'];
             }else if(!empty($array_fzone_paytype['type'] == 'b4')){
-                //精彩生活区 VR+京豆
+                //精彩生活区 现金+京豆
                 $pricepri = $userdatas['jingdou'] -  $array_fzone_paytype['other'];
 
                 // //现金+积分
                 if($pricepri  < 0 ){
                     return app('json')->fail("支付失败,京豆不足!");
                 }
-
+                $array_fzone_paytype_all['fzone_pay_price'] = $array_fzone_paytype['price'];
+                $array_fzone_paytype_all['fzone_pay_jingdou'] = $array_fzone_paytype['other'];
 //                return app('json')->fail("开发中升级中！");
 
             }else if(!empty($array_fzone_paytype['type'] == 'b5')){
@@ -513,6 +525,7 @@ class StoreOrder extends BaseController
                 if($vrpri < 0){
                     return app('json')->fail("支付失败,VR不足!");
                 }
+                $array_fzone_paytype_all['fzone_pay_vr'] = $array_fzone_paytype['price'];
             }else if(!empty($array_fzone_paytype['type'] == 'a1')){
                 //生活 VR支付
 
@@ -522,6 +535,7 @@ class StoreOrder extends BaseController
                 if($vrpri < 0){
                     return app('json')->fail("支付失败,VR不足!");
                 }
+                $array_fzone_paytype_all['fzone_pay_vr'] = $array_fzone_paytype['price'];
                // return app('json')->fail($userdatas['spread_old']);
                 //检查在旧表中是否有上级
                 if($userdatas['spread_old'] != 0){
@@ -614,8 +628,8 @@ class StoreOrder extends BaseController
 
 
                 }
-
-               
+                $array_fzone_paytype_all['fzone_pay_price'] = $array_fzone_paytype['price'];
+                $array_fzone_paytype_all['fzone_pay_vr'] = $array_fzone_paytype['other'];
 
             }else if(!empty($array_fzone_paytype['type'] == 'c1')){
                 //复购区 复购金支付
@@ -624,6 +638,9 @@ class StoreOrder extends BaseController
                 if($fugoupri < 0){
                     return app('json')->fail("支付失败,复购金不足!");
                 }
+                $array_fzone_paytype_all['fzone_pay_other'] = $array_fzone_paytype['price'];
+            }else{
+                $array_fzone_paytype_all['fzone_pay_price'] = $array_fzone_paytype['price'];
             }
         }
 
@@ -633,7 +650,7 @@ class StoreOrder extends BaseController
 
         makeLock()->lock();
         try {
-            $groupOrder = $this->repository->createOrder($this->request->userInfo(), $payType, [$cartId], $addressId, 0,0, 0,0,0,0,0,$mer_id,0,0,0,0,0,0,$fzone_paytype,$getuserofgoodsid);
+            $groupOrder = $this->repository->createOrder($this->request->userInfo(), $payType, [$cartId], $addressId, 0,0, 0,0,0,0,0,$mer_id,0,0,0,0,0,0,$fzone_paytype,$getuserofgoodsid,$array_fzone_paytype_all);
             //var_dump($groupOrder);
         } catch (\Throwable $e) {
             makeLock()->unlock();

config/console.php

@@ -31,5 +31,6 @@ return [
         'gzcAddByBill' => 'app\command\GzcAddByBillCommand',
         'movie_order' => 'app\command\MovieOrderCommand',
         'repair_pay_success' => 'app\command\repairPaySuccess',
+        'repair_fzone_pay_type' => 'app\command\repairFzonePayType',
     ],
 ];