Skip to content

M
my-yaf-project
Commit 3288c695 authored by zhz's avatar zhz
Browse files
Options

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

parents 7152393c 7a75039d
Hide whitespace changes
Inline Side-by-side
Showing with 410 additions and 86 deletions
application/controllers/Cart.php
View file @ 3288c695
...@@ -116,13 +116,13 @@ class CartController extends \Our\Controller_AbstractApi{ ...@@ -116,13 +116,13 @@ class CartController extends \Our\Controller_AbstractApi{
//var_dump($storeCartData); //var_dump($storeCartData);
$storeCartData = $cartService->checkCouponForCart($storeCartData,$this->memberId); $storeCartData = $cartService->checkCouponForCart($storeCartData,$this->memberId);
//$this->success($storeCartData); //$this->success($storeCartData);
if(CURRENTVERSION==\Our\NameConst::versionOne){ if(CURRENTVERSION==\Our\NameConst::versionDefault){
$storeCartData = $cartService->getDeliveryTypeForCart($address,$storeCartData);
$data = $cartService->getFormatCartListForOrder($storeCartData,$address);
}else{
$storeCartData = $cartService->getDeliveryTypeForCartNew($address,$storeCartData,$this->memberId); $storeCartData = $cartService->getDeliveryTypeForCartNew($address,$storeCartData,$this->memberId);
//$this->success($storeCartData); //$this->success($storeCartData);
$data = $cartService->getFormatCartListForOrderNew($storeCartData,$address); $data = $cartService->getFormatCartListForOrderNew($storeCartData,$address);
}else{
$storeCartData = $cartService->getDeliveryTypeForCart($address,$storeCartData);
$data = $cartService->getFormatCartListForOrder($storeCartData,$address);
} }
$this->success($data); $this->success($data);
...@@ -144,12 +144,12 @@ class CartController extends \Our\Controller_AbstractApi{ ...@@ -144,12 +144,12 @@ class CartController extends \Our\Controller_AbstractApi{
$storeCartData = array('cartList'=>$cartList['list'],'storeIds'=>array_keys($cartList['list']),'goodsIds'=>$cartList['goodsIds'],'goodsCommonIds'=>$cartList['goodsCommonIds'],'blIds'=>$cartList['blIds'],'gcIds'=>$gcIds); $storeCartData = array('cartList'=>$cartList['list'],'storeIds'=>array_keys($cartList['list']),'goodsIds'=>$cartList['goodsIds'],'goodsCommonIds'=>$cartList['goodsCommonIds'],'blIds'=>$cartList['blIds'],'gcIds'=>$gcIds);
$storeCartData = $cartService->checkCouponForCart($storeCartData,$this->memberId); $storeCartData = $cartService->checkCouponForCart($storeCartData,$this->memberId);
//$this->success($storeCartData); //$this->success($storeCartData);
if(CURRENTVERSION==\Our\NameConst::versionOne){ if(CURRENTVERSION==\Our\NameConst::versionDefault){
$storeCartData = $cartService->getDeliveryTypeForCartNew($address,$storeCartData,$this->memberId);
$data = $cartService->getFormatCartListForOrderNew($storeCartData,$address);
}else{
$storeCartData = $cartService->getDeliveryTypeForCart($address,$storeCartData); $storeCartData = $cartService->getDeliveryTypeForCart($address,$storeCartData);
$data = $cartService->getFormatCartListForOrder($storeCartData,$address); $data = $cartService->getFormatCartListForOrder($storeCartData,$address);
}else{
$storeCartData = $cartService->getDeliveryTypeForCartNew($address,$storeCartData,$this->memberId);
$data = $cartService->getFormatCartListForOrderNew($storeCartData,$address);
} }
$this->success($data); $this->success($data);
} }
...@@ -164,4 +164,5 @@ class CartController extends \Our\Controller_AbstractApi{ ...@@ -164,4 +164,5 @@ class CartController extends \Our\Controller_AbstractApi{
$result = $cartService->addOrder($data,$this->memberId,$currentAddress); $result = $cartService->addOrder($data,$this->memberId,$currentAddress);
$this->success($result); $this->success($result);
} }
} }
application/controllers/Home.php
View file @ 3288c695
...@@ -192,4 +192,13 @@ class HomeController extends \Our\Controller_AbstractIndex{ ...@@ -192,4 +192,13 @@ class HomeController extends \Our\Controller_AbstractIndex{
$otherGoods = $goodsCommonService->getIndexHotSalesGoods($currentAddress); $otherGoods = $goodsCommonService->getIndexHotSalesGoods($currentAddress);
$this->success($otherGoods); $this->success($otherGoods);
} }
public function testMemberAction(){
$memberDao = \DAO\MemberModel::getInstance();
$memberList = $memberDao->getAll();
foreach($memberList as $member){
$memberDao->saveInfo(array('member_name'=>$member['member_name']),$member['member_id']);
}
}
} }
\ No newline at end of file
application/controllers/Index.php
View file @ 3288c695
...@@ -38,27 +38,30 @@ class IndexController extends \Our\Controller_Abstract { ...@@ -38,27 +38,30 @@ class IndexController extends \Our\Controller_Abstract {
$this->memberDb0Redis=\Redis\Db0\MemberRedisModel::getInstance(); $this->memberDb0Redis=\Redis\Db0\MemberRedisModel::getInstance();
$paramsStr= $this->memberDb0Redis->tablelpop($this->key); $paramsStr= $this->memberDb0Redis->tablelpop($this->key);
// $paramsStr='{ if($_GET['debug']==1){
// "desc": "最优质的产品，最实惠的价格，最好的服务质量，欢迎选购", $paramsStr='{
//"deviceWidth": "828", "desc": "最优质的产品，最实惠的价格，最好的服务质量，欢迎选购",
//"id": "1050000", "deviceWidth": "828",
//"imgUrl": "http://qmoss-01.oss-cn-hangzhou.aliyuncs.com/mall/store/05960231407828374.jpg?x-oss-process=image/resize,m_fill,h_186,w_186", "id": "1050000",
//"key": "bda203557fcc08150fc997360d432bfa", "imgUrl": "http://qmoss-01.oss-cn-hangzhou.aliyuncs.com/mall/store/05960231407828374.jpg?x-oss-process=image/resize,m_fill,h_186,w_186",
//"shareType": "1", "key": "bda203557fcc08150fc997360d432bfa",
//"storeName": "LQ日化用品", "shareType": "1",
//"timestamp": "1543913056", "storeName": "LQ日化用品",
//"type": "2", "timestamp": "1543913056",
//"driverType": 2, "type": "4",
//"qrCode": "http://share.shenbd.com/share.html?type=store&id=1050000", "driverType": 2,
//"address": "鑫雄盛快捷酒店仓山紫番林幼儿园", "qrCode": "https://img.shenbd.com/mall/salesman_qr/170.png",
//"storeWorkingtime": "", "address": "鑫雄盛快捷酒店仓山紫番林幼儿园",
//"buyerDistribution": 1, "storeWorkingtime": "",
//"sellerDistribution": 1, "buyerDistribution": 1,
//"startShippingPrice": 2000, "sellerDistribution": 1,
//"freeShippingPrice": 0, "startShippingPrice": 2000,
//"storeStartTime": "09:00", "freeShippingPrice": 0,
//"storeCloseTime": "23:00" "storeStartTime": "09:00",
//}'; "storeCloseTime": "23:00"
}';
}
$paramsStr=json_decode($paramsStr,true); $paramsStr=json_decode($paramsStr,true);
if($paramsStr['type']==\Our\ApiConst::shareStore || $paramsStr['type']==\Our\ApiConst::shareSaler){ if($paramsStr['type']==\Our\ApiConst::shareStore || $paramsStr['type']==\Our\ApiConst::shareSaler){
$begin=strtotime($paramsStr['storeStartTime']); $begin=strtotime($paramsStr['storeStartTime']);
......
application/library/Order/OrderConfirmUtil.php
View file @ 3288c695
...@@ -50,10 +50,10 @@ class OrderConfirmUtil { ...@@ -50,10 +50,10 @@ class OrderConfirmUtil {
public function addOrder($data,$memberId,$currentAddress){ public function addOrder($data,$memberId,$currentAddress){
$storeCartData = $this->checkPostData($data,$memberId,$currentAddress); $storeCartData = $this->checkPostData($data,$memberId,$currentAddress);
//return $storeCartData; //return $storeCartData;
if(CURRENTVERSION==\Our\NameConst::versionOne){ if(CURRENTVERSION==\Our\NameConst::versionDefault){
$storeCartData = $this->checkDeliveryTypeAndPaywayNew($storeCartData);
}else{
$storeCartData = $this->checkDeliveryTypeAndPayway($storeCartData); $storeCartData = $this->checkDeliveryTypeAndPayway($storeCartData);
}else{
$storeCartData = $this->checkDeliveryTypeAndPaywayNew($storeCartData);
} }
return $this->saveOrderInfo($storeCartData); return $this->saveOrderInfo($storeCartData);
} }
...@@ -79,10 +79,10 @@ class OrderConfirmUtil { ...@@ -79,10 +79,10 @@ class OrderConfirmUtil {
\Error\ErrorModel::throwException(\Error\CodeConfigModel::emptyParamForOrder); \Error\ErrorModel::throwException(\Error\CodeConfigModel::emptyParamForOrder);
} }
if(isset($this->postData['storeId'])&&$this->postData['storeId']){//组合销售或者单品的立即购买 if(isset($this->postData['storeId'])&&$this->postData['storeId']){//组合销售或者单品的立即购买
if(CURRENTVERSION==\Our\NameConst::versionOne){ if(CURRENTVERSION==\Our\NameConst::versionDefault){
$this->checkOneStoreDataNew($this->postData);
}else{
$this->checkOneStoreData($this->postData); $this->checkOneStoreData($this->postData);
}else{
$this->checkOneStoreDataNew($this->postData);
} }
if((isset($this->postData['blId'])&&$this->postData['blId']>\Our\ApiConst::zero)&&(isset($this->postData['goodsId'])&&$this->postData['goodsId']>\Our\ApiConst::zero)){ if((isset($this->postData['blId'])&&$this->postData['blId']>\Our\ApiConst::zero)&&(isset($this->postData['goodsId'])&&$this->postData['goodsId']>\Our\ApiConst::zero)){
\Error\ErrorModel::throwException(\Error\CodeConfigModel::wrongBlIdAndGoodsIdForOrder); \Error\ErrorModel::throwException(\Error\CodeConfigModel::wrongBlIdAndGoodsIdForOrder);
...@@ -101,10 +101,10 @@ class OrderConfirmUtil { ...@@ -101,10 +101,10 @@ class OrderConfirmUtil {
}else{ }else{
$this->cartCacheDeleteFlag = true; $this->cartCacheDeleteFlag = true;
foreach($this->postData as $temp){ foreach($this->postData as $temp){
if(CURRENTVERSION==\Our\NameConst::versionOne){ if(CURRENTVERSION==\Our\NameConst::versionDefault){
$this->checkOneStoreDataNew($temp);
}else{
$this->checkOneStoreData($temp); $this->checkOneStoreData($temp);
}else{
$this->checkOneStoreDataNew($temp);
} }
if(!$temp['cartIds']){ if(!$temp['cartIds']){
\Error\ErrorModel::throwException(\Error\CodeConfigModel::emptyCartIdsForOrder); \Error\ErrorModel::throwException(\Error\CodeConfigModel::emptyCartIdsForOrder);
...@@ -510,15 +510,15 @@ class OrderConfirmUtil { ...@@ -510,15 +510,15 @@ class OrderConfirmUtil {
$order['store_id'] = $storeId; $order['store_id'] = $storeId;
$order['store_name'] = $storeCarts['storeName']; $order['store_name'] = $storeCarts['storeName'];
$order['buyer_id'] = $this->memberId; $order['buyer_id'] = $this->memberId;
$order['buyer_name'] = $this->member['memberName']; $order['buyer_name'] = addslashes($this->member['memberName']);
if(CURRENTVERSION==\Our\NameConst::versionOne){ if(CURRENTVERSION==\Our\NameConst::versionDefault){
$order['buyer_email'] = $this->member['memberEmail'];
}else{
if($storeCarts['delivery']['deliveryType'] == \Our\ApiConst::deliveryBuyer){ if($storeCarts['delivery']['deliveryType'] == \Our\ApiConst::deliveryBuyer){
$order['buyer_email'] = $storeCarts['delivery']['buyerMobile']; $order['buyer_email'] = $storeCarts['delivery']['buyerMobile'];
}else{ }else{
$order['buyer_email'] = $this->address['mob_phone']; $order['buyer_email'] = $this->address['mob_phone'];
} }
}else{
$order['buyer_email'] = $this->member['memberEmail'];
} }
$order['add_time'] = TIMESTAMP; $order['add_time'] = TIMESTAMP;
$order['payment_type'] = $storeCarts['payway']; $order['payment_type'] = $storeCarts['payway'];
...@@ -568,7 +568,7 @@ class OrderConfirmUtil { ...@@ -568,7 +568,7 @@ class OrderConfirmUtil {
$orderLog['log_msg'] = \Our\DescribeConst::addOrderLog; $orderLog['log_msg'] = \Our\DescribeConst::addOrderLog;
$orderLog['log_time'] = TIMESTAMP; $orderLog['log_time'] = TIMESTAMP;
$orderLog['log_role'] = \Our\DescribeConst::buyer; $orderLog['log_role'] = \Our\DescribeConst::buyer;
$orderLog['log_user'] = $this->member['memberName']; $orderLog['log_user'] = addslashes($this->member['memberName']);
$orderLog['log_msg'] = $logMsg; $orderLog['log_msg'] = $logMsg;
$orderLog['log_orderstate'] = $order['order_state']; $orderLog['log_orderstate'] = $order['order_state'];
$orderLogList[] = $orderLog; $orderLogList[] = $orderLog;
...@@ -600,12 +600,12 @@ class OrderConfirmUtil { ...@@ -600,12 +600,12 @@ class OrderConfirmUtil {
if($storeCarts['delivery']['deliveryType'] == \Our\ApiConst::deliveryBuyer){ if($storeCarts['delivery']['deliveryType'] == \Our\ApiConst::deliveryBuyer){
list($buyerStoreInfo,$buyerName) = $this->getStoreInfoAndBuyerInfo($store,array('buyerMobile'=>$storeCarts['delivery']['buyerMobile'],'member_name'=>$this->member['memberName'])); list($buyerStoreInfo,$buyerName) = $this->getStoreInfoAndBuyerInfo($store,array('buyerMobile'=>$storeCarts['delivery']['buyerMobile'],'member_name'=>$this->member['memberName']));
$orderCommon['reciver_info'] = $buyerStoreInfo; $orderCommon['reciver_info'] = $buyerStoreInfo;
$orderCommon['reciver_name'] = $buyerName; $orderCommon['reciver_name'] = addslashes($buyerName);
}else{ }else{
$orderCommon['reciver_info'] = $reciverInfo; $orderCommon['reciver_info'] = $reciverInfo;
$orderCommon['reciver_name'] = $reciverName; $orderCommon['reciver_name'] = addslashes($reciverName);
} }
$orderCommon['reciver_city_id'] = $this->address['city_id']; $orderCommon['reciver_city_id'] = ($storeCarts['delivery']['deliveryType'] == \Our\ApiConst::deliveryBuyer)?\Our\ApiConst::zero:$this->address['city_id'];
$orderCommonList[] = $orderCommon; $orderCommonList[] = $orderCommon;
//$orderCommonDao->insert($orderCommon); //$orderCommonDao->insert($orderCommon);
foreach($storeCarts['storeCarts'] as $storeCart){ foreach($storeCarts['storeCarts'] as $storeCart){
...@@ -806,7 +806,9 @@ class OrderConfirmUtil { ...@@ -806,7 +806,9 @@ class OrderConfirmUtil {
$goodsIds = array(); $goodsIds = array();
$blIds = array(); $blIds = array();
$goodsNewList = array(); $goodsNewList = array();
$pbundlingInstance = \DAO\PBundlingModel::getInstance();
foreach($storeCartsList as $storeId=>$storeCarts){ foreach($storeCartsList as $storeId=>$storeCarts){
$blUpdateFlag = false;
foreach($storeCarts['storeCarts'] as $storeCart){ foreach($storeCarts['storeCarts'] as $storeCart){
if($storeCart['type']==\Our\ApiConst::addGoodsToCart){ if($storeCart['type']==\Our\ApiConst::addGoodsToCart){
if(isset($goodsCommonIds[$storeCart['goodsCommonId']]['goodsCommonId'])){ if(isset($goodsCommonIds[$storeCart['goodsCommonId']]['goodsCommonId'])){
...@@ -827,6 +829,7 @@ class OrderConfirmUtil { ...@@ -827,6 +829,7 @@ class OrderConfirmUtil {
$blIds[$storeCart['goodsId']]['blId'] = $storeCart['goodsId']; $blIds[$storeCart['goodsId']]['blId'] = $storeCart['goodsId'];
$blIds[$storeCart['goodsId']]['blStorage'] = $storeCart['goodsNum']; $blIds[$storeCart['goodsId']]['blStorage'] = $storeCart['goodsNum'];
$goodsList = $storeCart['goodsList']; $goodsList = $storeCart['goodsList'];
$blUpdateFlag = true;
foreach ($goodsList as $item) { foreach ($goodsList as $item) {
//$goodsCommonIds[] = $item['goodsCommonId']; //$goodsCommonIds[] = $item['goodsCommonId'];
//$goodsIds[$storeCart['goodsCommonId']][] = $item['goodsId']; //$goodsIds[$storeCart['goodsCommonId']][] = $item['goodsId'];
...@@ -844,12 +847,21 @@ class OrderConfirmUtil { ...@@ -844,12 +847,21 @@ class OrderConfirmUtil {
} }
$goodsNewList[$item['goodsId']] = $goodsIds[$item['goodsCommonId']][$item['goodsId']]; $goodsNewList[$item['goodsId']] = $goodsIds[$item['goodsCommonId']][$item['goodsId']];
} }
\Our\RedisHelper::delCachedFunction(\Redis\Db4\PBundlingRedisModel::getInstance(),array(&$pbundlingInstance, 'getList'),array(),array('*'.$storeCart['goodsId'].'*'));
} }
} }
if($updateSaleNumFlag){ if($updateSaleNumFlag){
$storeTopSaleGoodsDao = \DAO\Goods\StoreTopSaleGoodsModel::getInstance(); $storeTopSaleGoodsDao = \DAO\Goods\StoreTopSaleGoodsModel::getInstance();
$storeTopSaleGoodsDao->pushChangeSaleStore($storeId); $storeTopSaleGoodsDao->pushChangeSaleStore($storeId);
} }
//删除购物车缓存
$cartRedis = \Redis\Db7\CartRedisModel::getInstance();
$memberCartKey = \Our\NameConst::memberStoreCartsPrefix.'*_'.$storeId;
$cartRedis->tableDelAll($cartRedis->tableKeys($memberCartKey));
if($blUpdateFlag){
\Our\RedisHelper::delCachedFunction(\Redis\Db4\PBundlingRedisModel::getInstance(),array(&$pbundlingInstance, 'getList'),array(),array($storeId));
}
} }
$this->updateGoodsStorageToDBAndCache($goodsCommonIds,$goodsIds,$blIds,$goodsNewList,$op,$updateSaleNumFlag); $this->updateGoodsStorageToDBAndCache($goodsCommonIds,$goodsIds,$blIds,$goodsNewList,$op,$updateSaleNumFlag);
return true; return true;
......
application/library/Our/Controller/Abstract.php
View file @ 3288c695
<?php <?php
namespace Our; namespace Our;
use OSS\Common;
/** /**
* 控制器抽象类 * 控制器抽象类
......
application/library/Payment/Pay.php
View file @ 3288c695
...@@ -27,7 +27,7 @@ class Pay { ...@@ -27,7 +27,7 @@ class Pay {
$this->member = \DAO\MemberModel::getInstance()->getInfo($this->memberId); $this->member = \DAO\MemberModel::getInstance()->getInfo($this->memberId);
$return = array(); $return = array();
$wxFlag = false; $wxFlag = false;
if(CURRENTVERSION==\Our\NameConst::versionOne&&($data['channel']==\Our\NameConst::wxAppChannel||$data['channel']==\Our\NameConst::wxLiteChannel)){ if(CURRENTVERSION!=\Our\NameConst::versionDefault&&($data['channel']==\Our\NameConst::wxAppChannel||$data['channel']==\Our\NameConst::wxLiteChannel)){
$wxFlag = true; $wxFlag = true;
} }
$orderInfo = $this->getOrder($wxFlag); $orderInfo = $this->getOrder($wxFlag);
......
application/models/Business/Goods/GoodsCommonService.php
View file @ 3288c695
...@@ -28,6 +28,8 @@ class GoodsCommonServiceModel extends \Business\AbstractModel ...@@ -28,6 +28,8 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
*/ */
public function setGoodsStorage($storeId, $goodsId, $num = 0, $type='add') { public function setGoodsStorage($storeId, $goodsId, $num = 0, $type='add') {
$orderService=\Business\Order\OrderServiceModel::getInstance(); $orderService=\Business\Order\OrderServiceModel::getInstance();
$goodsDao=\DAO\GoodsModel::getInstance(DbNameConst::masterDBConnectName);
$commonDao = \DAO\GoodsCommonModel::getInstance();
if($goodsId === 0){ if($goodsId === 0){
\Error\ErrorModel::throwException(\Error\CodeConfigModel::commonError); \Error\ErrorModel::throwException(\Error\CodeConfigModel::commonError);
} }
...@@ -36,6 +38,21 @@ class GoodsCommonServiceModel extends \Business\AbstractModel ...@@ -36,6 +38,21 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
}else{ }else{
$type=ApiConst::set; $type=ApiConst::set;
$where = array();
$where['store_id'] = $storeId;
$where['goods_id'] = $goodsId;
$data = $goodsDao->find($where, 'goods_id, goods_commonid');
$goodsDao->setDb($goodsDao->dbName);
$goodsDao->db->doTransaction();
$ret1 = $goodsDao->updateStorage($goodsId, $num, ApiConst::zero);
$ret2 = $commonDao->updateStorage($data['goods_commonid'],ApiConst::zero);
if(!$ret1 || !$ret2) {
$goodsDao->db->doRollback();
\Error\ErrorModel::throwException(\Error\CodeConfigModel::updateGoodsStorageForOrder);
}
$goodsDao->db->doCommit();
return true;
} }
$res=$orderService->updateGoodsStoregeByGoodsIds($storeId,$goodsId,$num,$type); $res=$orderService->updateGoodsStoregeByGoodsIds($storeId,$goodsId,$num,$type);
return $res; return $res;
...@@ -1346,6 +1363,7 @@ class GoodsCommonServiceModel extends \Business\AbstractModel ...@@ -1346,6 +1363,7 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
break; break;
} }
} }
return true;
} }
/** /**
...@@ -1373,6 +1391,7 @@ class GoodsCommonServiceModel extends \Business\AbstractModel ...@@ -1373,6 +1391,7 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
$where['store_id'] = $goodsClass['store_id']; $where['store_id'] = $goodsClass['store_id'];
$where['goods_state'] = \Our\ApiConst::onlineGoodsState; $where['goods_state'] = \Our\ApiConst::onlineGoodsState;
$where['goods_verify'] = \Our\ApiConst::onlineGoodsVerify; $where['goods_verify'] = \Our\ApiConst::onlineGoodsVerify;
$where['is_del'] = \Our\ApiConst::zero;
if($gcFrom==\Our\ApiConst::one){ if($gcFrom==\Our\ApiConst::one){
$where['goods_class_t_id'] = $goodsClass['gc_id_3']; $where['goods_class_t_id'] = $goodsClass['gc_id_3'];
} }
...@@ -1477,4 +1496,9 @@ class GoodsCommonServiceModel extends \Business\AbstractModel ...@@ -1477,4 +1496,9 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
} }
public function syncGoodsCommonStorageByGoods(){
$goodsCommonDao = \DAO\GoodsCommonModel::getInstance();
$return = $goodsCommonDao->syncGoodsCommonStorageByGoods();
}
} }
application/models/Business/Order/OrderService.php
View file @ 3288c695
...@@ -27,7 +27,7 @@ use Our\RedisHelper; ...@@ -27,7 +27,7 @@ use Our\RedisHelper;
class OrderServiceModel extends \Business\AbstractModel class OrderServiceModel extends \Business\AbstractModel
{ {
private $orderField = "order_id as orderId,order_sn as orderSn,store_name as storeName,evaluation_state as evaluationState,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,payment_time as paymentTime,order_state as orderState,shipping_fee as shippingFee,refund_state as refundState,order_type as orderType,is_receive_payment as isReceivePayment,gmt_update as gmtUpdate"; private $orderField = "order_id as orderId,order_sn as orderSn,store_name as storeName,evaluation_state as evaluationState,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,payment_time as paymentTime,order_state as orderState,shipping_fee as shippingFee,refund_state as refundState,order_type as orderType,is_receive_payment as isReceivePayment,gmt_update as gmtUpdate";
private $orderGoodsField = "order_id as orderId,rec_id as recId,goods_id as goodsId,goods_name as goodsName,goods_price as goodsPrice,goods_num as goodsNum,goods_image as goodsImage,goods_pay_price as goodsPayPrice,sale_act_id as saleActId,sale_id as saleId,comment_state as commentState,is_refund as isRefund,goods_spec as goodsSpec,refund_state_name as refundStateName,refund_id as refundId"; private $orderGoodsField = "order_id as orderId,rec_id as recId,store_id as storeId,goods_id as goodsId,goods_name as goodsName,goods_price as goodsPrice,goods_num as goodsNum,goods_image as goodsImage,goods_pay_price as goodsPayPrice,sale_act_id as saleActId,sale_id as saleId,comment_state as commentState,is_refund as isRefund,goods_spec as goodsSpec,refund_state_name as refundStateName,refund_id as refundId";
private $addressField = " mob_phone as MobPhone,tel_phone as TelPhone,address as address,area_info as areaInfo,lng,lat,address_id as addressId,subaddress as subAddress"; private $addressField = " mob_phone as MobPhone,tel_phone as TelPhone,address as address,area_info as areaInfo,lng,lat,address_id as addressId,subaddress as subAddress";
...@@ -291,12 +291,15 @@ class OrderServiceModel extends \Business\AbstractModel ...@@ -291,12 +291,15 @@ class OrderServiceModel extends \Business\AbstractModel
$returnData['diliverymanId'] = ApiConst::zero; $returnData['diliverymanId'] = ApiConst::zero;
$returnData['deliveryman'] = new \stdClass(); $returnData['deliveryman'] = new \stdClass();
} }
if(!in_array($this->order['paymentType'],ArrayConst::payTypeOnlines)){
$returnData['offlinePayway']=$storeDao->convertOfflinePayway($this->store['offlinePayway']); if(CURRENTVERSION!=NameConst::versionDefault){
if(!in_array($this->order['paymentType'],ArrayConst::payTypeOnlines)){
$returnData['offlinePayway']=$storeDao->convertOfflinePayway($this->store['offlinePayway']);
}else{
$returnData['offlinePayway']=new \stdClass();
}
}else{ }else{
$returnData['offlinePayway']=new \stdClass();
}
if(CURRENTVERSION!=NameConst::versionOne){
$returnData['offlinePayway']=''; $returnData['offlinePayway']='';
} }
...@@ -780,16 +783,20 @@ class OrderServiceModel extends \Business\AbstractModel ...@@ -780,16 +783,20 @@ class OrderServiceModel extends \Business\AbstractModel
$orderConfirmUtilDao=OrderConfirmUtil::getInstance(DbNameConst::masterDBConnectName); $orderConfirmUtilDao=OrderConfirmUtil::getInstance(DbNameConst::masterDBConnectName);
$storeCartsList=array(); $storeCartsList=array();
$storeCarts=array(); $storeCarts=array();
$convertGoods=array();
$storeCartses=array();
$storeCarts['storeCarts']=array(); $storeCarts['storeCarts']=array();
foreach($orderGoods as $orderGood){ foreach($orderGoods as $orderGood){
$orderGood['type']=!empty($orderGood['goodsGroup'])? \Our\ApiConst::addBundingToCart:\Our\ApiConst::addGoodsToCart; $orderGood['type']=!empty($orderGood['goodsGroup'])? \Our\ApiConst::addBundingToCart:\Our\ApiConst::addGoodsToCart;
$orderGood['goodsNum']=$orderGood['goodsNum']; $orderGood['goodsNum']=$orderGood['goodsNum'];
$orderGood['goodsList']=\Our\Common::isSerialized($orderGood['goodsGroup'])?unserialize($orderGood['goodsGroup']):array(); $orderGood['goodsList']=\Our\Common::isSerialized($orderGood['goodsGroup'])?unserialize($orderGood['goodsGroup']):array();
array_push($storeCarts['storeCarts'],$orderGood); array_push($storeCarts['storeCarts'],$orderGood);
$storeCartses[$orderGood['storeId']]=$storeCarts;
} }
if(!empty($storeCarts['storeCarts'])){ // if(!empty($storeCartses)){
array_push($storeCartsList,$storeCarts); // array_push($storeCartsList,$storeCartses);
} // }
$storeCartsList=$storeCartses;
// $orderDao->updateNotRecieveOrders(ApiConst::orderStateWaitConfirm, ApiConst::orderStateClose, 'add_time', ApiConst::orderStateWaitConfirmBeyond, $this->orderMessageField); // $orderDao->updateNotRecieveOrders(ApiConst::orderStateWaitConfirm, ApiConst::orderStateClose, 'add_time', ApiConst::orderStateWaitConfirmBeyond, $this->orderMessageField);
try{ try{
$orderConfirmUtilDao->updateGoodsStorage($storeCartsList,$type,$updateSaleNumFlag); $orderConfirmUtilDao->updateGoodsStorage($storeCartsList,$type,$updateSaleNumFlag);
...@@ -802,7 +809,6 @@ class OrderServiceModel extends \Business\AbstractModel ...@@ -802,7 +809,6 @@ class OrderServiceModel extends \Business\AbstractModel
} }
public function updateOrderGoodsStoregeByOrderIds($orderIds,$orderGoodsId=false){ public function updateOrderGoodsStoregeByOrderIds($orderIds,$orderGoodsId=false){
$orderGoodsDao = \DAO\Order\OrderGoodsModel::getInstance(DbNameConst::masterDBConnectName); $orderGoodsDao = \DAO\Order\OrderGoodsModel::getInstance(DbNameConst::masterDBConnectName);
//更新商品库存 //更新商品库存
$orderGoodses = $orderGoodsDao->getOrderGoodsByOrderIds($orderIds, $this->getGoodsDetailField()); $orderGoodses = $orderGoodsDao->getOrderGoodsByOrderIds($orderIds, $this->getGoodsDetailField());
$orderGoods=array(); $orderGoods=array();
......
application/models/Business/Order/RefundService.php
View file @ 3288c695
...@@ -187,7 +187,7 @@ class RefundServiceModel extends \Business\AbstractModel ...@@ -187,7 +187,7 @@ class RefundServiceModel extends \Business\AbstractModel
$orderDao->deleteOrderCache($refund['buyer_id'], $refund['order_id'], $refund['store_id']); $orderDao->deleteOrderCache($refund['buyer_id'], $refund['order_id'], $refund['store_id']);
$storeDAO->deleteStoreRefundCache($refund['store_id'],$refund['order_id']); $storeDAO->deleteStoreRefundCache($refund['store_id'],$refund['order_id']);
$orderService=\Business\Order\OrderServiceModel::getInstance(); $orderService=\Business\Order\OrderServiceModel::getInstance();
$orderService->updateOrderGoodsStoregeByOrderIds($refund['order_id'],$refund['goods_id']); $orderService->updateOrderGoodsStoregeByOrderIds($refund['order_id'],$refund['order_goods_id']);
$refundReturnDao->db->doCommit(); $refundReturnDao->db->doCommit();
$push=\Our\Push::getInstance(); $push=\Our\Push::getInstance();
$pushData=array('storeId'=>$storeId, $pushData=array('storeId'=>$storeId,
......
application/models/Business/Store/ShopkeeperService.php
View file @ 3288c695
...@@ -649,8 +649,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel ...@@ -649,8 +649,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
} }
return $results; return $results;
} }
//任务脚本原来的方法是下面那个
//任务脚本原来的方法是下面那个
public function insertStoreMemberStatics() public function insertStoreMemberStatics()
{ {
$orderGoodDao = \DAO\Order\OrderGoodsModel::getInstance(DbNameConst::salveDBConnectName); $orderGoodDao = \DAO\Order\OrderGoodsModel::getInstance(DbNameConst::salveDBConnectName);
...@@ -696,6 +695,52 @@ class ShopkeeperServiceModel extends \Business\AbstractModel ...@@ -696,6 +695,52 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
file_put_contents($this->baseDir . PathConst::orderGoodsCreateTime, TIMESTAMP); file_put_contents($this->baseDir . PathConst::orderGoodsCreateTime, TIMESTAMP);
} }
//任务脚本原来的方法是下面那个
// public function insertStoreMemberStatics()
// {
// $orderGoodDao = \DAO\Order\OrderGoodsModel::getInstance(DbNameConst::salveDBConnectName);
// $orderDao = \DAO\Order\OrderModel::getInstance();
// $storeMemberStatisticDao = \DAO\StoreMemberStatisticsModel::getInstance(DbNameConst::masterDBConnectName);
// $reufndReturnDao = \DAO\Order\RefundReturnModel::getInstance(DbNameConst::masterDBConnectName);
// $gmtCreate = file_get_contents($this->baseDir . PathConst::orderGoodsCreateTime);
// $gmtCreate = $gmtCreate ? $gmtCreate : ApiConst::zero;
// $beginTime = $gmtCreate;
// $this->taskIndex = PageConst::taskPageBegin;
// $this->taskSize = PageConst::taskPageSize;
// do {
// $storeMemberStatisticData = $orderGoodDao->getMemberStoreStaticsByCreateTime($beginTime, $this->taskIndex, $this->taskSize);
// $storeMemberStatisticData = isset($storeMemberStatisticData['list']) ? $storeMemberStatisticData['list'] : false;
// if ($storeMemberStatisticData) {
// $this->taskIndex++;
// $storeId = array_column($storeMemberStatisticData, 'storeId');
// $memberId = array_column($storeMemberStatisticData, 'buyerId');
// $storeIds = array_unique($storeId);
// $memberIds = array_unique($memberId);
// $goodsNumCount = $orderGoodDao->getMemberStoreOrderGoodsCount($storeIds, $memberIds);
// $ordersCount = $orderDao->getSumAmountCountByMemberAndStoreId($storeIds, $memberIds);
// $refundLists = $reufndReturnDao->getRefundSuccessMoneyByStoreIdAndMemberId($storeIds, $memberIds);
// if (!empty($ordersCount) && !empty($refundLists)) {
// foreach ($ordersCount as &$order) {
// foreach ($refundLists as $refund) {
// if ($order['buyerId'] == $refund['buyerId'] && $order['storeId'] == $refund['storeId']) {
// $order['orderTotal'] = $order['orderTotal'] - $refund['refundTotal'];
// }
// }
// }
// }
// if (!empty($goodsNumCount)) {
// $storeMemberStatisticDao->addAll($goodsNumCount, 'orderGoodsCount');
// }
// if (!empty($ordersCount)) {
// $storeMemberStatisticDao->addAll($ordersCount, 'orderTotal');
// }
// }
//
//
// } while ($storeMemberStatisticData);
// file_put_contents($this->baseDir . PathConst::orderGoodsCreateTime, TIMESTAMP);
//
// }
//任务脚本 //任务脚本
// public function insertStoreMemberStatics() // public function insertStoreMemberStatics()
// { // {
......
application/models/Business/Store/StoreService.php
View file @ 3288c695
...@@ -1156,6 +1156,7 @@ class StoreServiceModel extends \Business\AbstractModel{ ...@@ -1156,6 +1156,7 @@ class StoreServiceModel extends \Business\AbstractModel{
$storeDao = \DAO\StoreModel::getInstance(); $storeDao = \DAO\StoreModel::getInstance();
$storeDao->delNearbyStoresCache($cityCode); $storeDao->delNearbyStoresCache($cityCode);
$storeDao->delStoresCacheByCityCode($cityCode); $storeDao->delStoresCacheByCityCode($cityCode);
return true;
} }
public function editQmStoreClass(){ public function editQmStoreClass(){
...@@ -1207,6 +1208,11 @@ class StoreServiceModel extends \Business\AbstractModel{ ...@@ -1207,6 +1208,11 @@ class StoreServiceModel extends \Business\AbstractModel{
} }
} }
} }
public function updateStoreTotalDeposit(){
\DAO\StoreModel::getInstance()->updateStoreDeposit();
}
/** /**
*/ */
private static $_instance = null; private static $_instance = null;
......
application/models/Business/User/ShareService.php
View file @ 3288c695
...@@ -58,16 +58,14 @@ class ShareServiceModel extends \Business\AbstractModel ...@@ -58,16 +58,14 @@ class ShareServiceModel extends \Business\AbstractModel
$storeDao=\DAO\StoreModel::getInstance(DbNameConst::salveDBConnectName); $storeDao=\DAO\StoreModel::getInstance(DbNameConst::salveDBConnectName);
$store=$storeDao->getStoreInfoCache($data['id']); $store=$storeDao->getStoreInfoCache($data['id']);
$data['address']=$store['store_address']; $data['address']=$store['store_address'];
$data['imgUrl']=$storeDao->getStoreLabelSrc($store['store_label']); $data['imgUrl']=$storeDao->getStoreBanner($store['store_index_banner']);
$data['storeName']=$store['store_name']; $data['storeName']=$store['store_name'];
$data['desc']=$store['store_notice']; $data['desc']=$store['store_notice'];
$data['storeWorkingtime']=$store['store_workingtime']; $data['storeWorkingtime']=$store['store_workingtime'];
$data['buyerDistribution']=$store['buyer_distribution']; $data['buyerDistribution']=$store['buyer_distribution'];
$data['sellerDistribution']=$store['seller_distribution']; $data['sellerDistribution']=$store['seller_distribution'];
$data['startShippingPrice']=$store['start_shipping_price']; $data['startShippingPrice']=$store['start_shipping_price'];
$data['freeShippingPrice']=$store['free_shipping_price']; $data['freeShippingPrice']=$store['free_shipping_price'];
$data['storeStartTime']=$store['store_start_time']; $data['storeStartTime']=$store['store_start_time'];
$data['storeCloseTime']=$store['store_close_time']; $data['storeCloseTime']=$store['store_close_time'];
} }
......
application/models/DAO/GoodsClass/StoreOnlineGoodsClass.php 100755 → 100644
View file @ 3288c695
...@@ -130,7 +130,9 @@ class StoreOnlineGoodsClassModel extends \DAO\AbstractModel{ ...@@ -130,7 +130,9 @@ class StoreOnlineGoodsClassModel extends \DAO\AbstractModel{
$goodsClass['gc_id_3'] = $goodsCommon['gc_id_3']; $goodsClass['gc_id_3'] = $goodsCommon['gc_id_3'];
$goodsClass['store_id'] = $goodsCommon['store_id']; $goodsClass['store_id'] = $goodsCommon['store_id'];
$goodsClass['gc_from'] = \Our\ApiConst::zero; $goodsClass['gc_from'] = \Our\ApiConst::zero;
$this->addChangedGoodsClass(serialize($goodsClass),$type); if($goodsClass['gc_id_3']){
$this->addChangedGoodsClass(serialize($goodsClass),$type);
}
if($goodsCommon['goods_class_t_id']){ if($goodsCommon['goods_class_t_id']){
$goodsClass['gc_id_3'] = $goodsCommon['goods_class_t_id']; $goodsClass['gc_id_3'] = $goodsCommon['goods_class_t_id'];
$goodsClass['gc_from'] = \Our\ApiConst::one; $goodsClass['gc_from'] = \Our\ApiConst::one;
......
application/models/DAO/GoodsCommon.php
View file @ 3288c695
...@@ -124,6 +124,13 @@ class GoodsCommonModel extends \DAO\AbstractModel { ...@@ -124,6 +124,13 @@ class GoodsCommonModel extends \DAO\AbstractModel {
eval($str); eval($str);
return $data; return $data;
} }
public function syncGoodsCommonStorageByGoods(){
$this->setDb(\Our\DbNameConst::masterDBConnectName);
$sql =" update han_goods_common t set t.goods_storage = (select sum(a.goods_storage) from han_goods a where a.goods_commonid = t.goods_commonid)";
return $this->db->update($this->_tableName)->query($sql);
}
/** /**
* 商品列表(需要获取销售价格) * 商品列表(需要获取销售价格)
* @param $where * @param $where
......
application/models/DAO/Member.php
View file @ 3288c695
...@@ -116,6 +116,9 @@ class MemberModel extends \DAO\AbstractModel ...@@ -116,6 +116,9 @@ class MemberModel extends \DAO\AbstractModel
public function saveInfo($data, $memberId) public function saveInfo($data, $memberId)
{ {
$this->setDb(\Our\DbNameConst::masterDBConnectName); $this->setDb(\Our\DbNameConst::masterDBConnectName);
if($data['member_name']){
$data['member_name'] = base64_encode($data['member_name']);
}
$result = $this->db->update($this->_tableName)->rows($data)->where(array('member_id' => $memberId))->execute(); $result = $this->db->update($this->_tableName)->rows($data)->where(array('member_id' => $memberId))->execute();
if ($result!==false) { if ($result!==false) {
$memberDb0Redis = \Redis\Db0\MemberRedisModel::getInstance(); $memberDb0Redis = \Redis\Db0\MemberRedisModel::getInstance();
...@@ -156,13 +159,14 @@ class MemberModel extends \DAO\AbstractModel ...@@ -156,13 +159,14 @@ class MemberModel extends \DAO\AbstractModel
*/ */
public function addInfo($data) public function addInfo($data)
{ {
// $this->setDb(\Our\DbNameConst::masterDBConnectName); //$this->setDb(\Our\DbNameConst::masterDBConnectName);
// $result = $this->db->insert($this->_tableName)->rows($data)->execute(); //$result = $this->db->insert($this->_tableName)->rows($data)->execute();
$cityCode = \Area\AreaUtil::getInstance()->getIpCityInfo(); /*$cityCode = \Area\AreaUtil::getInstance()->getIpCityInfo();
if(is_array($cityCode)){ if(is_array($cityCode)){
$data = array_merge($data,$cityCode); $data = array_merge($data,$cityCode);
} }*/
$data['register_ip']= \Our\Common::getIP();
$result=$this->add($data); $result=$this->add($data);
if ($result) { if ($result) {
$memberDb0Redis = \Redis\Db0\MemberRedisModel::getInstance(); $memberDb0Redis = \Redis\Db0\MemberRedisModel::getInstance();
......
application/models/DAO/Order/Order.php
View file @ 3288c695
...@@ -419,7 +419,12 @@ class OrderModel extends \DAO\AbstractModel ...@@ -419,7 +419,12 @@ class OrderModel extends \DAO\AbstractModel
return []; return [];
} }
} }
public function getMemberStoreStaticsByCreateTime($gmtCreate,$pageIndex,$pageSize){
$this->setDb($this->dbName);
$where =\Our\Common::format(' gmt_update>={0} and gmt_update<{1} and order_state={2}',$gmtCreate,TIMESTAMP,ApiConst::orderStateWaitRecieve);
$res=$this->lists($where,array('gmt_update'=>'asc'),$this->sumField,$pageIndex,$pageSize);
return $res['list']?$res:false;
}
public function getSumAmountCountByMemberAndStoreId($storeIds,$memberIds) public function getSumAmountCountByMemberAndStoreId($storeIds,$memberIds)
{ {
$this->setDb($this->dbName); $this->setDb($this->dbName);
......
application/models/DAO/Order/RefundReturn.php
View file @ 3288c695
...@@ -288,7 +288,7 @@ class RefundReturnModel extends \DAO\AbstractModel ...@@ -288,7 +288,7 @@ class RefundReturnModel extends \DAO\AbstractModel
public function isPlatformIn($refundInfo) public function isPlatformIn($refundInfo)
{ {
if (($refundInfo['isPlatformIn'] == ApiConst::platNotIn && ($refundInfo['sellerState'] == ApiConst::refundSellerRefuse) || $refundInfo['buyerRefundAmount'] > $refundInfo['refundAmount'])) { if (($refundInfo['isPlatformIn'] == ApiConst::platNotIn && (($refundInfo['sellerState'] == ApiConst::refundSellerRefuse) || $refundInfo['buyerRefundAmount'] > $refundInfo['refundAmount']))) {
return TRUE; return TRUE;
} else { } else {
return FALSE; return FALSE;
...@@ -389,7 +389,7 @@ class RefundReturnModel extends \DAO\AbstractModel ...@@ -389,7 +389,7 @@ class RefundReturnModel extends \DAO\AbstractModel
$param['refundFee'] = $orderInfo['refund_amount'];//退款金额 $param['refundFee'] = $orderInfo['refund_amount'];//退款金额
$param['storeId'] = $orderInfo['store_id']; $param['storeId'] = $orderInfo['store_id'];
$param['buyerId'] = $orderInfo['buyer_id']; $param['buyerId'] = $orderInfo['buyer_id'];
if (CURRENTVERSION == \Our\NameConst::versionOne && in_array(intval($orderInfo['payment_type']), array(ApiConst::wxAppPayType, ApiConst::wxProgram))) { if (CURRENTVERSION != \Our\NameConst::versionDefault && in_array(intval($orderInfo['payment_type']), array(ApiConst::wxAppPayType, ApiConst::wxProgram))) {
$mchIdArray = \DAO\StoreModel::getInstance()->getStoreWxMchId($param['storeId']); $mchIdArray = \DAO\StoreModel::getInstance()->getStoreWxMchId($param['storeId']);
if ($mchIdArray['errorCode'] > 0) { if ($mchIdArray['errorCode'] > 0) {
$this->errorMessage = '微信支付商户错误或者签名错误'; $this->errorMessage = '微信支付商户错误或者签名错误';
...@@ -444,7 +444,7 @@ class RefundReturnModel extends \DAO\AbstractModel ...@@ -444,7 +444,7 @@ class RefundReturnModel extends \DAO\AbstractModel
$param['refundFee'] = $orderInfo['orderAmount'];//全额退款 $param['refundFee'] = $orderInfo['orderAmount'];//全额退款
$param['storeId'] = $orderInfo['storeId']; $param['storeId'] = $orderInfo['storeId'];
$param['buyerId'] = $orderInfo['buyerId']; $param['buyerId'] = $orderInfo['buyerId'];
if (CURRENTVERSION == \Our\NameConst::versionOne && in_array(intval($orderInfo['paymentType']), array(\Our\ApiConst::wxAppPayType, \Our\ApiConst::wxProgram))) { if (CURRENTVERSION != \Our\NameConst::versionDefault && in_array(intval($orderInfo['paymentType']), array(\Our\ApiConst::wxAppPayType, \Our\ApiConst::wxProgram))) {
$mchIdArray = \DAO\StoreModel::getInstance()->getStoreWxMchId($param['storeId']); $mchIdArray = \DAO\StoreModel::getInstance()->getStoreWxMchId($param['storeId']);
if ($mchIdArray['errorCode'] > 0) { if ($mchIdArray['errorCode'] > 0) {
$this->errorMessage = '微信支付商户错误或者签名错误'; $this->errorMessage = '微信支付商户错误或者签名错误';
......
application/models/DAO/PBundling.php
View file @ 3288c695
...@@ -173,6 +173,18 @@ class PBundlingModel extends \DAO\AbstractModel { ...@@ -173,6 +173,18 @@ class PBundlingModel extends \DAO\AbstractModel {
$pBundlingDao->tableDelAll($pBundlingDao->tableKeys('*'.\Our\NameConst::blGoods.$goodsCommonId)); $pBundlingDao->tableDelAll($pBundlingDao->tableKeys('*'.\Our\NameConst::blGoods.$goodsCommonId));
} }
public function delPBundlingListByStoreIdAndBlIds($storeId=false,$blId=false){
if($blId){
\Our\RedisHelper::delCachedFunction(\Redis\Db4\PBundlingRedisModel::getInstance(),array(&$this, 'getList'),array(),array('*'.$blId.'*'));
}
if($storeId){
\Our\RedisHelper::delCachedFunction(\Redis\Db4\PBundlingRedisModel::getInstance(),array(&$this, 'getList'),array(),array($storeId));
$cartRedis = \Redis\Db7\CartRedisModel::getInstance();
$memberCartKey = \Our\NameConst::memberStoreCartsPrefix.'*_'.$storeId;
$cartRedis->tableDelAll($cartRedis->tableKeys($memberCartKey));
}
}
/** /**
* 类实例 * 类实例
* *
......
application/models/DAO/Store.php
View file @ 3288c695
...@@ -57,6 +57,16 @@ class StoreModel extends \DAO\AbstractModel ...@@ -57,6 +57,16 @@ class StoreModel extends \DAO\AbstractModel
return $res; return $res;
} }
public function updateStoreDeposit(){
$this->setDb(\Our\DbNameConst::masterDBConnectName);
$addKey=\Our\Common::getConfig('password.key');
$storeDepositSql = 'update han_store_extend t set t.total_deposit = (SELECT max(a.deposit) from han_qm_store_class a where a.store_id = t.store_id and a.class_style =2 and a.is_charged =1), t.total_deposit_sign = MD5(CONCAT(t.gmt_create,(SELECT max(a.deposit) from han_qm_store_class a where a.store_id = t.store_id and a.class_style =2 and a.is_charged =1),\''.$addKey.'\'))';
$result = $this->db->update($this->_tableNameFull)->query($storeDepositSql);
$emptyDepositSql = 'update han_store_extend t set t.total_deposit_sign =\'\' where t.total_deposit = 0';
$resultEmpty = $this->db->update($this->_tableNameFull)->query($emptyDepositSql);
return $result&&$resultEmpty;
}
/** /**
* 获取店铺信息 * 获取店铺信息
* @param $where * @param $where
...@@ -425,7 +435,7 @@ class StoreModel extends \DAO\AbstractModel ...@@ -425,7 +435,7 @@ class StoreModel extends \DAO\AbstractModel
public function checkAddressInServiceArea($address, $store) public function checkAddressInServiceArea($address, $store)
{ {
$inAreaFlag = \Our\ApiConst::zero; $inAreaFlag = \Our\ApiConst::zero;
if ($store['express_distribution']) {//如果店铺开启了到店自提和快递配送,则认为存在可用配送方式 if ($store['buyer_distribution']) {//如果店铺开启了到店自提和快递配送,则认为存在可用配送方式
$inAreaFlag = \Our\ApiConst::one; $inAreaFlag = \Our\ApiConst::one;
return $inAreaFlag; return $inAreaFlag;
} }
......
application/views/index/saleShare.php → application/views/index/saleShare.phtml
View file @ 3288c695
...@@ -96,7 +96,8 @@ ...@@ -96,7 +96,8 @@
.pn-share { padding: 20px 4% 0; } .pn-share { padding: 20px 4% 0; }
.pn-share .code-box { position: relative; margin-top: 90px; padding: 0 4%; text-align: center; } .pn-share .code-box { position: relative; margin-top: 90px; padding: 0 4%; text-align: center; }
.pn-share .code-box .code-in img { position: absolute; top: 50%; left: 50%; margin-left:-130px; margin-top:-130px; } .pn-share .code-box .code-in img { position: absolute; top: 50%; left: 50%; margin-left:-125px; margin-top:-125px; width:250px; height:250px;
display: block;}
.pn-share .code-box .code-txt { position: absolute; left: 0; right: 0; bottom: -1.5em; text-align: center; font-size: 22px; } .pn-share .code-box .code-txt { position: absolute; left: 0; right: 0; bottom: -1.5em; text-align: center; font-size: 22px; }
.pn-share .code-box .code1 { width: 320px; height: 320px; margin-left: -160px; margin-top: -160px; } .pn-share .code-box .code1 { width: 320px; height: 320px; margin-left: -160px; margin-top: -160px; }
.pn-share .code-box .code2 { width: 260px; height: 260px; margin-left: -125px; margin-top: -125px; } .pn-share .code-box .code2 { width: 260px; height: 260px; margin-left: -125px; margin-top: -125px; }
...@@ -150,8 +151,8 @@ ...@@ -150,8 +151,8 @@
<!-- </div>--> <!-- </div>-->
<div class="code-box"> <div class="code-box">
<img src="/data/images/bg-code2.jpg" alt=""> <img src="/data/images/bg-code2.jpg" alt="">
<div id="qrcodeImg" class="code-in"> <div id="qrcodeImg" class="code-in" >
<!-- <img id="qrcodeImg" src="//static.shenbd.com/www/index/2018/img/app-share/code2.jpg" alt="">--> <img id="qrcodeImg" src="<?php echo $params['qrCode']."?x-oss-process=image/resize,m_fill,h_250,w_250";?>" alt="" width="250" height="250">
</div> </div>
<p class="code-txt">长按图片识别二维码</p> <p class="code-txt">长按图片识别二维码</p>
</div> </div>
...@@ -160,11 +161,11 @@ ...@@ -160,11 +161,11 @@
</div> </div>
</body> </body>
<script> <script>
new QRCode(document.getElementById('qrcodeImg'), { // new QRCode(document.getElementById('qrcodeImg'), {
text: '<?php echo $params['qrCode']."?x-oss-process=image/resize,m_fill,h_186,w_186";?>', // text: '<?php //echo $params['qrCode']."?x-oss-process=image/resize,m_fill,h_186,w_186";?>//',
width: 250, // width: 250,
height: 250 // height: 250
//
}); // });
</script> </script>
</html> </html>
\ No newline at end of file
application/views/index/store.phtml
View file @ 3288c695
...@@ -96,7 +96,9 @@ ...@@ -96,7 +96,9 @@
.pn-share { padding: 20px 4% 0; } .pn-share { padding: 20px 4% 0; }
.pn-share .code-box { position: relative; margin-top: 90px; padding: 0 4%; text-align: center; } .pn-share .code-box { position: relative; margin-top: 90px; padding: 0 4%; text-align: center; }
.pn-share .code-box .code-in img { position: absolute; top: 50%; left: 50%; margin-left:-130px; margin-top:-130px; }
.pn-share .code-box .code-in img { position: absolute; top: 50%; left: 50%; margin-left:-125px; margin-top:-125px; width:250px; height:250px;
display: block;}
.pn-share .code-box .code-txt { position: absolute; left: 0; right: 0; bottom: -1.5em; text-align: center; font-size: 22px; } .pn-share .code-box .code-txt { position: absolute; left: 0; right: 0; bottom: -1.5em; text-align: center; font-size: 22px; }
.pn-share .code-box .code1 { width: 320px; height: 320px; margin-left: -160px; margin-top: -160px; } .pn-share .code-box .code1 { width: 320px; height: 320px; margin-left: -160px; margin-top: -160px; }
.pn-share .code-box .code2 { width: 260px; height: 260px; margin-left: -125px; margin-top: -125px; } .pn-share .code-box .code2 { width: 260px; height: 260px; margin-left: -125px; margin-top: -125px; }
......
conf/application.ini
View file @ 3288c695
...@@ -404,7 +404,7 @@ elastic.master.scheme="http"; ...@@ -404,7 +404,7 @@ elastic.master.scheme="http";
resources.database.params.driver = "pdo_mysql" resources.database.params.driver = "pdo_mysql"
resources.database.params.hostname = "127.0.0.1" resources.database.params.hostname = "127.0.0.1"
resources.database.params.port = 3306 resources.database.params.port = 3306
resources.database.params.database = "qmcs" resources.database.params.database = "testqmcs"
resources.database.params.username = "root" resources.database.params.username = "root"
resources.database.params.password = "123456" resources.database.params.password = "123456"
resources.database.params.charset = "UTF8" resources.database.params.charset = "UTF8"
...@@ -414,7 +414,7 @@ resources.database.params.driver_options.1002 = "SET NAMES utf8" ...@@ -414,7 +414,7 @@ resources.database.params.driver_options.1002 = "SET NAMES utf8"
resources.database.slave.params.driver = "pdo_mysql" resources.database.slave.params.driver = "pdo_mysql"
resources.database.slave.params.hostname = "127.0.0.1" resources.database.slave.params.hostname = "127.0.0.1"
resources.database.slave.params.port = 3306 resources.database.slave.params.port = 3306
resources.database.slave.params.database = "qmcs" resources.database.slave.params.database = "testqmcs"
resources.database.slave.params.username = "root" resources.database.slave.params.username = "root"
resources.database.slave.params.password = "123456" resources.database.slave.params.password = "123456"
resources.database.slave.params.charset = "UTF8" resources.database.slave.params.charset = "UTF8"
......
jpush.log 0 → 100644
View file @ 3288c695
Send POST https://api.jpush.cn/v3/push, body:{"platform":"all","audience":{"alias":["433"]},"notification":{"alert":"tesetTitle","android":{"title":"tesetTitle","extras":{"toId":433},"alert":"testMessage"},"ios":{"alert":"testMessage","sound":"sound.caf","category":"shenbd","extras":{"toId":433},"badge":"+1"}},"message":{"msg_content":"testMessage","title":"tesetTitle","extras":{"toId":433}},"options":{"sendno":886299650,"apns_production":false}}, times:1
Send POST https://api.jpush.cn/v3/push, body:{"platform":"all","audience":{"alias":["433"]},"notification":{"alert":"tesetTitle","android":{"title":"tesetTitle","extras":{"toId":433},"alert":"testMessage"},"ios":{"alert":"testMessage","sound":"sound.caf","category":"shenbd","extras":{"toId":433},"badge":"+1"}},"message":{"msg_content":"testMessage","title":"tesetTitle","extras":{"toId":433}},"options":{"sendno":1332802149,"apns_production":true}}, times:1
scripts/crontab/goods/syncGoodsStorage.php 0 → 100644
View file @ 3288c695
<?php
/**
* 修改goodsCommon表的缓存保证和goods表的总和一致.
* User: liuyu
* Date: 2018/12/7
* Time: 20:06
*/
define("APPLICATION_PATH", realpath(dirname(__FILE__) . '/../../../')); //指向public的上一级
require APPLICATION_PATH . '/scripts/crontab/baseCli.php';
require APPLICATION_PATH . '/scripts/crontab/common.php';
error_reporting(E_ALL ^ E_NOTICE);
class cliSyncGoodsStorage extends basecli
{
const CLI_ADMIN_ID = 255;
private $bDoUnLock = FALSE; // 是否允许释放 LOCK 文件
private $_debug = 0;
private $lockFileName;
private $fromState;
private function mkdirs($dir, $mode = 0777)
{
if (is_dir($dir) || @mkdir($dir, $mode)){
return TRUE;
}
if (!$this->mkdirs(dirname($dir), $mode)){
return FALSE;
}
return @mkdir($dir, $mode);
}
/**
* 析构
*/
public function __destruct()
{
parent::__destruct();
if ($this->bDoUnLock)
{
@unlink($this->lockFileName);
}
}
protected function syncGoodsCommonStorageByGoods(){
\Business\Goods\GoodsCommonServiceModel::getInstance()->syncGoodsCommonStorageByGoods();
}
protected function _runCli()
{
$this->_debug = isset($this->aArgv[1]) ? intval($this->aArgv[1]) : 0;
if ($this->_debug)
{
echo "*** Debug mode ***\n";
}
// Step: 02 检查是否已有相同CLI在运行中
$lockDir=$this->_getBaseFileName('syncGoodsStorage');
if(!$this->mkdirs($lockDir)){
echo '****create dir fail ****';
exit;
}
$this->lockFileName = $lockDir .'.locks';
var_dump($this->lockFileName);
if( file_exists( $this->lockFileName ) )
{
$stat = stat($this->lockFileName);
if( (TIMESTAMP - $stat['mtime']) > 24*60*60*2 )
{
echo "文件被锁超过2天，被强制删除";
@unlink($this->lockFileName);
}
else
{
$this->halt( '[' . date('Y-m-d H:i:s') .'] The CLI is running'."\n");
}
}
$this->bDoUnLock = true;
file_put_contents($this->lockFileName ,"running" ); // CLI 独占锁
$this->syncGoodsCommonStorageByGoods();
echo 'goodsCommon库存更新成功'."\r\n";
}
}
$oCli = new cliSyncGoodsStorage(TRUE);
EXIT;
?>
\ No newline at end of file
scripts/crontab/push/bridge.php
View file @ 3288c695
...@@ -21,7 +21,7 @@ $http->on('request', function ($request, $response) { ...@@ -21,7 +21,7 @@ $http->on('request', function ($request, $response) {
$memberDao=$info['className']::getInstance(\Our\DbNameConst::masterDBConnectName); $memberDao=$info['className']::getInstance(\Our\DbNameConst::masterDBConnectName);
echo json_encode($info); echo json_encode($info);
if(empty($info['params'])){ if(empty($info['params'])){
$res=call_user_func_array(array($memberDao,$info['method'])); $res=call_user_func_array(array($memberDao,$info['method']),array());
}else{ }else{
$res=call_user_func_array(array($memberDao,$info['method']),$info['params']); $res=call_user_func_array(array($memberDao,$info['method']),$info['params']);
} }
......
scripts/crontab/store/updateStoreTotalDeposit.php 0 → 100644
View file @ 3288c695
<?php
/**
* 更新店铺总保证金
* User: liuyuzhen
* Date: 2018/12/07
* Time: 15:00
* Description:
*/
define("APPLICATION_PATH", realpath(dirname(__FILE__) . '/../../../')); //指向public的上一级
require APPLICATION_PATH . '/scripts/crontab/baseCli.php';
require APPLICATION_PATH . '/scripts/crontab/common.php';
error_reporting(E_ALL ^ E_NOTICE);
class cliUpdateStoreTotalDeposit extends basecli
{
const CLI_ADMIN_ID = 255;
private $bDoUnLock = FALSE; // 是否允许释放 LOCK 文件
private $_debug = 0;
private $lockFileName;
private $fromState;
private function mkdirs($dir, $mode = 0777)
{
if (is_dir($dir) || @mkdir($dir, $mode)) {
return TRUE;
}
if (!$this->mkdirs(dirname($dir), $mode)) {
return FALSE;
}
return @mkdir($dir, $mode);
}
/**
* 析构
*/
public function __destruct()
{
parent::__destruct();
if ($this->bDoUnLock) {
@unlink($this->lockFileName);
}
}
protected function updateStoreTotalDeposit(){
\Business\Store\StoreServiceModel::getInstance()->updateStoreTotalDeposit();
}
protected function _runCli()
{
$this->_debug = isset($this->aArgv[1]) ? intval($this->aArgv[1]) : 0;
if ($this->_debug)
{
echo "*** Debug mode ***\n";
}
// Step: 02 检查是否已有相同CLI在运行中
$lockDir=$this->_getBaseFileName('updateStoreTotalDeposit');
if(!$this->mkdirs($lockDir)){
echo '****create dir fail ****';
exit;
}
$this->lockFileName = $lockDir .'.locks';
if( file_exists( $this->lockFileName ) )
{
$stat = stat($this->lockFileName);
if( (TIMESTAMP - $stat['mtime']) > 24*60*60*2 )
{
echo "文件被锁超过2天，被强制删除";
@unlink($this->lockFileName);
}
else
{
$this->halt( '[' . date('Y-m-d H:i:s') .'] The CLI is running'."\n");
}
}
$this->bDoUnLock = true;
file_put_contents($this->lockFileName ,"running" ); // CLI 独占锁
$this->updateStoreTotalDeposit();
echo '店铺总保证金更新成功'."\r\n";
}
}
$oCli = new cliUpdateStoreTotalDeposit(TRUE);
EXIT;
?>
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