修改

Model/Finance/MAccount.Class.php

@@ -199,7 +199,7 @@ class MAccount extends MBaseModel {
      *
      * @return ResultWrapper
      */
-    public function getAllAccount($selectParams)
+    public function getAllAccount($selectParams,$includeMaster = true)
     {
         $limit = $selectParams['limit'];
         unset($selectParams['limit']);
@@ -208,7 +208,8 @@ class MAccount extends MBaseModel {
 
         $whereSql = ' where  enterpriseId = '.$this->enterpriseId .' and deleteStatus = '.StatusCode::$standard;
         if (isset($selectParams['shopId']) && !empty($selectParams['shopId'])) {
-            $whereSql .= ' and shopId in ( ' . $selectParams['shopId'] .',0'.')';
+            $inMasterSql = $includeMaster ? ",0" : "";
+            $whereSql .= ' and shopId in ( ' . $selectParams['shopId'] .$inMasterSql.')';
         }
 
         $totalSql = 'SELECT COUNT(1) as count FROM ' .$this->objDAccount->get_Table() . $whereSql;

Model/Finance/MCustomerBalance.Class.php

@@ -77,6 +77,7 @@ class MCustomerBalance extends MBaseModel
             'updateTime'     => time()
         ];
         $detailId = $this->objDCustomerBalance->insert($balanceData);
+        
         if ($detailId === false) {
             return ResultWrapper::fail($this->objDCustomerBalance->error(), ErrorCode::$dberror);
         }
@@ -97,7 +98,6 @@ class MCustomerBalance extends MBaseModel
         if ($result->isSuccess() === false) {
             return ResultWrapper::fail($result->getData(), $result->getErrorCode());
         }
-
         return ResultWrapper::success($result->getData());
 
     }
@@ -225,6 +225,7 @@ class MCustomerBalance extends MBaseModel
     public function updateCustomerBalance($customerId, $changedMoney)
     {
         $dbResult = $this->objDCustomer->set_inc('money', $customerId, $changedMoney);
+        
         if ($dbResult === false) {
             return ResultWrapper::fail($this->objDCustomer->error(), ErrorCode::$dberror);
         }

Model/Finance/MCustomerBalanceDetail.Class.php

@@ -54,7 +54,7 @@ class MCustomerBalanceDetail extends MBaseModel
             $this->objDCustomerBalanceDetail->rollBack();
             return ResultWrapper::fail($this->objDCustomerBalanceDetail->error(), ErrorCode::$dberror);
         }
-
+        $params['no'] = empty($params['no'])?$params['sourceNo']:$params['no'];
         //添加索引表
         $indexData = [
             'detailId'    => $CustomerBalanceDetailId,

Model/Finance/MPaid.Class.php

@@ -199,7 +199,7 @@ class MPaid extends MBaseModel
         if (isset($result['_shards']) && isset($result['_shards']['successful']) && $result['_shards']['successful'] == 1) {
             //echo "es操作成功";die;
         }else {
-            file_put_contents('/apps/logs/elasticsearch.log',date('Y-m-d H:i:s').'生成付款单es错误，错误原因'.var_export($result,true).PHP_EOL,FILE_APPEND);
+            file_put_contents('/www/wwwroot/logs/api.liuniukj.com/elasticsearch.log',date('Y-m-d H:i:s').'生成付款单es错误，错误原因'.var_export($result,true).PHP_EOL,FILE_APPEND);
         }
         */
         return ResultWrapper::success($PaidId);

Model/Finance/MPay.Class.php

@@ -151,7 +151,7 @@ class MPay extends MBaseModel
 //        if (isset($result['_shards']) && isset($result['_shards']['successful']) && $result['_shards']['successful'] == 1) {
 //            //echo "es操作成功";die;
 //        }else {
-//            file_put_contents('/apps/logs/elasticsearch.log',date('Y-m-d H:i:s').'生成应付单es错误，错误原因'.var_export($result,true).PHP_EOL,FILE_APPEND);
+//            file_put_contents('/www/wwwroot/logs/api.liuniukj.com/elasticsearch.log',date('Y-m-d H:i:s').'生成应付单es错误，错误原因'.var_export($result,true).PHP_EOL,FILE_APPEND);
 //        }
 
         return ResultWrapper::success($payId);
@@ -566,7 +566,9 @@ class MPay extends MBaseModel
 
 
         }
-        return ResultWrapper::success($dbResult);
+        //报错修改
+        //return ResultWrapper::success($dbResult);
+        return ResultWrapper::success(null);
     }
 
 

Model/Finance/MReceive.Class.php

@@ -163,7 +163,7 @@ class MReceive extends MBaseModel
         if (isset($result['_shards']) && isset($result['_shards']['successful']) && $result['_shards']['successful'] == 1) {
             //echo "es操作成功";die;
         }else {
-            file_put_contents('/apps/logs/elasticsearch.log',date('Y-m-d H:i:s').'生成应收单es错误，错误原因'.var_export($result,true).PHP_EOL,FILE_APPEND);
+            file_put_contents('/www/wwwroot/logs/api.liuniukj.com/elasticsearch.log',date('Y-m-d H:i:s').'生成应收单es错误，错误原因'.var_export($result,true).PHP_EOL,FILE_APPEND);
         }*/
         return ResultWrapper::success($receiveReceiptId);
     }

Model/Finance/MReceived.Class.php

@@ -103,6 +103,7 @@ class MReceived extends MBaseModel
         $beginTransactionStatus = $this->objDReceived->beginTransaction();
 
         //先款后货查询收款单是否已生成
