diff --git a/app/api/lists/order/RetailOrderList.php b/app/api/lists/order/RetailOrderList.php index 0a1a1b0..9a9d2a6 100644 --- a/app/api/lists/order/RetailOrderList.php +++ b/app/api/lists/order/RetailOrderList.php @@ -26,7 +26,7 @@ class RetailOrderList extends BaseAdminDataLists implements ListsSearchInterface public function setSearch(): array { return [ - '=' => ['paid','status'], + '=' => ['paid','status','source'], 'between_time' => 'create_time', '%like%' => ['number'], ]; diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php index a693c12..83c64f4 100644 --- a/app/api/logic/order/OrderLogic.php +++ b/app/api/logic/order/OrderLogic.php @@ -2,6 +2,7 @@ namespace app\api\logic\order; +use app\common\enum\PayEnum; use app\common\logic\BaseLogic; use app\common\model\goods\Goods; use app\common\model\goods\Unit; @@ -14,6 +15,7 @@ use app\common\model\retail\Cashierinfo; use app\common\model\user\UserAddress; use app\Request; use think\facade\Db; +use Yansongda\Pay\Event\PayEnd; /** * 订单逻辑 @@ -86,6 +88,7 @@ class OrderLogic extends BaseLogic $_order['account'] = 0; $_order['payinfo'] = ''; $_order['type'] = 0; + $_order['source'] = 0; $_order['actual'] = $_order['total']; if($addressId>0){ $address=UserAddress::where(['address_id'=>$addressId,'uid'=>Request()->userId])->find(); @@ -96,6 +99,9 @@ class OrderLogic extends BaseLogic $_order['address_id'] = $addressId; } } + if($params['pay_type']==PayEnum::WECHAT_PAY_BARCODE){ + $_order['source']=1; + } Db::startTrans(); try { $order = Cashierclass::create($_order);