|
|
@@ -542,16 +542,15 @@ class WholeController extends Curd
|
|
|
$classify = CouponService::couponClassifyInfo($coupon->coupon_classify, $coupon->coupon_category, $coupon->coupon_value, $coupon->coupon_minimum_limit);
|
|
|
$discount['coupon_name'] .= $coupon->coupon_classify . '：' . $coupon->coupon_name . '(优惠￥' . sprintf("%.2f", $discountItem['coupon_value']) . '), ';
|
|
|
}
|
|
|
+ if ($discountItem['coupon_classify'] == '退款'){
|
|
|
+ continue;
|
|
|
+ }
|
|
|
if (empty($discountItem['coupon_id']) && !empty($discountItem['coupon_classify'])) {
|
|
|
- $discountClassify = '优惠';
|
|
|
- if ($discountItem['coupon_classify'] == '退款'){
|
|
|
- $discountClassify = '退款';
|
|
|
- }
|
|
|
if (!empty($discountItem['coupon_detail_id'])) {
|
|
|
|
|
|
- $discount['classify'] .= $discountItem['coupon_detail_id'][0] . '('.$discountClassify.'￥' . sprintf("%.2f", $discountItem['coupon_value']) . '), ';
|
|
|
+ $discount['classify'] .= $discountItem['coupon_detail_id'][0] . '(优惠￥' . sprintf("%.2f", $discountItem['coupon_value']) . '), ';
|
|
|
} else {
|
|
|
- $discount['classify'] .= $discountItem['coupon_classify'] . '(优惠'.$discountClassify.'￥' . sprintf("%.2f", $discountItem['coupon_value']) . '), ';
|
|
|
+ $discount['classify'] .= $discountItem['coupon_classify'] . '(优惠￥' . sprintf("%.2f", $discountItem['coupon_value']) . '), ';
|
|
|
}
|
|
|
}
|
|
|
if (!empty($discountItem['coupon_value'])) {
|
gorden