rabin 2 years ago
parent
commit
509962c649
2 changed files with 5 additions and 2 deletions
  1. 3 0
      app/shop/lib/Refund.php
  2. 2 2
      service/agent/lib/Import.php

+ 3 - 0
app/shop/lib/Refund.php

@@ -500,6 +500,9 @@ class Refund
         if (!$state) {
             return;
         }
+        if (isset($data['dh_type'])) {
+            return;
+        }
         if (isset($data['type']) && $data['type'] > 1) {
             return;
         }

+ 2 - 2
service/agent/lib/Import.php

@@ -98,6 +98,7 @@ class Import
                 $data['role'] = $this->getRole($v['agentlevel']);
                 $data['area'] = '';
                 if ($v['datavalue']) {
+                    $v['datavalue'] = trim(str_replace(" ", ',', $v['datavalue']));
                     list($data['area'], $new) = Dever::load('area/api')->up($v['province'], $v['city'], $v['area'], $v['street'], $v['datavalue'], $v['streetvalue']);
                     # 记录日志
                     if ($new) {
@@ -197,8 +198,7 @@ class Import
                     $order_id = Dever::db('agent/order')->insert($data);
                 } else {
                     $order_id = $order['id'];
-                }
-                */
+                }*/
 
                 if ($order_id) {