rabin преди 1 година
родител
ревизия
0ea046f240
променени са 2 файла, в които са добавени 10 реда и са изтрити 1 реда
  1. 5 0
      src/bao/connect/lib/Func/Base.php
  2. 5 1
      src/dai/seller/lib/Order.php

+ 5 - 0
src/bao/connect/lib/Func/Base.php

@@ -253,6 +253,9 @@ class Base
             }
             if ($this->connect['sign_encode'] == 2 && strstr($v, 'http')) {
                 $v = urlencode($v);
+                if (isset($body[$k])) {
+                    $body[$k] = $v;
+                }
             }
             if ($this->connect['sign_type'] == 1) {
                 $string .= $v;
@@ -296,6 +299,8 @@ class Base
         }
 
         $body[$this->connect['sign_name']] = $sign;
+
+
         return $sign;
     }
 

+ 5 - 1
src/dai/seller/lib/Order.php

@@ -93,8 +93,11 @@ class Order
                 $info['other'] = Dever::json_decode($info['other']);
                 $param = array_merge($info['other'], $param);
             }
-            if (isset($channel['goods']['code'])) {
+            if (isset($channel['goods']['code']) && $channel['goods']['code']) {
                 $param['code'] = $channel['goods']['code'];
+            } else {
+                $sku = Dever::db('info_sku', 'goods')->find($info['sku_id']);
+                $param['code'] = $sku['code'];
             }
             $result = Dever::load('func/api', 'connect')->run(1, $info['cate_id'], $channel, $param);
         } elseif ($channel['type'] == 2) {
@@ -180,6 +183,7 @@ class Order
                     $param['official_msg'] = $update['official_msg'];
                 }
                 $param = \Dever\Helper\Secure::get($param, $seller['appsecret']);
+                $notify = urldecode($notify);
                 $response = Dever::curl($notify, $param, 'post')->result();
                 # ok是成功
                 $update['seller_callback'] = $response;