yingzi 2 anni fa
parent
commit
5ee940780b

+ 1 - 1
Model/Market/MActivity.Class.php

@@ -692,7 +692,7 @@ class MActivity extends MBaseModel
         $skuMapping = [];
         $skuResult = $this->objMSku->getSpecNameBySkuId(array_column($data,'skuId'));
         if (!$skuResult->isSuccess()){
-            file_put_contents('/apps/logs/MActivity_error.log', date('Y-m-d H:i:s') . '错误信息|sql错误 :' . var_export($skuResult->getData()) . PHP_EOL, FILE_APPEND);
+            file_put_contents('/www/wwwroot/logs/api.liuniukj.com/MActivity_error.log', date('Y-m-d H:i:s') . '错误信息|sql错误 :' . var_export($skuResult->getData()) . PHP_EOL, FILE_APPEND);
         }else{
             $skuMapping = $skuResult->getData();
         }

+ 1 - 1
Model/Merchant/MMerchantSettlement.Class.php

@@ -109,7 +109,7 @@ class MMerchantSettlement
                 $this->objDMerchantSettlement->rollBack();
                 return ResultWrapper::fail($this->objDMerchantApply->error(), ErrorCode::$dberror);
             }
-            $afterMoney = $merchant['balance'];
+            $afterMoney = empty($merchant['balance'])?0:$merchant['balance'];
             foreach($orderData as $orderId => $value){
                 $afterMoney = bcadd($afterMoney, $value['goodsMoney'], 2);
                 //组装流水数据