WIN-2308041133\Administrator 1 month ago
parent
commit
7045798ad2
2 changed files with 7 additions and 1 deletions
  1. 1 0
      app/admin/model/user/User.php
  2. 6 1
      app/models/store/StoreOrder.php

+ 1 - 0
app/admin/model/user/User.php

@@ -1229,4 +1229,5 @@ class User extends BaseModel
         self::checkTrans($res);
         return $res;
     }
+
 }

+ 6 - 1
app/models/store/StoreOrder.php

@@ -433,10 +433,15 @@ class StoreOrder extends BaseModel
                 ];
             }
             $mer_id = array_unique($mer_id);
+            if (count($mer_id) > 1) {
+                $mer_id_string = implode(',', $mer_id);
+            }else{
+                $mer_id_string = $mer_id[0];
+            }
             $orderInfo = [
                 'uid' => $uid,
                 'order_id' => $test ? 0 : self::getNewOrderId(),
-                'mer_id' => $mer_id,
+                'mer_id' => $mer_id_string,
                 'real_name' => $addressInfo['real_name'],
                 'user_phone' => $addressInfo['phone'],
                 'user_address' => $addressInfo['province'] . ' ' . $addressInfo['city'] . ' ' . $addressInfo['district'] . ' ' . $addressInfo['detail'],