瀏覽代碼

Merge branch 'dev_wf' of wugg/phpstock into version1.5

wufeng 2 年之前
父節點
當前提交
42ba732ad1
共有 1 個文件被更改,包括 11 次插入6 次删除
  1. 11 6
      app/command/handleYzOrderData.php

+ 11 - 6
app/command/handleYzOrderData.php

@@ -36,13 +36,15 @@ class handleYzOrderData extends Command
             try {
 
                 //判断价格是否符合系统售价
-                $sale_price = Db::name('platform_youzan')
+                $platform_yz_info = Db::name('platform_youzan')
+                    ->alias('pyz')
+                    ->field('id,sale_price,platform_id,p.platform_name')
                     ->where(['skuCode' => $c_data['skuCode'], 'is_del' => 0])
-                    ->value('sale_price', 0);
+                    ->findOrEmpty();
 
-                if ($c_data['discount_price'] < $sale_price && $c_data['is_approved'] == '0') {
+                if ($c_data['discount_price'] < $platform_yz_info['sale_price'] && $c_data['is_approved'] == '0') {
                     Db::rollback();
-                    $this->callbackYz(['status' => 2, 'id' => $c_data['id'], 'reason' => '价格低于系统售价' . $sale_price]);
+                    $this->callbackYz(['status' => 2, 'id' => $c_data['id'], 'reason' => '价格低于系统售价' . $platform_yz_info['sale_price']]);
                     return false;//停止执行后续代码
                 }
 
@@ -228,8 +230,11 @@ class handleYzOrderData extends Command
 
 
                 $remark = $c_data['buyer_messages'];
-                $rm = 0;
-                $ri = 'youzan';
+
+                $user = Config::get('app.uid_platform_youzan.' . $platform_yz_info['platform_id']);
+                $rm = isset($user['id']) ? $user['id'] : 0;
+                $ri = isset($user['nickname']) ? $user['nickname'] : 'youzan';
+
                 $data = [
                     "orderCode" => $orderCode,
                     "good_code" => $spuCode,