Update V10.3.7

10.3.6/app/admin/model/PluginModel.php → 10.3.7/app/admin/model/PluginModel.php

@@ -1006,8 +1006,9 @@ public function upgrade($param)
 
         $this->startTrans();
         try{
-            $reflect = new \ReflectionClass($class);
-            $methods = $reflect->getMethods(\ReflectionMethod::IS_PUBLIC);
+            /*$reflect = new \ReflectionClass($class);
+            $methods = $reflect->getMethods(\ReflectionMethod::IS_PUBLIC);*/
+            $methods = get_class_methods($class)?:[];
             if(in_array('upgrade', $methods)){
                 $success = $Plugin->upgrade();
                 if (!$success) {
@@ -1180,8 +1181,9 @@ public function download($param)
                         $Plugin = new $class;
                         $this->startTrans();
                         try{
-                            $reflect = new \ReflectionClass($class);
-                            $methods = $reflect->getMethods(\ReflectionMethod::IS_PUBLIC);
+                            /*$reflect = new \ReflectionClass($class);
+                            $methods = $reflect->getMethods(\ReflectionMethod::IS_PUBLIC);*/
+                            $methods = get_class_methods($class)?:[];
                             if(in_array('upgrade', $methods)){
                                 $success = $Plugin->upgrade();
                                 if (!$success) {

10.3.6/app/api/controller/ProductController.php → 10.3.7/app/api/controller/ProductController.php

@@ -105,6 +105,12 @@ public function index()
 
         $ModuleLogic = new ModuleLogic();
         $res = $ModuleLogic->getPriceCycle($id);
+        $hookDiscountResultsOrgins = hook("client_discount_by_amount",['client_id'=>get_client_id(),'product_id'=>$product['id'],'amount'=>$res['price']]);
+        foreach ($hookDiscountResultsOrgins as $hookDiscountResultsOrgin){
+            if ($hookDiscountResultsOrgin['status']==200){
+                $res['price'] = bcadd($res['price'], $hookDiscountResultsOrgin['data']['discount']??0, 2);
+            }
+        }
         $product['price'] = $res['price'];
         $product['cycle'] = $res['cycle']??$product['cycle'];
 

10.3.6/app/common/logic/ResModuleLogic.php → 10.3.7/app/common/logic/ResModuleLogic.php

@@ -858,13 +858,13 @@ public function cartCalculatePrice($ProductModel, $params = [], $qty=1, $scene="
                 # 固定利润
                 if ($this->upstreamProduct['profit_type']==1){
                     $res['data']['profit'] = bcadd( 0, $this->upstreamProduct['profit_percent'], 2);
-                    $res['data']['price'] = bcadd($res['products']['total'] ?? 0, $res['data']['profit'], 2);
-                    $res['data']['renew_price'] = bcadd($res['products']['signal_price']??0,$this->upstreamProduct['profit_percent'],2);
+                    $res['data']['price'] = bcadd($res['products']['sale_total'] ?? 0, $res['data']['profit'], 2);
+                    $res['data']['renew_price'] = bcadd($res['products']['sale_signal_price']??0,$this->upstreamProduct['profit_percent'],2);
                     $res['data']['base_price'] = bcadd($res['products']['product_setup_fee']+$res['products']['product_price'],$this->upstreamProduct['profit_percent'],2);
                 }else{
-                    $res['data']['profit'] = bcmul($res['products']['total'] ?? 0, ($this->upstreamProduct['profit_percent']/100), 2);
-                    $res['data']['price'] = bcadd($res['products']['total'] ?? 0, $res['data']['profit'], 2);
-                    $res['data']['renew_price'] = bcmul($res['products']['signal_price']??0,(1+$this->upstreamProduct['profit_percent']/100),2);
+                    $res['data']['profit'] = bcmul($res['products']['sale_total'] ?? 0, ($this->upstreamProduct['profit_percent']/100), 2);
+                    $res['data']['price'] = bcadd($res['products']['sale_total'] ?? 0, $res['data']['profit'], 2);
+                    $res['data']['renew_price'] = bcmul($res['products']['sale_signal_price']??0,(1+$this->upstreamProduct['profit_percent']/100),2);
                     $res['data']['base_price'] = bcmul($res['products']['product_setup_fee']+$res['products']['product_price'],(1+$this->upstreamProduct['profit_percent']/100),2);
                 }
 
@@ -893,11 +893,13 @@ public function cartCalculatePrice($ProductModel, $params = [], $qty=1, $scene="
 
 	        $res = idcsmart_api_curl($apiId,"/console/v1/product/{$upstreamProductId}/config_option", ['config_options'=>$params],30,'POST');
 	        if ($res['status']==200){
-                if(isset($res['data']['discount']) && !empty($res['data']['discount'])){
+                if(isset($res['data']['discount'])){
                     // 加上等级折扣
-                    $res['data']['price'] = bcadd($res['data']['price'], $res['data']['discount'], 2);
-                    $res['data']['renew_price'] = bcadd($res['data']['renew_price'], $res['data']['discount'], 2);
+                    // $res['data']['price'] = bcadd($res['data']['price'], $res['data']['discount'], 2);
+                    // $res['data']['renew_price'] = bcadd($res['data']['renew_price'], $res['data']['discount'], 2);
                     unset($res['data']['discount']);
+                }else{
+
                 }
                 if(isset($res['data']['order_item'])){
                     unset($res['data']['order_item']);
@@ -1401,6 +1403,10 @@ public function durationPrice(HostModel $HostModel)
                     ]
                 ];
                 foreach ($res['data']['host'] as $item){
+                    if(isset($item['client_level_discount'])){
+                        unset($item['client_level_discount']);
+                    }
+
                     if ($this->upstreamProduct['profit_type']==1){
                         $item['profit'] = bcadd(0, $this->upstreamProduct['profit_percent'], 2);
                         $item['price'] = bcadd($item['price'], $item['profit'], 2);

10.3.6/app/common/logic/UpstreamLogic.php → 10.3.7/app/common/logic/UpstreamLogic.php

@@ -68,15 +68,21 @@ public function upstreamProductDetail($param)
     {
         $param['id'] = $param['id'] ?? 0;
 
+        $supplierId = $param['supplier_id']??0;
+
         if($param['type']=='whmcs'){
+            //$res = idcsmart_api_curl($supplierId,'modules/addons/idcsmart_reseller/logic/index.php?action=product_detail',['productid' => $param['id']],30,'POST');
             $res = $this->upstreamRequest(rtrim($param['url'],'/').'/modules/addons/idcsmart_reseller/logic/index.php?action=product_detail', ['productid' => $param['id']], 30, 'POST');
         }elseif ($param['type']=='finance'){
+            //$res = idcsmart_api_curl($supplierId,'api/product/'.$param['id'],[],30,'GET');
             $res = $this->upstreamRequest(rtrim($param['url'],'/').'/api/product/'.$param['id'], [], 30, 'GET');
             if ($res['status']==200){
+                //$res['data']['product']['price'] = $res['data']['product']['sale_price']??($res['data']['product']['price']??0);
                 $res['data']['product']['pay_type'] = ($res['data']['product']['pay_type']=='recurring')?'recurring_prepayment':$res['data']['product']['pay_type'];
             }
         }
         else{
+            //$res = idcsmart_api_curl($supplierId,'api/v1/product/'.$param['id'],[],30,'GET');
             $res = $this->upstreamRequest(rtrim($param['url'],'/').'/api/v1/product/'.$param['id'], [], 30, 'GET');
         }
 

10.3.6/app/common/model/UpstreamProductModel.php → 10.3.7/app/common/model/UpstreamProductModel.php

@@ -116,7 +116,7 @@ public function createProduct($param)
 
         // 从上游商品详情拉取
         $UpstreamLogic = new UpstreamLogic();
-        $res = $UpstreamLogic->upstreamProductDetail(['type' => $supplier['type'], 'url' => $supplier['url'], 'id' => $param['upstream_product_id']]);
+        $res = $UpstreamLogic->upstreamProductDetail(['type' => $supplier['type'], 'url' => $supplier['url'], 'id' => $param['upstream_product_id'],'supplier_id'=>$param['supplier_id']]);
         if(empty($res['data'])){
             return ['status'=>400,'msg'=>lang('upstream_product_is_not_exist')];
         }
@@ -208,7 +208,7 @@ public function updateProduct($param)
 
         // 从上游商品详情拉取
         $UpstreamLogic = new UpstreamLogic();
-        $res = $UpstreamLogic->upstreamProductDetail(['type' => $supplier['type'], 'url' => $supplier['url'], 'id' => $param['upstream_product_id']]);
+        $res = $UpstreamLogic->upstreamProductDetail(['type' => $supplier['type'], 'url' => $supplier['url'], 'id' => $param['upstream_product_id'],'supplier_id'=>$param['supplier_id']]);
         if(empty($res['data'])){
             return ['status'=>400,'msg'=>lang('upstream_product_is_not_exist')];
         }