pc

application/api/controller/mall/OrderRefund.php

@@ -25,6 +25,10 @@ class OrderRefund extends Api
      * @ApiReturnParams (name=refund[refund_by_text],description="退货方式")
      * @ApiReturnParams (name=refund[reason_text],description="售后原因")
      * @ApiReturnParams (name=refund[reason2],description="备注")
+     * @ApiReturnParams (name=refund[fix_order_no],description="维修单号")
+     * @ApiReturnParams (name=refund[audit_remark],description="不同意原因")
+     * @ApiReturnParams (name=refund[refund_status_text],description="状态")
+     * @ApiReturnParams (name=refund[refund_status],description=状态100申请审核中200申请通过250用户寄回270售后中280退款中300申请驳回400已取消500处理完成")
      * @ApiReturnParams (name=refunds,description="售后记录")
      */
     public function show(){

application/api/controller/mall/Orders.php

@@ -13,6 +13,7 @@ use Carbon\Carbon;
 use think\Cache;
 use think\Db;
 use app\common\model\Orders as Order;
+use think\db\Query;
 use Yansongda\Supports\Arr;
 
 /**
@@ -207,20 +208,26 @@ class Orders extends Api
         $user=$this->auth->getUser();
         $map=[];
         $status=input('status');
-        if(is_numeric($status)){
+        /*if(is_numeric($status)){
             $map['status']=$status;
-        }
+        }*/
         if($this->taxApi){
             $map['tax']=['neq','[]'];
         }
         $orders=$user->orders()
             ->where($map)
+            ->where(function (Query $query)use ($status){
+                if($status==40){
+                    $query->hasRefund();
+                }else{
+                    $query->where('status',$status);
+                }
+            })
             ->with(['info','voucher','logistics','logistics.com'])
             ->order('id','desc')
             ->paginate(input('limit',15));
 
         foreach ($orders as $order){
-            //$order['info']=$order->info()->with(['goodsBak'])->find();
             $order->append(['is_evaled']);
         }
 

application/common/model/Orders.php

@@ -5,6 +5,7 @@ namespace app\common\model;
 use app\admin\model\AdminMoneyLog;
 use app\common\service\UserSvc;
 use Carbon\Carbon;
+use think\Db;
 use think\db\Query;
 use think\Model;
 use Yansongda\Supports\Arr;
@@ -30,6 +31,7 @@ use Yansongda\Supports\Arr;
  * @property float amount_pay
  * @property float amount_coupon
  * @method static static payed()
+ * @method static static hasRefund()
  * @method static static statusPay()
  * @method Query hasGoods($goods_id)
  */
@@ -338,6 +340,11 @@ class Orders extends Model
             OrderInfo::whereRaw("orders.id=order_info.order_id and order_info.goods_id={$goods_id}")->buildSql()
         );
     }
+    public function scopeHasRefund(Query $query){
+        $query->whereExists(
+            OrderInfo::where('refund_id','>',0)->where('order_info.order_id',Db::raw('orders.id'));
+        );
+    }
 
 
 

application/common/model/Refund.php

@@ -30,6 +30,7 @@ use Yansongda\Supports\Arr;
  * @property bool need_complete
  * @property string audit_remark
  * @property string order_no
+ * @property string fix_order_no
  * @property string refund_type_text
  * @property string refund_by_text
  * @property float amount_last

public/api.html

@@ -2172,6 +2172,66 @@
                                                                 <td>当前申请的售后信息，没有为null</td>
                                                             </tr>
                                                                                                                         <tr>
+                                                                <td>refund[refund_type_text]</td>
+                                                                <td>string</td>
+                                                                <td>申请类型</td>
+                                                            </tr>
+                                                                                                                        <tr>
+                                                                <td>refund[num]</td>
+                                                                <td>string</td>
+                                                                <td>退货数量</td>
+                                                            </tr>
+                                                                                                                        <tr>
+                                                                <td>refund[num_install]</td>
+                                                                <td>string</td>
+                                                                <td>安装数量</td>
+                                                            </tr>
+                                                                                                                        <tr>
+                                                                <td>refund[amount]</td>
+                                                                <td>string</td>
+                                                                <td>退货金额</td>
+                                                            </tr>
+                                                                                                                        <tr>
+                                                                <td>refund[amount_install]</td>
+                                                                <td>string</td>
+                                                                <td>安装金额</td>
+                                                            </tr>
+                                                                                                                        <tr>
+                                                                <td>refund[refund_by_text]</td>
+                                                                <td>string</td>
+                                                                <td>退货方式</td>
+                                                            </tr>
+                                                                                                                        <tr>
+                                                                <td>refund[reason_text]</td>
+                                                                <td>string</td>
+                                                                <td>售后原因</td>
+                                                            </tr>
+                                                                                                                        <tr>
+                                                                <td>refund[reason2]</td>
+                                                                <td>string</td>
+                                                                <td>备注</td>
+                                                            </tr>
+                                                                                                                        <tr>
+                                                                <td>refund[fix_order_no]</td>
+                                                                <td>string</td>
+                                                                <td>维修单号</td>
+                                                            </tr>
+                                                                                                                        <tr>
+                                                                <td>refund[audit_remark]</td>
+                                                                <td>string</td>
+                                                                <td>不同意原因</td>
+                                                            </tr>
+                                                                                                                        <tr>
+                                                                <td>refund[refund_status_text]</td>
+                                                                <td>string</td>
+                                                                <td>状态</td>
+                                                            </tr>
+                                                                                                                        <tr>
+                                                                <td>refund[refund_status]</td>
+                                                                <td>string</td>
+                                                                <td></td>
+                                                            </tr>
+                                                                                                                        <tr>
                                                                 <td>refunds</td>
                                                                 <td>string</td>
                                                                 <td>售后记录</td>
@@ -19286,7 +19346,7 @@
 
                 </div>
                 <div class="col-md-6" align="right">
-                    Generated on 2022-12-11 14:21:35 <a href="./" target="_blank">苏州屏酷有限公司</a>
+                    Generated on 2022-12-11 14:44:09 <a href="./" target="_blank">苏州屏酷有限公司</a>
                 </div>
             </div>