feat: 修改用户和订单相关逻辑

This commit is contained in:
mkm 2024-06-18 10:12:36 +08:00
parent 5768afd77a
commit a08d9ff067
2 changed files with 53 additions and 95 deletions

View File

@ -77,7 +77,7 @@ class UserLogic extends BaseLogic
try { try {
$data=[ $data=[
'avatar' => $avatar, 'avatar' => $avatar,
'real_name' =>'', 'real_name' => $params['real_name']??"",
'nickname' => '用户'.time(), 'nickname' => '用户'.time(),
'account' => $params['mobile'], 'account' => $params['mobile'],
'password' => $password, 'password' => $password,
@ -88,7 +88,7 @@ class UserLogic extends BaseLogic
$res=User::create($data); $res=User::create($data);
UserAddress::create([ UserAddress::create([
'uid' => $res['id'], 'uid' => $res['id'],
'real_name' => $data['nickname'], 'real_name' => $params['real_name']??"",
'mobile' => $params['mobile'], 'mobile' => $params['mobile'],
'province' => $params['province'], 'province' => $params['province'],
'city' => $params['city'], 'city' => $params['city'],

View File

@ -35,41 +35,7 @@ use Webman\RedisQueue\Redis;
class StoreOrderController extends BaseAdminController class StoreOrderController extends BaseAdminController
{ {
// #[ /**订单列表 */
// ApiDoc\Title('订单列表'),
// ApiDoc\url('/store/store_order/storeOrder/lists'),
// ApiDoc\Method('GET'),
// ApiDoc\NotHeaders(),
// ApiDoc\Author('中国队长'),
// ApiDoc\Query(name: 'order_id', type: 'string', require: false, desc: '订单编号'),
// ApiDoc\Query(name: 'staff_id', type: 'int', require: false, desc: '店员id'),
// ApiDoc\Query(name: 'delivery_phone', type: 'int', require: false, desc: '配送员手机号'),
// ApiDoc\Query(name: 'shipping_type', type: 'int', require: false, desc: '订单配送方式1配送订单2核销订单3收银台订单'),
// ApiDoc\Query(name: 'start_time', type: 'string', require: false, desc: '开始时间'),
// ApiDoc\Query(name: 'end_time', type: 'string', require: false, desc: '结束时间'),
// ApiDoc\Query(name: 'status', type: 'int', require: false, desc: '状态:-1待支付0待发货1待收货2已完成'),
// ApiDoc\Header(ref: [Definitions::class, "token"]),
// ApiDoc\Query(ref: [Definitions::class, "page"]),
// ApiDoc\ResponseSuccess("data", type: "array", children: [
// ['name' => 'id', 'desc' => 'ID', 'type' => 'int'],
// ['name' => 'order_id', 'desc' => '订单编号', 'type' => 'string'],
// ['name' => 'pay_price', 'desc' => '支付金额', 'type' => 'string'],
// ['name' => 'pay_time', 'desc' => '支付时间', 'type' => 'float'],
// ['name' => 'pay_type', 'desc' => '支付方式', 'type' => 'float'],
// ['name' => 'status_name', 'desc' => '状态', 'type' => 'int'],
// ['name' => 'staff_name', 'desc' => '店员', 'type' => 'int'],
// ['name' => 'nickname', 'desc' => '用户昵称', 'type' => 'string'],
// ['name' => 'avatar', 'desc' => '用户头像', 'type' => 'string'],
// ['name' => 'product', 'desc' => '商品信息', 'type' => 'array', 'children' => [
// ['name' => 'cart_info', 'desc' => '商品信息', 'type' => 'array', 'children' => [
// ['name' => 'name', 'desc' => '商品名称', 'type' => 'int'],
// ['name' => 'image', 'desc' => '图片', 'type' => 'string'],
// ['name' => 'cart_num', 'desc' => '购买数量', 'type' => 'string'],
// ['name' => 'price', 'desc' => '单价', 'type' => 'string'],
// ]],
// ]],
// ]),
// ]
public function lists() public function lists()
{ {
return $this->dataLists(new StoreOrderLists()); return $this->dataLists(new StoreOrderLists());
@ -98,17 +64,9 @@ class StoreOrderController extends BaseAdminController
]); ]);
} }
// #[ /**
// ApiDoc\Title('订单详情'), * 订单详情
// ApiDoc\url('/store/store_order/storeOrder/detail'), */
// ApiDoc\Method('GET'),
// ApiDoc\NotHeaders(),
// ApiDoc\Author('中国队长'),
// ApiDoc\Header(ref: [Definitions::class, "token"]),
// ApiDoc\Query(name: 'id', type: 'int', require: false, desc: '订单id'),
// ApiDoc\Query(name: 'verify_code', type: 'string', require: false, desc: '核销码'),
// ApiDoc\ResponseSuccess("data", type: "array"),
// ]
public function detail(StoreOrderLogic $orderLogic) public function detail(StoreOrderLogic $orderLogic)
{ {
$params = (new StoreOrderValidate())->goCheck('detail'); $params = (new StoreOrderValidate())->goCheck('detail');
@ -116,6 +74,9 @@ class StoreOrderController extends BaseAdminController
return $this->data($result); return $this->data($result);
} }
/**
* 订单检查
*/
public function checkOrder() public function checkOrder()
{ {
$cartId = (array)$this->request->post('cart_id', []); $cartId = (array)$this->request->post('cart_id', []);
@ -154,7 +115,6 @@ class StoreOrderController extends BaseAdminController
} else { } else {
return $this->fail('发送失败'); return $this->fail('发送失败');
} }
} }
@ -338,7 +298,6 @@ class StoreOrderController extends BaseAdminController
'page_size' => $params['page_size'], 'page_size' => $params['page_size'],
]; ];
return $this->success('ok', $data); return $this->success('ok', $data);
} }
/** /**
* vip充值 * vip充值
@ -408,7 +367,8 @@ class StoreOrderController extends BaseAdminController
/** /**
* 订单打印 * 订单打印
*/ */
public function print(){ public function print()
{
$id = $this->request->get('id'); $id = $this->request->get('id');
$find = StoreOrder::where('id', $id)->find(); $find = StoreOrder::where('id', $id)->find();
if ($find) { if ($find) {
@ -432,7 +392,5 @@ class StoreOrderController extends BaseAdminController
}); });
} }
return $this->success('获取成功', $find?->toArray()); return $this->success('获取成功', $find?->toArray());
} }
} }