|
@@ -9,6 +9,7 @@ use app\model\Coupon;
|
|
|
use app\model\CouponDetail;
|
|
|
use app\model\CouponGoods;
|
|
|
use app\model\Member;
|
|
|
+use app\model\Order;
|
|
|
use app\model\SysDept;
|
|
|
use support\Request;
|
|
|
use support\Response;
|
|
@@ -300,6 +301,7 @@ class CouponDetailController extends Curd
|
|
|
{
|
|
|
$memberId = $request->get('member_id', '');
|
|
|
$goods = $request->get('goods', []);
|
|
|
+ $orderId = $request->get('order_id');
|
|
|
$settlementNow = $request->get('settlement_now', 'N');
|
|
|
if ($memberId == '') {
|
|
|
return json_fail("参数异常");
|
|
@@ -315,6 +317,16 @@ class CouponDetailController extends Curd
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ $couponDetailIds = [];
|
|
|
+ if (!empty($orderId)) {
|
|
|
+ $order = Order::where('order_id', $orderId)->first();
|
|
|
+ if (!empty($order->order_discount_json)) {
|
|
|
+ $orderDiscountJson = json_decode($order->order_discount_json, true);
|
|
|
+ foreach ($orderDiscountJson as $coupon){
|
|
|
+// $couponDetailIds =
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
$details = CouponDetail::with([
|
|
|
'coupon' => function ($query) {
|