发放购买服务包的关联优惠卷修改

app/Services/UserCouponService.php

@@ -135,6 +135,7 @@ class UserCouponService extends BaseService
 
         // 处理优惠卷数量限制问题
         foreach ($coupons as $key => $coupon) {
+            // 处理数量优惠卷
             if ($coupon['coupon_type'] == 3 && !empty($coupon['product_id'])){
                 // 数量是否足够标识字段
                 $quantity_quantity = 0;
@@ -161,15 +162,17 @@ class UserCouponService extends BaseService
                 }
             }
 
-            // 处理满减金额问题
-            if ($coupon['coupon_type'] == 2  && !empty($coupon['product_id'])){
+            // 处理满减金额优惠卷
+            if ($coupon['coupon_type'] == 2){
                 // 可共用一个优惠卷的商品金额问题
                 $product_price = 0;
 
                 foreach ($coupon_product_datas as $coupon_product_data) {
                     // 如该优惠卷不包含此商品，跳过
-                    if (!str_contains($coupon['product_id'], $coupon_product_data['product_id'])) {
-                        continue;
+                    if (!empty($coupon['product_id'])){
+                        if (!str_contains($coupon['product_id'], $coupon_product_data['product_id'])) {
+                            continue;
+                        }
                     }
 
                     $product_price = bcadd($product_price,