商户返佣设置

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

@@ -1410,10 +1410,11 @@ class OrderMerchantRepository extends BaseRepository
 
 
         //商户得到的(京豆和贡献值奖励的倍，后台设置)
+        $mer_data = Db::name('merchant')->where('mer_id', $order['mer_id'])->field('uid,mer_id')->find();
         $gongxian = bcmul($pv, $mer_gonxian, 2);
         if ($gongxian >= 0.01) {
             $gongxian_data = [
-                "uid"           =>$order["mer_id"],
+                "uid"           =>$mer_data["uid"],
                 "mer_id"        =>$order["mer_id"],
                 "number"  =>    $gongxian,
                 "addtime"       =>time(),
@@ -1433,7 +1434,8 @@ class OrderMerchantRepository extends BaseRepository
         $jd = bcmul($pv, $mer_jd, 2);
         if ($jd >= 0.01) {
             $jd_data = [
-                "uid"           =>$order["mer_id"],
+                "uid"           =>$mer_data["uid"],
+                "mer_id"        =>$order["mer_id"],
                 "number"  =>    $jd,
                 "addtime"       =>time(),
                 "status"        =>-1,