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

零售订单source

Browse Source
This commit is contained in:
mkm 2024-05-13 11:09:07 +08:00
parent 264dae5ccc
commit 87b4c23e3b
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/api/lists/order/RetailOrderList.php
View File

@ -26,7 +26,7 @@ class RetailOrderList extends BaseAdminDataLists implements ListsSearchInterface
public function setSearch(): array public function setSearch(): array
{ {
return [ return [
'=' => ['paid','status'], '=' => ['paid','status','source'],
'between_time' => 'create_time', 'between_time' => 'create_time',
'%like%' => ['number'], '%like%' => ['number'],
]; ];

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

@ -2,6 +2,7 @@
namespace app\api\logic\order; namespace app\api\logic\order;
use app\common\enum\PayEnum;
use app\common\logic\BaseLogic; use app\common\logic\BaseLogic;
use app\common\model\goods\Goods; use app\common\model\goods\Goods;
use app\common\model\goods\Unit; use app\common\model\goods\Unit;
@ -14,6 +15,7 @@ use app\common\model\retail\Cashierinfo;
use app\common\model\user\UserAddress; use app\common\model\user\UserAddress;
use app\Request; use app\Request;
use think\facade\Db; use think\facade\Db;
use Yansongda\Pay\Event\PayEnd;
/** /**
* 订单逻辑 * 订单逻辑
@ -86,6 +88,7 @@ class OrderLogic extends BaseLogic
$_order['account'] = 0; $_order['account'] = 0;
$_order['payinfo'] = ''; $_order['payinfo'] = '';
$_order['type'] = 0; $_order['type'] = 0;
$_order['source'] = 0;
$_order['actual'] = $_order['total']; $_order['actual'] = $_order['total'];
if($addressId>0){ if($addressId>0){
$address=UserAddress::where(['address_id'=>$addressId,'uid'=>Request()->userId])->find(); $address=UserAddress::where(['address_id'=>$addressId,'uid'=>Request()->userId])->find();
@ -96,6 +99,9 @@ class OrderLogic extends BaseLogic
$_order['address_id'] = $addressId; $_order['address_id'] = $addressId;
} }
} }
if($params['pay_type']==PayEnum::WECHAT_PAY_BARCODE){
$_order['source']=1;
}
Db::startTrans(); Db::startTrans();
try { try {
$order = Cashierclass::create($_order); $order = Cashierclass::create($_order);