d

application/models/Business/Order/OrderService.php

@@ -584,7 +584,11 @@ class OrderServiceModel extends \Business\AbstractModel
             $res = $orderDao->updateStatusByOrderId($orderId, ApiConst::orderStateCancel,false,ApiConst::cancelOrderBySelf);
             $orderDao->setDb($orderDao->dbName);
             if ($res) {
-                $this->updateOrderGoodsStoregeByOrderIds(array($orderId));
+                $updateOrder=$this->updateOrderGoodsStoregeByOrderIds(array($orderId));
+                if(!$updateOrder){
+                    $orderDao->db->doRollback();
+                    ErrorModel::throwException(CodeConfigModel::updateGoodsStorageFail);
+                };
                 $order['refundOrderNo']=$refundReturnDao->getRefundsn($order['storeId']);
                 if($order['paymentTime']>ApiConst::zero && in_array($order['paymentType'],ArrayConst::orderPayTypeOnlines)){
                     $resultRefund=$refundReturnDao->refundMoney($order);
@@ -1151,6 +1155,7 @@ class OrderServiceModel extends \Business\AbstractModel
         }
         file_put_contents($this->baseDir . \Our\PathConst::orderCloseWaitRecieveOrder, $endTime);
     }
+    public $errorMessage;
     public function updateDateGoodsStoregeByOrderGoods($orderGoods,$type=ApiConst::plus,$updateSaleNumFlag=true){
         $orderConfirmUtilDao=OrderConfirmUtil::getInstance(DbNameConst::masterDBConnectName);
         $storeCartsList=array();
@@ -1176,7 +1181,9 @@ class OrderServiceModel extends \Business\AbstractModel
         }catch(\Exception $ex){
             $orderGoodsIds=array_column($orderGoods,'goodsId');
             $orderidsStr=implode(',',$orderGoodsIds);
-            echo '商品库存更新失败:'.$ex->getMessage().$ex->getCode().":".$orderidsStr;
+            $this->errorMessage='商品库存更新失败:'.$ex->getMessage().$ex->getCode().":".$orderidsStr;
+           // echo '商品库存更新失败:'.$ex->getMessage().$ex->getCode().":".$orderidsStr;
+            return false;
         }
     }
     public function updateOrderGoodsStoregeByOrderIds($orderIds,$orderGoodsId=false){
@@ -1194,7 +1201,7 @@ class OrderServiceModel extends \Business\AbstractModel
         if(empty($orderGoods)){
             $orderGoods=$orderGoodses;
         }
-        $this->updateDateGoodsStoregeByOrderGoods($orderGoods);
+       return $this->updateDateGoodsStoregeByOrderGoods($orderGoods);
 
     }
 

application/models/Error/CodeConfig.php

@@ -330,6 +330,7 @@ class CodeConfigModel
     const addOrderFrequently = 300147;
     const cancelRefundMoneyError = 300148;
     const serverBusy = 300149;
+const updateGoodsStorageFail=300150;
     //店铺相关错误码
 
     //商品分类
@@ -789,6 +790,7 @@ class CodeConfigModel
             self::updateMemberCouponFailed => '优惠券更新失败',
             self::updateAddressFailedForOrder => '下单时更新地址失败',
             self::updateGoodsStorageForOrder => '非线上支付订单更新库存失败',
+            self::updateGoodsStorageFail => '商品库存更新失败',
             self::saveOrderCommonFailed => '保存订单相关收货信息失败',
             self::saveOrderGoodsFailed => '保存订单商品失败',
             self::delCartFaileForAddOrder => '下单时删除购物车失败',

public/test.php

