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