|
@@ -497,6 +497,7 @@ class CouponController extends Curd
|
|
$couponNbr[$coupon['coupon_id']] = $count;
|
|
$couponNbr[$coupon['coupon_id']] = $count;
|
|
}
|
|
}
|
|
if ($couponNbr[$coupon['coupon_id']] - $chooseCoupon['nbr'] < 0) {
|
|
if ($couponNbr[$coupon['coupon_id']] - $chooseCoupon['nbr'] < 0) {
|
|
|
|
+ Log::error("优惠券发放失败,超出发行数量", $coupon);
|
|
throw new BusinessException($coupon['coupon_name'] . "超出发行数量");
|
|
throw new BusinessException($coupon['coupon_name'] . "超出发行数量");
|
|
}
|
|
}
|
|
$couponNbr[$coupon['coupon_id']] = $couponNbr[$coupon['coupon_id']] - $chooseCoupon['nbr'];
|
|
$couponNbr[$coupon['coupon_id']] = $couponNbr[$coupon['coupon_id']] - $chooseCoupon['nbr'];
|
|
@@ -785,8 +786,8 @@ class CouponController extends Curd
|
|
'goods' => function ($query) {
|
|
'goods' => function ($query) {
|
|
$query->select('goods_id', 'goods_id as id', 'goods_name as name', 'join_goods_category_id as pid', 'goods_classify', 'goods_sales_price', 'goods_cover');
|
|
$query->select('goods_id', 'goods_id as id', 'goods_name as name', 'join_goods_category_id as pid', 'goods_classify', 'goods_sales_price', 'goods_cover');
|
|
},
|
|
},
|
|
- 'skus'=>function($query){
|
|
|
|
- $query->select('goods_sku_id','join_sku_goods_id','goods_sku_specs_json','goods_sku_sales_price');
|
|
|
|
|
|
+ 'skus' => function ($query) {
|
|
|
|
+ $query->select('goods_sku_id', 'join_sku_goods_id', 'goods_sku_specs_json', 'goods_sku_sales_price');
|
|
},
|
|
},
|
|
'sku'
|
|
'sku'
|
|
])->where('join_goods_coupon_id', $couponId)
|
|
])->where('join_goods_coupon_id', $couponId)
|
|
@@ -963,8 +964,8 @@ class CouponController extends Curd
|
|
];
|
|
];
|
|
try {
|
|
try {
|
|
CouponDetail::insert($insertData);
|
|
CouponDetail::insert($insertData);
|
|
- }catch (\Exception $e){
|
|
|
|
- $insertData['coupon_detail_id'] = $insertData['coupon_detail_id'].random_string(1, 'up');
|
|
|
|
|
|
+ } catch (\Exception $e) {
|
|
|
|
+ $insertData['coupon_detail_id'] = $insertData['coupon_detail_id'] . random_string(1, 'up');
|
|
CouponDetail::insert($insertData);
|
|
CouponDetail::insert($insertData);
|
|
}
|
|
}
|
|
}
|
|
}
|