+        $params['originId'] = empty($params['originId']) ? 0 : $params['originId'];
         if($params['originId'] != 0){
             $dbResult = $this->objDReceived->get(['originId'=>$params['originId']]);
             if ($dbResult === false) {
@@ -238,7 +239,7 @@ class MReceived extends MBaseModel
         if (isset($result['_shards']) && isset($result['_shards']['successful']) && $result['_shards']['successful'] == 1) {
             //echo "es操作成功";die;
         }else {
-            file_put_contents('/apps/logs/elasticsearch.log',date('Y-m-d H:i:s').'生成收款单es错误，错误原因'.var_export($result,true).PHP_EOL,FILE_APPEND);
+            file_put_contents('/www/wwwroot/logs/api.liuniukj.com/elasticsearch.log',date('Y-m-d H:i:s').'生成收款单es错误，错误原因'.var_export($result,true).PHP_EOL,FILE_APPEND);
         }
         */
 
@@ -516,9 +517,17 @@ class MReceived extends MBaseModel
         // 切换收款单和收款单账户表
         $this->objDReceived->setTable('qianniao_received_' . $this->enterpriseId . '_' . date('Y', $params['createTime']) . '_' . ceil(date('m', $params['createTime']) / 3));
         $this->objDReceivedAccount->setTable('qianniao_received_account_' . $this->enterpriseId . '_' . date('Y', $params['createTime']) . '_' . ceil(date('m', $params['createTime']) / 3));
-
+        if(empty($params['id']) && empty($params['no'])){
+            return ResultWrapper::fail('ID和编号不能同时为空', ErrorCode::$paramError);
+        }
+        $getWhere=array();
+        if(empty($params['id'])){
+            $getWhere["no"] = $params['no'];
+        }else{
+            $getWhere["id"] = $params['id'];
+        }
         // 查询收款单数据
-        $receivedData = $this->objDReceived->get(['id' => $params['id']]);
+        $receivedData = $this->objDReceived->get($getWhere);
         if ($receivedData === false) {
             return ResultWrapper::fail($this->objDReceived->error(), ErrorCode::$dberror);
         }
@@ -528,6 +537,7 @@ class MReceived extends MBaseModel
         if($receivedData['auditStatus'] == StatusCode:: $auditStatus['auditPass']){
             return ResultWrapper::fail('当前收款单已经审核过了', ErrorCode::$notAllowAccess);
         }
+        $params['id'] = $receivedData['id'];
 
 
         $beginTransactionStatus = $this->objDReceived->beginTransaction();
@@ -589,6 +599,7 @@ class MReceived extends MBaseModel
 
         // 编辑客户往来余额
         $changedMoney = $receivedData['totalMoney'] > 0 ? -1 * $receivedData['totalFinalMoney'] : abs($receivedData['totalFinalMoney']);
+
         $result = $this->objMCustomerBalance->addCustomerBalance($receivedData['customerId'], $changedMoney);
         if (!$result->isSuccess()) {
             $this->objDReceived->rollBack();
@@ -852,7 +863,11 @@ class MReceived extends MBaseModel
             $orderTable = $objMOrder->getOrderTable($this->enterpriseId,$this->userCenterId);
             $objDOrder = new DOrder();
             $statusOrder =  $objDOrder->query('select * from '.$orderTable.' where id = '.$receivedData['originId']);
-            if( bcsub(bcsub($allReceivedMoney,$allReceiveMoney,2),$statusOrder[0]['payAmount'],2) >= 0 ){//已支付
+
+            //收银端收款有时候会没有订单
+            $xpayAmount = empty($statusOrder)?0:$statusOrder[0]['payAmount'];//订单实际需要支付金额
+            
+            if( bcsub(bcsub($allReceivedMoney,$allReceiveMoney,2),$xpayAmount,2) >= 0 ){//已支付
                 $orderPayStatus = [
                     'payStatus' => StatusCode::$standard,
                     'payTime' => time()
@@ -917,7 +932,8 @@ class MReceived extends MBaseModel
         $_id = self::createEsDocumentId($receivedData['id'], $receivedData['createTime']);
         $this->objDReceived->esupdateTypeFieldVaule(['auditStatus' => StatusCode::$auditStatus['auditPass']], $_id);
         */
-        return ResultWrapper::success($dbResult);
+//        return ResultWrapper::success($dbResult);
+        return ResultWrapper::success(null);
     }
 
     /**
@@ -953,6 +969,8 @@ class MReceived extends MBaseModel
         $surplusMoney = $money; // 剩余可核销金额
         $receivedOffsetMoney = 0; // 收款单累计核销金额
         $receivedNotOffsetMoney = $money; // 收款单未核销金额
+        
+        $updateDReceive = null;//报错修改
         foreach ($dbResultIndex as $key => $value){
             // 收款单钱核销完了，则不再进行核销
             if($surplusMoney <= 0){

Model/Finance/MRefund.Class.php

@@ -300,7 +300,7 @@ class MRefund
             $objMSystemPushMessage = new MSystemPushMessage($this->userCenterId,$this->enterpriseId);
             $result = $objMSystemPushMessage->sendWeiXinPushMessage(7,$customerData['openId'],$sendMessageData);
             if (!$result->isSuccess()) {
-                file_put_contents('/apps/logs/sendMessageError.log', date('Y-m-d H:i:s') . 'bb' . var_export($result->getData(), true) . PHP_EOL, FILE_APPEND);
+                file_put_contents('/www/wwwroot/logs/api.liuniukj.com/sendMessageError.log', date('Y-m-d H:i:s') . 'bb' . var_export($result->getData(), true) . PHP_EOL, FILE_APPEND);
             }
         }
         }