后台零售模块修改

app/admin/controller/retail/CashierclassController.php

@@ -62,6 +62,22 @@ class CashierclassController extends BaseAdminController
         }
         return $this->fail(CashierclassLogic::getError());
     }
+	
+	/**
+	 * @notes 审核零售订单
+	 * @return \think\response\Json
+	 * @author likeadmin
+	 * @date 2024/04/24 09:57
+	 */
+	public function auditing()
+	{
+		$params = (new CashierclassValidate())->post()->goCheck('auditing');
+		$result = CashierclassLogic::auditing($params,$this->adminId);
+		if (true === $result) {
+			return $this->success('审核成功', [], 1, 1);
+		}
+		return $this->fail(CashierclassLogic::getError());
+	}
 
 
     /**

app/admin/lists/retail/CashierclassLists.php

@@ -4,8 +4,11 @@ namespace app\admin\lists\retail;
 
 
 use app\admin\lists\BaseAdminDataLists;
+use app\common\model\auth\Admin;
+use app\common\model\merchant\Merchant;
 use app\common\model\retail\Cashierclass;
 use app\common\lists\ListsSearchInterface;
+use app\common\model\user\User;
 
 
 /**
@@ -49,10 +52,17 @@ class CashierclassLists extends BaseAdminDataLists implements ListsSearchInterfa
     public function lists(): array
     {
         return Cashierclass::where($this->searchWhere)
-            ->field(['id', 'merchant', 'store_id', 'number', 'total', 'deduction_price', 'actual', 'money',  'pay_type', 'type', 'auditinguser', 'auditingtime'])
+            ->field(['id', 'merchant', 'store_id', 'uid', 'number', 'total', 'deduction_price', 'actual', 'money',  'pay_type', 'type', 'auditinguser', 'auditingtime','create_time'])
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
-            ->select()
+            ->select()->each(function($data){
+		        $merchant = Merchant::field('mer_name')->where('mer_id',$data['merchant'])->findOrEmpty();
+		        $user = User::field('nickname')->where('id',$data['uid'])->findOrEmpty();
+		        $admin = Admin::field('name')->where('id',$data['auditinguser'])->findOrEmpty();
+				$data['merchant_name'] = !$merchant->isEmpty() ? $merchant['mer_name'] : '';
+				$data['user_name'] = !$user->isEmpty() ? $user['nickname'] : '';
+				$data['auditinguser_name'] = !$admin->isEmpty() ? $admin['name'] : '';
+	        })
             ->toArray();
     }
 

app/admin/lists/retail/CashierinfoLists.php

@@ -4,8 +4,12 @@ namespace app\admin\lists\retail;
 
 
 use app\admin\lists\BaseAdminDataLists;
+use app\common\model\goods\Goods;
+use app\common\model\retail\Cashierclass;
 use app\common\model\retail\Cashierinfo;
 use app\common\lists\ListsSearchInterface;
+use app\common\model\warehouse\Warehouse;
+use think\facade\Db;
 
 
 /**
@@ -46,7 +50,16 @@ class CashierinfoLists extends BaseAdminDataLists implements ListsSearchInterfac
             ->field(['id', 'pid', 'room', 'goods', 'warehouse', 'serial', 'nums', 'price', 'discount', 'total', 'data', 'more', 'sort'])
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
-            ->select()
+            ->select()->each(function($data){
+				$cashier = Cashierclass::field('number')->where('id',$data['pid'])->findOrEmpty();
+				$room = Db::name('room')->where('id',$data['room'])->find();
+				$warehouse = Warehouse::field('name')->where('id',$data['warehouse'])->findOrEmpty();
+				$goods = Goods::field('name')->where('id',$data['goods'])->findOrEmpty();
+				$data['cashier_number'] = !$cashier->isEmpty() ? $cashier['number'] : '';
+				$data['room_data'] = !empty($room) ? $room : [];
+				$data['warehouse_name'] = !$warehouse->isEmpty() ? $warehouse['name'] : '';
+				$data['goods_name'] = !$goods->isEmpty() ? $goods['name'] : '';
+	        })
             ->toArray();
     }
 

app/admin/logic/retail/CashierclassLogic.php

@@ -90,6 +90,40 @@ class CashierclassLogic extends BaseLogic
             return false;
         }
     }
+	
+	/**
+	 * @notes 审核零售订单
+	 * @param array $params
+	 * @return bool
+	 * @author likeadmin
+	 * @date 2024/04/24 09:57
+	 */
+	public static function auditing(array $params,$admin_id): bool
+	{
+		$data = Cashierclass::where('id',$params['id'])->findOrEmpty();
+		if($data->isEmpty()){
+			self::setError('订单信息不存在');
+			return false;
+		}
+		if($data->type != 0){
+			self::setError('此订单已审核');
+			return false;
+		}
+		Db::startTrans();
+		try {
+			Cashierclass::where('id', $params['id'])->update([
+				'type' => 1,
+				'auditinguser' => $admin_id,
+				'auditingtime' => time()
+			]);
+			Db::commit();
+			return true;
+		} catch (\Exception $e) {
+			Db::rollback();
+			self::setError($e->getMessage());
+			return false;
+		}
+	}
 
 
     /**

app/admin/validate/retail/CashierclassValidate.php

@@ -70,6 +70,11 @@ class CashierclassValidate extends BaseValidate
     {
         return $this->only(['id','merchant','number','total','actual','money','pay_type']);
     }
+	
+	public function sceneAuditing()
+	{
+		return $this->only(['id']);
+	}
 
 
     /**

app/common/model/retail/Cashierclass.php

@@ -3,7 +3,10 @@
 namespace app\common\model\retail;
 
 
+use app\common\model\auth\Admin;
 use app\common\model\BaseModel;
+use app\common\model\merchant\Merchant;
+use app\common\model\user\User;
 use think\model\concern\SoftDelete;
 
 
@@ -17,6 +20,9 @@ class Cashierclass extends BaseModel
     use SoftDelete;
     protected $name = 'cashierclass';
     protected $deleteTime = 'delete_time';
+	
+	public function getAuditingtimeAttr($value){
+		return !empty($value) ? date('Y-m-d H:i:s',$value) : '';
+	}
 
-    
 }