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

更新

Browse Source
This commit is contained in:
mkm 2024-05-15 10:15:04 +08:00
parent c54ccb4ac2
commit bf8ea2a150
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,6 +49,7 @@ class RetailOrderController extends BaseApiController
} }
$where[] = ['merchant', '=',$this->userInfo['merchant']['mer_id']]; $where[] = ['merchant', '=',$this->userInfo['merchant']['mer_id']];
$where[] = ['paid', '=',1]; $where[] = ['paid', '=',1];
$where[] = ['is_opurchase', '=',0];
$res = Cashierclass::where($where)->page($page_no, 25)->whereDay('create_time', $date) $res = Cashierclass::where($where)->page($page_no, 25)->whereDay('create_time', $date)
->order('address_id','asc') ->order('address_id','asc')
->select()->each(function($item){ ->select()->each(function($item){

12
app/api/logic/order/OrderLogic.php
View File

@ -137,7 +137,7 @@ class OrderLogic extends BaseLogic
return false; return false;
} }
$mer_id = $user['merchant']['mer_id']; $mer_id = $user['merchant']['mer_id'];
$where1 = ['paid' => 1]; $where1 = ['paid' => 1,'is_opurchase'=>0];
$arrs = Cashierclass::where('merchant', $mer_id)->whereDay('create_time')->where($where1)->column('cart_id,id,address_id'); $arrs = Cashierclass::where('merchant', $mer_id)->whereDay('create_time')->where($where1)->column('cart_id,id,address_id');
// $order_id = Cashierclass::where('merchant', $mer_id)->whereDay('create_time')->where($where1)->column('id'); // $order_id = Cashierclass::where('merchant', $mer_id)->whereDay('create_time')->where($where1)->column('id');
@ -198,16 +198,6 @@ class OrderLogic extends BaseLogic
return false; return false;
} }
$_order = $orderInfo['order']; $_order = $orderInfo['order'];
$where=[
'merchant'=>$mer_id,
'order_arr'=>$_order['order_arr'],
'cart_id'=>$_order['cart_id'],
];
$find=Opurchaseclass::where($where)->find();
if($find){
self::setError('订单已存在,不能重复提交');
return false;
}
// if ($_order['total'] < $merchant['mer_money']) { // if ($_order['total'] < $merchant['mer_money']) {
// self::setError('商户余额不足'); // self::setError('商户余额不足');
// return false; // return false;