Merge branch 'master' into huangfamily

app/common/repositories/merchant/order/OrderMerchantRepository.php

@@ -847,7 +847,7 @@ class OrderMerchantRepository extends BaseRepository
                 $merchant_user = $userRepository->getOne(['uid' => $mer_data["uid"]]);
 
                 //跨店锁客分发
-                $orders = OrderMerchant::getDB()->where('pay_user_id', $unionUser->unionid)->where('status', 1) ->whereNotIn('mer_id', [$order->mer_id])->where('binds',0)->select();
+                $orders = OrderMerchant::getDB()->where('pay_user_id', $order->pay_user_id)->where('status', 1) ->whereNotIn('mer_id', [$order->mer_id])->where('binds',0)->select();
                 foreach ($orders as $kd_order) {
                     $pv = Db::name('user_sign_gongxian')->where('mer_id', $kd_order->mer_id)->where('order_id', $kd_order->id)->value('pv');//拿到原来的pv值记录
                     //商户锁客收益：PV的5%==14元X5%=0.7元 （加入到用户佣金，可以从用户佣金中提现，商户显示锁客收益总额）

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

@@ -4987,7 +4987,7 @@ class StoreOrderRepository extends BaseRepository
 
             if ($v['fzone_paytype']) {
                 $list[$k]['fzone_paytype'] = json_decode($v['fzone_paytype'], true);
-                if (!count($list[$k]['fzone_paytype'])) {
+                if (!$list[$k]['fzone_paytype'] || !count($list[$k]['fzone_paytype'])) {
                     $list[$k]['fzone_paytype'] = null;
                 }
             } else {