mkm/erp_old
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
mkm 2024-05-10 10:18:38 +08:00
parent fe300a6cd9
commit 5e73e0c256
2 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/admin/lists/goods/GoodsclassLists.php
View File

@ -43,18 +43,19 @@ class GoodsclassLists extends BaseAdminDataLists implements ListsSearchInterface
public function lists(): array public function lists(): array
{ {
$lists = Goodsclass::where($this->searchWhere) $lists = Goodsclass::where($this->searchWhere)
->where('pid', 0)
->field(['id', 'pid', 'name', 'data', 'pic', 'sort']) ->field(['id', 'pid', 'name', 'data', 'pic', 'sort'])
->limit($this->limitOffset, $this->limitLength) ->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc']) ->order(['id' => 'desc'])
->select()->each(function ($item) { ->select()
$a = Goodsclass::where('pid', $item['id'])->field(['id', 'pid', 'name', 'data', 'pic', 'sort'])->select(); // ->each(function ($item) {
$item['children'] = $a; // $a = Goodsclass::where('pid', $item['id'])->field(['id', 'pid', 'name', 'data', 'pic', 'sort'])->select();
foreach ($a as $k => &$v) { // $item['children'] = $a;
$b = Goodsclass::where('pid', $v['id'])->field(['id', 'pid', 'name', 'data', 'pic', 'sort'])->select(); // foreach ($a as $k => &$v) {
$v['children'] = $b; // $b = Goodsclass::where('pid', $v['id'])->field(['id', 'pid', 'name', 'data', 'pic', 'sort'])->select();
} // $v['children'] = $b;
})->toArray(); // }
// })
->toArray();
return $lists; return $lists;
// return linear_to_tree($lists, 'children'); // return linear_to_tree($lists, 'children');
@ -69,7 +70,7 @@ class GoodsclassLists extends BaseAdminDataLists implements ListsSearchInterface
*/ */
public function count(): int public function count(): int
{ {
return Goodsclass::where($this->searchWhere)->where('pid', 0) return Goodsclass::where($this->searchWhere)
->count(); ->count();
} }

11
app/api/controller/order/RetailOrderController.php
View File

@ -85,7 +85,11 @@ class RetailOrderController extends BaseApiController
} }
if($pay_type==9){ if($pay_type==9){
if(empty($this->request->userInfo['merchant'])){
return $this->fail('请先绑定商户');
}
$mer_id=$this->request->userInfo['merchant']['mer_id'];
$params['mer_id']=$mer_id;
} }
$order = OrderLogic::createOrder($cartId, $addressId, null, $params); $order = OrderLogic::createOrder($cartId, $addressId, null, $params);
if ($order != false) { if ($order != false) {
@ -146,8 +150,11 @@ class RetailOrderController extends BaseApiController
'paid' => 0, 'paid' => 0,
]; ];
$order = Cashierclass::where($where)->find(); $order = Cashierclass::where($where)->find();
if(!$order) return $this->fail('订单不存在或已支付');
switch ($pay_type) { switch ($pay_type) {
case PayEnum::BALANCE_PAY: case PayEnum::BALANCE_PAY:
//余额支付
$user = User::where('id', $this->request->userId)->find(); $user = User::where('id', $this->request->userId)->find();
$res = RetailOrderLogic::payBalance($user, $order); $res = RetailOrderLogic::payBalance($user, $order);
if (!RetailOrderLogic::hasError()) { if (!RetailOrderLogic::hasError()) {
@ -161,6 +168,7 @@ class RetailOrderController extends BaseApiController
} }
break; break;
case PayEnum::WECHAT_PAY: case PayEnum::WECHAT_PAY:
//微信支付
$redirectUrl = $params['redirect'] ?? '/pages/payment/payment'; $redirectUrl = $params['redirect'] ?? '/pages/payment/payment';
if ($addressId != $order['address_id']) { if ($addressId != $order['address_id']) {
$address = UserAddress::where(['address_id' => $addressId, 'uid' => Request()->userId])->find(); $address = UserAddress::where(['address_id' => $addressId, 'uid' => Request()->userId])->find();
@ -179,6 +187,7 @@ class RetailOrderController extends BaseApiController
return $this->success('', $result); return $this->success('', $result);
break; break;
case PayEnum::WECHAT_PAY_BARCODE: case PayEnum::WECHAT_PAY_BARCODE:
//微信条码支付
$result = PaymentLogic::codepay($auth_code, $order); $result = PaymentLogic::codepay($auth_code, $order);
if (PaymentLogic::hasError()) { if (PaymentLogic::hasError()) {
return $this->fail(PaymentLogic::getError(), $params); return $this->fail(PaymentLogic::getError(), $params);