add - 结算类型、优惠时间单位、查询

app/adminapi/lists/orders/RechargeOrderLists.php

@@ -39,12 +39,25 @@ class RechargeOrderLists extends BaseAdminDataLists implements ListsSearchInterf
     public function setSearch(): array
     {
         return [
-            '=' => ['sn', 'work_id', 'user_id', 'payment_type', 'pay_sn', 'pay_way', 'pay_status', 'pay_time', 'order_terminal', 'transaction_id', 'refund_status', 'refund_transaction_id', 'create_time', 'update_time'],
+            '=' => ['sn', 'work_id', 'user_id', 'payment_type', 'pay_sn', 'pay_way', 'pay_status', 'pay_time', 'order_terminal', 'transaction_id', 'refund_status', 'refund_transaction_id'],
 
         ];
     }
 
 
+    public function queryWhere():array
+    {
+        $where = [];
+        if(isset($this->params['create_time']) && !empty($this->params['create_time'])){
+            $time = [strtotime($this->params['create_time'][0]), strtotime($this->params['create_time'][1])];
+            $where[] = ['create_time', 'between', $time];
+        }
+        if(isset($this->params['update_time']) && !empty($this->params['update_time'])){
+            $time = [strtotime($this->params['update_time'][0]), strtotime($this->params['update_time'][1])];
+            $where[] = ['update_time', 'between', $time];
+        }
+        return $where;
+    }
     /**
      * @notes 获取列表
      * @return array
@@ -59,6 +72,7 @@ class RechargeOrderLists extends BaseAdminDataLists implements ListsSearchInterf
         return RechargeOrder::with(['orderGoods'=>function(Query $query){
             $query->field('id,sn,goods_id,goods_name,goods_image,goods_number,good_unit,goods_size,goods_type,goods_brand,base_service_fee,service_total,service_fee')->order(['id'=>'desc']);
         }])->where($this->searchWhere)
+            ->where($this->queryWhere())
             ->field(['id', 'sn', 'work_id', 'user_id', 'payment_type', 'pay_sn', 'pay_way', 'pay_status', 'pay_time', 'order_total', 'order_amount', 'order_terminal', 'transaction_id', 'refund_status', 'refund_transaction_id', 'create_time', 'update_time'])
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
@@ -75,7 +89,7 @@ class RechargeOrderLists extends BaseAdminDataLists implements ListsSearchInterf
      */
     public function count(): int
     {
-        return RechargeOrder::where($this->searchWhere)->count();
+        return RechargeOrder::where($this->searchWhere)->where($this->queryWhere())->count();
     }
 
 }

app/adminapi/logic/coupon/CouponRulesLogic.php

@@ -49,14 +49,14 @@ class CouponRulesLogic extends BaseLogic
                 'amount_require' => $params['amount_require'],
                 'discount_ratio' => $params['discount_ratio'],
                 'event_name' => $params['event_name'],
-                'expire_time' =>  $params['expire_time']  ?: 0,
+                'expire_time' =>  $params['expire_time']  ?$params['expire_time']*86400: 0,
                 'max_deductible_price' => $params['max_deductible_price'],
                 'mold_type' => $params['mold_type'],
                 'server_category_name' => $params['server_category_name'],
                 'voucher_status' => $params['voucher_status'],
                 'voucher_count' => $params['voucher_count'],
                 'remaining_count' => $params['voucher_count'],
-                'property_activity_id' => $params['property_activity_id'],
+                'property_activity_id' => $params['property_activity_id']??0,
             ]);
             if(!empty($params['goods_category_ids'])){
                 $categoryArr = [];
@@ -92,14 +92,14 @@ class CouponRulesLogic extends BaseLogic
                 'amount_require' => $params['amount_require'],
                 'discount_ratio' => $params['discount_ratio'],
                 'event_name' => $params['event_name'],
-                'expire_time' => $params['expire_time']  ?: 0,
+                'expire_time' => $params['expire_time']  ?$params['expire_time']*86400: 0,
                 'max_deductible_price' => $params['max_deductible_price'],
                 'mold_type' => $params['mold_type'],
                 'server_category_name' => $params['server_category_name'],
                 'voucher_status' => $params['voucher_status'],
                 'voucher_count' => $params['voucher_count'],
                 'remaining_count' => $params['remaining_count'],
-                'property_activity_id' => $params['property_activity_id'],
+                'property_activity_id' => $params['property_activity_id']??0,
             ]);
             CouponCategory::where('coupon_id',$params['id'])->delete();
             if(!empty($params['goods_category_ids'])){

app/adminapi/logic/master_worker/MasterWorkerLogic.php

@@ -69,6 +69,7 @@ class MasterWorkerLogic extends BaseLogic
                 'time_period' => $params['time_period']??'',
                 'work_status' => $params['work_status']??0,
                 'recruiting_behalf' => $params['recruiting_behalf']??'',
+                'settlement_type' => $params['settlement_type']??2,
             ]);
 
             Db::commit();
@@ -132,6 +133,7 @@ class MasterWorkerLogic extends BaseLogic
                 'time_period' => $params['time_period']?implode(',',$params['time_period']):'',
                 'work_status' => $params['work_status']??0,
                 'recruiting_behalf' => $params['recruiting_behalf']??'',
+                'settlement_type' => $params['settlement_type']??2,
             ]);
             Db::commit();
             return true;