xieruidong 2 years ago
parent
commit
5c07f77b95

+ 1 - 0
application/api/controller/mall/Orders.php

@@ -277,6 +277,7 @@ class Orders extends Api
      * @ApiParams (name=reason2,description=原因2)
      * @ApiParams (name=fix_order_no,description=维修订单号,在拍维修费时需要)
      * @ApiParams (name=is_edit,description="是1否0修改售后信息")
+     * @ApiParams (name=address_id,description="地址ID")
      */
     public function refund(){
         $save=[];

+ 1 - 0
application/common/model/OrderInfo.php

@@ -8,6 +8,7 @@ use think\Model;
 /**
  * @property Orders orders
  * @property Refund refund
+ * @property string goods_name
  * @method static static|Query payed()
  * @method static static|Query filterHasUnRefund()
  */

+ 21 - 2
application/common/model/Refund.php

@@ -15,6 +15,7 @@ use Yansongda\Supports\Arr;
  * @property User user
  * @property LogisticsCompany com
  * @property UserAddress address
+ * @property OrderInfo order_info
  * @property int refund_status
  * @property int refund_type
  * @property int create_time
@@ -24,6 +25,8 @@ use Yansongda\Supports\Arr;
  * @property int user_send_time
  * @property int user_trans_com_id
  * @property int refund_by
+ * @property int num
+ * @property int num_install
  * @property string user_trans_no
  * @property bool is_wait_audit
  * @property bool has_money
@@ -367,7 +370,19 @@ class Refund Extends Model
         return $refund->save();
     }
     public function makeLabelOrder(){
-
+        $res=logistics()
+            ->setLogistics(LogisticsCompany::where('name','跨越速运')->find())
+            ->setUserName($this->orders->logistics->from_username)
+            ->setPhone($this->orders->logistics->from_mobile)
+            ->setToArea($this->orders->logistics->fullArea())
+            ->setFromUsername($this->address['name'])
+            ->setFromMobile($this->address['mobile'])
+            ->setFromArea($this->address['full_address'])
+            ->setCargo($this->order_info->goods_name)
+            ->setCount($this->num)
+            ->setOrderNo($this->fix_order_no)
+            ->labelOrder();
+        dd($res);
     }
 
     /**
@@ -538,11 +553,15 @@ class Refund Extends Model
         return null;
     }
 
+    public function useLabelOrder(){
+        return $this->refund_by==self::TH_TYPE_SENDER;
+    }
+
     protected static function init()
     {
         self::beforeInsert(function (self $refund){
             $refund['refund_status']=self::REFUND_ING;
-            if($refund->refund_type==self::REFUND_TYPE_HHBX){
+            if($refund->useLabelOrder()){
                 $refund->fix_order_no=order_no('wx');
             }
         });

+ 11 - 1
public/api.html

@@ -12015,6 +12015,12 @@
                                                         <td></td>
                                                         <td>是1否0修改售后信息</td>
                                                     </tr>
+                                                                                                        <tr>
+                                                        <td>address_id</td>
+                                                        <td>string</td>
+                                                        <td></td>
+                                                        <td>地址ID</td>
+                                                    </tr>
                                                                                                     </tbody>
                                             </table>
                                                                                     </div>
@@ -12073,6 +12079,10 @@
                                                             <label class="control-label" for="is_edit">is_edit</label>
                                                             <input type="string" class="form-control input-sm" id="is_edit" required placeholder="是1否0修改售后信息" name="is_edit">
                                                         </div>
+                                                                                                                <div class="form-group">
+                                                            <label class="control-label" for="address_id">address_id</label>
+                                                            <input type="string" class="form-control input-sm" id="address_id" required placeholder="地址ID" name="address_id">
+                                                        </div>
                                                                                                                 <div class="form-group form-group-submit">
                                                             <button type="submit" class="btn btn-success send" rel="52">提交</button>
                                                             <button type="reset" class="btn btn-info" rel="52">重置</button>
@@ -19391,7 +19401,7 @@
 
                 </div>
                 <div class="col-md-6" align="right">
-                    Generated on 2022-12-12 10:25:46 <a href="./" target="_blank">苏州屏酷有限公司</a>
+                    Generated on 2022-12-12 18:31:26 <a href="./" target="_blank">苏州屏酷有限公司</a>
                 </div>
             </div>