团长优惠带来的问题

addons/shopro/library/activity/provider/Groupon.php

@@ -114,15 +114,15 @@ class Groupon extends Base
             foreach ($activitySkuPrices as $activitySkuPrice) {
                 if ($skuPrice->id == $activitySkuPrice['goods_sku_price_id']) {
                     // 采用活动的 规格内容
-                    $is_leader_discount = $activitySkuPrice['ext']['is_leader_discount'];
-                    $leader_price = $activitySkuPrice['ext']['leader_price'];
+//                    $is_leader_discount = $activitySkuPrice['ext']['is_leader_discount'];
+//                    $leader_price = $activitySkuPrice['ext']['leader_price'];
                     $skuPrice->old_price = $skuPrice->price;        // 保存原始普通商品规格的价格（计算活动的优惠）
                     $skuPrice->stock = ($activitySkuPrice['stock'] > $stock) ? $stock : $activitySkuPrice['stock'];     // 活动库存不能超过商品库存
                     $skuPrice->sales = $activitySkuPrice['sales'];
                     $skuPrice->price = $activitySkuPrice['price'];
                     $skuPrice->groupon_price = $activitySkuPrice['price'];      // 不覆盖原来规格价格，用作单独购买，将活动的价格设置为新的拼团价格
-                    $skuPrice->is_leader_discount = $is_leader_discount;            // 是否团长优惠
-                    $skuPrice->leader_price = $leader_price;    // 团长优惠价格
+                    $skuPrice->is_leader_discount = 0;            // 是否团长优惠
+                    $skuPrice->leader_price = $activitySkuPrice['price'];    // 团长优惠价格
                     $skuPrice->status = $activitySkuPrice['status'];        // 采用活动的上下架
                     $skuPrice->ext = $activitySkuPrice['ext'];        // 活动规格 ext, order_item 保存备用
                     $skuPrice->min_price = $activitySkuPrice['price'];        // 当前活动规格最小价格，这里是拼团价

addons/shopro/listener/Order.php

@@ -27,6 +27,7 @@ use addons\shopro\library\activity\traits\GiveGift;
 use addons\shopro\facade\Activity as ActivityFacade;
 use addons\shopro\facade\Wechat;
 use addons\shopro\library\easywechatPlus\WechatMiniProgramShop;
+use think\Db;
 
 class Order
 {