mkm/shop-php
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
mkm 2024-01-20 18:07:54 +08:00
parent 91e79605b1
commit ee142d3d45
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/common/repositories/store/order/StoreOrderCreateRepository.php
View File

@ -489,13 +489,16 @@ class StoreOrderCreateRepository extends StoreOrderRepository
if ($source == 103) { if ($source == 103) {
$ConsumptionWhere = [ $ConsumptionWhere = [
'uid' => $uid, 'uid' => $uid,
'start_time' => date('Y-m-d H:i:s'),
'status' => 0, 'status' => 0,
'is_fail' => 0 'is_fail' => 0
]; ];
$platformConsumption = Db::name('store_consumption_user')->where($ConsumptionWhere)->limit(100)->order('create_time', 'desc') $platformConsumption = Db::name('store_consumption_user')->where($ConsumptionWhere)->limit(100)->order('create_time', 'desc')
->field('uid,coupon_title,coupon_price') ->field('uid,coupon_title,coupon_price,start_time,end_time')
->select(); ->select()->each(function($item){
$item['describe']='仅限平台指定商家商品可使用';
return $item;
});
// if(count($platformConsumption)>1){ // if(count($platformConsumption)>1){
// $consumption=$platformConsumption[0]; // $consumption=$platformConsumption[0];
// } // }
@ -629,7 +632,7 @@ class StoreOrderCreateRepository extends StoreOrderRepository
'openIntegral', 'openIntegral',
'useIntegral', 'useIntegral',
'key', 'key',
'consumption' 'platformConsumption'
) + ['allow_address' => !$allow_no_address, 'order_delivery_status' => $orderDeliveryStatus]; ) + ['allow_address' => !$allow_no_address, 'order_delivery_status' => $orderDeliveryStatus];
} }