-<?php
-phpinfo();
-exit;
-echo json_encode($_SERVER);exit;
-$res=file_exists('/www/web/testadmin_shenbd_com/public_html/data/upload/mall/avatar/member_avatar_26.jpg');
-var_dump($res);
-exit;
-$www_file = '/home/wwwroot/mysite/';
-
-//打开网站目录下的hooks.log文件 需要在服务器上创建 并给写权限
-
-$fs = fopen($www_file . 'hooks.log', 'a');
-
-fwrite($fs, '================ Update Start ===============' . PHP_EOL . PHP_EOL);
-
-//自定义字串掩码 用于验证
-
-$access_token = 's7kjjhh8767laq29KLJK9089883hjjkgfdrrpipoinmw';
-
-//接受的ip数组,也就是允许哪些IP访问这个文件 这里是gitlab服务器IP
-$access_ip = array('8.8.8.8');
-
-//获取请求端的ip和token
-
-$client_token = $_GET['token'];
-$client_ip = $_SERVER['REMOTE_ADDR'];
-
-//把请求的IP和时间写进log
-
-fwrite($fs, 'Request on [' . date("Y-m-d H:i:s") . '] from [' . $client_ip . ']' . PHP_EOL);
-
-//验证token 有错就写进日志并退出
-if ($client_token !== $access_token) {
-    echo "error 403";
-    fwrite($fs, "Invalid token [{$client_token}]" . PHP_EOL);
-    exit(0);
-}
-
-//验证ip
-if (!in_array($client_ip, $access_ip)) {
-    echo "error 503";
-    fwrite($fs, "Invalid ip [{$client_ip}]" . PHP_EOL);
-    exit(0);
-}
-
-//获取请求端发送来的信息,具体格式参见gitlab的文档
-
-$json = file_get_contents('php://input');
-$data = json_decode($json, true);
-
-//如果有需要 可以打开下面,把传送过来的信息写进log
-//fwrite($fs, 'Data: '.print_r($data, true).PHP_EOL);
-
-//执行shell命令并把返回信息写进日志
-
-$output = shell_exec("cd $www_file &;&; git checkout master &;&; git pull origin master 2>&;1");
-fwrite($fs, 'Info:' . $output . PHP_EOL);
-
-fwrite($fs, PHP_EOL . '================ Update End ===============' . PHP_EOL . PHP_EOL);
-
-$fs and fclose($fs);
-
-
-
-//网站目录$www_file='/home/wwwroot/mysite/';//打开网站目录下的hooks.log文件 需要在服务器上创建 并给写权限$fs = fopen($www_file.'hooks.log', 'a');fwrite($fs, '================ Update Start ==============='.PHP_EOL.PHP_EOL);//自定义字串掩码 用于验证$access_token = 's7kjjhh8767laq29KLJK9089883hjjkgfdrrpipoinmw';//接受的ip数组,也就是允许哪些IP访问这个文件 这里是gitlab服务器IP$access_ip = array('8.8.8.8');//获取请求端的ip和token$client_token = $_GET['token'];$client_ip = $_SERVER['REMOTE_ADDR'];//把请求的IP和时间写进logfwrite($fs, 'Request on ['.date("Y-m-d H:i:s").'] from ['.$client_ip.']'.PHP_EOL);//验证token 有错就写进日志并退出if ($client_token !== $access_token){echo "error 403";fwrite($fs, "Invalid token [{$client_token}]".PHP_EOL);exit(0);}//验证ipif ( !in_array($client_ip, $access_ip)){echo "error 503";fwrite($fs, "Invalid ip [{$client_ip}]".PHP_EOL);exit(0);}//获取请求端发送来的信息,具体格式参见gitlab的文档$json = file_get_contents('php://input');$data = json_decode($json, true);//如果有需要 可以打开下面,把传送过来的信息写进log//fwrite($fs, 'Data: '.print_r($data, true).PHP_EOL);//执行shell命令并把返回信息写进日志$output=shell_exec("cd $www_file &;&; git checkout master &;&; git pull origin master 2>&;1");fwrite($fs, 'Info:'. $output.PHP_EOL);fwrite($fs,PHP_EOL. '================ Update End ==============='.PHP_EOL.PHP_EOL);$fs and fclose($fs);
-
-