Skip to content

M
my-yaf-project
Commit bef21b86 authored by liuyuzhen's avatar liuyuzhen
Browse files
Options

Merge branch 'ccw' of git.shenbd.com:qm-develop/shenbd into lyz

parents c2366225 6f67ba59
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 71 deletions
application/controllers/Index.php
View file @ bef21b86
......@@ -111,8 +111,18 @@ class IndexController extends \Our\Controller_Abstract {
$clientPush->pushTest(array());
exit;
}
public function testRelease(){
$obj=\Business\Order\OrderServiceModel::getInstance();
$obj->order='abc';
//\Business\Order\OrderServiceModel::realeaseInstance();
}
public function indexAction() {
$this->testRelease();
$obj=\Business\Order\OrderServiceModel::getInstance();
echo $obj->order;
exit;
$getKey=$_GET['key'];
if($getKey!='~!@#$`1234qwert'){
throw new Exception('非法',-1111);
......
application/models/Business/Order/OrderService.php
View file @ bef21b86
......@@ -38,7 +38,7 @@ class OrderServiceModel extends \Business\AbstractModel
private $orderMessageField = "order_id as orderId,order_sn as orderSn,store_name as storeName,add_time as addTime,store_id as storeId,goods_amount as goodsAmount,shipping_fee as shippingFee,order_amount as orderAmount,shipping_type as shippingType,payment_type as paymentType,order_state as orderState,shipping_fee as shippingFee,refund_state as refundState,order_type as orderType,is_receive_payment as isReceivePayment,buyer_id as buyerId,buyer_name as buyerName,accept_time as acceptTime";
private $order;
public $order;
//地址
private $address;
//收货人地址
......@@ -55,6 +55,7 @@ class OrderServiceModel extends \Business\AbstractModel
}
private function getGoodsDetailField()
{
return $this->orderGoodsField . ',goods_commonid as goodsCommonId,goods_commonid as goodsCommonid,goods_group as goodsGroup';
......@@ -583,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);
......@@ -1150,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();
......@@ -1175,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){
......@@ -1193,7 +1201,7 @@ class OrderServiceModel extends \Business\AbstractModel
if(empty($orderGoods)){
$orderGoods=$orderGoodses;
}
$this->updateDateGoodsStoregeByOrderGoods($orderGoods);
return $this->updateDateGoodsStoregeByOrderGoods($orderGoods);
}
......@@ -1789,7 +1797,11 @@ class OrderServiceModel extends \Business\AbstractModel
* @var \DAO\UserModel
*/
private static $_instance = null;
public static function realeaseInstance(){
if(!empty(self::$_instance)){
self::$_instance=null;
}
}
/**
* 单例模式获取类实例
*
......
application/models/Error/CodeConfig.php
View file @ bef21b86
......@@ -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.jpg deleted 100644 → 0
View file @ c2366225
This diff is collapsed.
public/test.php deleted 100644 → 0
View file @ c2366225
<?php
echo 1;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);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment