Skip to content

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

库存问题提交

parents 5e7ce6fd a3e31242
Hide whitespace changes
Inline Side-by-side
Showing with 185 additions and 207 deletions
application/controllers/Goods.php 100755 → 100644
View file @ 3c5d0ecc
......@@ -40,7 +40,7 @@ class GoodsController extends \Our\Controller_AbstractIndex {
}
public function testAction(){
//$info = $this->goodsService->recommend();
\DAO\GoodsCommonModel::getInstance()->getGrade(100030);
\Business\Goods\GoodsCommonServiceModel::getInstance()->saleGoods();
}
public function getAttrsAction(){
......
application/controllers/Order.php
View file @ 3c5d0ecc
......@@ -111,6 +111,9 @@ class OrderController extends \Our\Controller_AbstractApi {
*/
public function applyPlatformAction(){
$refundService =\Business\Order\RefundServiceModel::getInstance();
if(empty($this->req[\Our\NameConst::data]['refundId'])){
\Error\ErrorModel::throwException(\Error\CodeConfigModel::paramsError);
}
$res=$refundService->platformIn($this->memberId,$this->req[\Our\NameConst::data]['refundId']);
if($res){
$this->success(array(),\Our\DescribeConst::applySuccess);
......
application/library/Our/ApiConst.php
View file @ 3c5d0ecc
......@@ -152,6 +152,8 @@ class ApiConst
//是否退款成功
const refundSuccess = 1;
const refundFail = 0;
const refundCompleted=3;
//是否收到货
const shippingOver = 1;
const noShippingOver = 0;
......@@ -162,6 +164,8 @@ class ApiConst
//平台介入
const platIn = 1;
const platNotIn = 0;
//平台介入中
const platProccess=2;
//平台审核状态
const refundPlatformVerify = 0;
const refundPlatformAgree = 1;
......@@ -303,6 +307,7 @@ class ApiConst
const onlineGoodsState = 1;//正常商品状态
const onlineGoodsVerify = 1; //商品已通过审核
const onlineGoodsDel = 0; //商品未删除
const cartGoodsOnline = 1;//购物车商品正常
const cartGoodsOffline = 2; //购物车商品下架
......
application/library/Our/PathConst.php
View file @ 3c5d0ecc
......@@ -38,6 +38,7 @@ class PathConst {
const orderAddTime="/orderAddTime.conf";
const orderWaitRecieveTaskAddTime="/orderWaitRecieveTaskAddTime.conf";
const orderConfirmTaskAddTime="/orderConfirmTaskAddTime.conf";
const saleOrderGoodsAddTime="/saleOrderGoodsAddTime.conf";
const orderId="orderId={0}";
const authInfoOtherLogin="/authInfo/otherLogin";
......
application/models/Business/Goods/GoodsCommonService.php
View file @ 3c5d0ecc
......@@ -293,7 +293,6 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
$attrs = $this->getAttr($goodsCommonId,$memberId);
$commonInfo = $attrs['commonInfo'];
$commonInfo['goods_image'] = \Our\ImageUtil::getGoodsImgUrl($commonInfo['goods_image']);
//所在地
$area = '';
if($commonInfo['areaid_1'] && $commonInfo['areaid_2']){
......@@ -334,6 +333,7 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
$productData = \Our\RedisHelper::cachedFunction(\Redis\Db4\GoodsAttributeRedisModel::getInstance(),array(&$attrbuteDAO, 'option'),array('attribute,attribute_value',array('goods_commonid'=>$goodsCommonId)),\Our\ApiConst::oneDaySecond,array($goodsCommonId));
$html = array('width'=>750,'height'=>$commonInfo['goods_height'],'url'=>\Our\Common::getBaseUrl().'/index/goodsDetail?goodsCommonId='.$goodsCommonId);
if($commonInfo['is_del'] == 1) $commonInfo['goods_state'] == 0;
unset($attrs['commonInfo']);
return array_merge(array('storeId'=>$commonInfo['store_id'],'goodsId'=>$commonInfo['goodsId'],'goodsName'=>$commonInfo['goods_name'],'goodsVerify'=>$commonInfo['goods_verify'],'goodsState'=>$commonInfo['goods_state'],'saleCount'=>$commonInfo['sale_num'],'collectionState'=>$collectionState,'isOwn'=>$isOwn,'isHot'=>$commonInfo['goods_hot'],'isRecoment'=>$commonInfo['goods_commend'],'isFree'=>$commonInfo['goods_free'],'isVirtual'=>$commonInfo['is_virtual'],'goodsMostLimit'=>$commonInfo['goods_most_limit'],'goodsLeastLimit'=>$commonInfo['goods_least_limit'],'goodsTotalLimit'=>$commonInfo['goods_total_limit'],'address'=>$area,'range'=>$rangePrice,'productData'=>$productData,'htmlContent'=>$html,'videoUrl'=>$commonInfo['goods_youku_url']),$attrs);
}
......@@ -346,7 +346,7 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
$activities = \DAO\SaleMemberModel::getInstance()->isJoinStore($commonInfo['store_id'],$memberId);
//商品表
$goodsInstance = \DAO\GoodsModel::getInstance();
$goods = \Our\RedisHelper::cachedFunction(\Redis\Db4\GoodsRedisModel::getInstance(),array(&$goodsInstance, 'getListAndSetStorage'),array($goodsCommonId,'goods_id,goods_price,goods_marketprice,goods_image,goods_storage,goods_spec,goods_state,goods_verify'),\Our\ApiConst::oneDaySecond,array($goodsCommonId));
$goods = \Our\RedisHelper::cachedFunction(\Redis\Db4\GoodsRedisModel::getInstance(),array(&$goodsInstance, 'getListAndSetStorage'),array($goodsCommonId,'goods_id,goods_price,goods_marketprice,goods_image,goods_storage,goods_spec,goods_state,goods_verify,is_del'),\Our\ApiConst::oneDaySecond,array($goodsCommonId));
//商品图片表
$goodsImagesInstance = \DAO\GoodsImagesModel::getInstance();
$image = \Our\RedisHelper::cachedFunction(\Redis\Db4\GoodsImagesRedisModel::getInstance(),array(&$goodsImagesInstance, 'getListByCommonId'),array($goodsCommonId,'attr_name,attr_value,goods_image'),\Our\ApiConst::oneDaySecond,array($goodsCommonId));
......@@ -402,7 +402,7 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
//用户是否有参加这个活动
if($price = \DAO\SaleGoodsModel::getInstance()->getSalePrice($data,$activities)){
$v['goods_price'] = $price;
$commonInfo['goods_price'] = min($commonInfo['goods_price'],$price);
$commonInfo['goods_price'] = $price;
}
}
}
......@@ -824,10 +824,10 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
}
$storeId && $where['han_goods_attribute.store_id'] = $storeId;
$storeId || $where['source'] = 1; //来源：平台
$firstClassId && $where['firstClassId'] = $firstClassId;
$secondClassId && $where['secondClassId'] = $secondClassId;
$thirdClassId && $where['thirdClassId'] = $thirdClassId;
$storeThirdClassId && $where['storeThirdClassId'] = $storeThirdClassId;
$firstClassId && $where['gc_id_1'] = $firstClassId;
$secondClassId && $where['gc_id_2'] = $secondClassId;
$thirdClassId && $where['gc_id_3'] = $thirdClassId;
$storeThirdClassId && $where['goods_class_t_id'] = $storeThirdClassId;
$where['is_filter'] = 1;
$productData = [];
$attributeRedis = \Redis\Db4\GoodsAttributeRedisModel::getInstance();
......@@ -857,55 +857,60 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
* 销售订单任务脚本
*/
public function saleGoods(){
for($i = 0; $i < 2000 ; $i++){
if($orderGoodsId = \DAO\SaleGoodsModel::getInstance()->popOrderGoodsList()){
$saleOrder = \DAO\SaleOrderModel::getInstance()->find(array('order_goods_id'=>$orderGoodsId),'id');
$baseConfDir = \Our\Common::getConfig('out.config');
$savePath = $baseConfDir . \Our\PathConst::saleOrderGoodsAddTime;
$addTime = file_get_contents($savePath);
$addTime = $addTime ? $addTime : \Our\ApiConst::zero;
$orderDao = \DAO\Order\OrderGoodsModel::getInstance(\Our\DbNameConst::masterDBConnectName);
$pageBegin = \Our\PageConst::taskPageBegin;
$time = TIMESTAMP;
do {
$orders = $orderDao->getSaleOrderGoods('rec_id,sale_act_id,sale_id,goods_id,goods_num,goods_name,goods_image,order_id,is_refund,goods_pay_price,refund_id', $addTime, $pageBegin, \Our\PageConst::taskPageSize);
foreach ($orders['list'] as $orderGoods) {
$saleOrder = \DAO\SaleOrderModel::getInstance()->find(array('order_goods_id'=>$orderGoods['rec_id']),'id');
$insert = [];
$update = [];
$orderGoods = \DAO\Order\OrderGoodsModel::getInstance()->find(array('rec_id'=>$orderGoodsId),'sale_act_id,sale_id,goods_id,goods_num,goods_name,goods_image,refund_id,order_id,refund_state_name');
$order = \DAO\Order\OrderModel::getInstance()->findByOrderId($orderGoods['order_id'],'buyer_id,order_state,evaluation_state');
$order = \DAO\Order\OrderModel::getInstance()->findByOrderId($orderGoods['order_id'],'order_state,order_sn,buyer_id');
if($saleOrder){
$update['refund_id'] = $orderGoods['refund_id'];
$update['refund_state_name'] = $orderGoods['refund_state_name'];
$update['is_refund'] = $orderGoods['is_refund'];
$update['order_state'] = $order['order_state'];
$update['evaluation_state'] = $order['evaluation_state'];
}else{
$member = \DAO\MemberModel::getInstance()->find($order['buyer_id']);
$insert['member_name'] = $member['member_name'];
$insert['member_avatar'] = $member['member_avatar'];
$insert['order_goods_id'] = $orderGoodsId;
$member = \DAO\MemberModel::getInstance()->getInfo($order['buyer_id']);
$insert['member_name'] = $member['memberName'];
$insert['member_avatar'] = $member['memberAvatarUrl'];
$insert['order_goods_id'] = $orderGoods['rec_id'];
$insert['sale_act_id'] = $orderGoods['sale_act_id'];
$insert['sale_id'] = $orderGoods['sale_id'];
$insert['goods_id'] = $orderGoods['goods_id'];
$insert['goods_num'] = $orderGoods['goods_num'];
$insert['goods_name'] = $orderGoods['goods_name'];
$insert['goods_image'] = $orderGoods['goods_image'];
$insert['refund_id'] = $orderGoods['refund_id'];
$insert['order_id'] = $orderGoods['order_id'];
$insert['refund_state_name'] = $orderGoods['refund_state_name'];
$insert['member_id'] = $order['buyer_id'];
$insert['order_state'] = $order['order_state'];
$insert['evaluation_state'] = $order['evaluation_state'];
$insert['is_refund'] = $orderGoods['is_refund'];
$insert['order_sn'] = $order['order_sn'];
$insert['goods_pay_price'] = $orderGoods['goods_pay_price'];
}
if($orderGoods['refund_id'] > 0 ){
$refund = \DAO\Order\RefundReturnModel::getInstance()->find(array('refund_id'=>$orderGoods['refund_id']),'seller_state,is_platform_in,platform_state');
if($saleOrder){
$update['seller_state'] = $refund['seller_state'];
$update['is_platform_in'] = $refund['is_platform_in'];
$update['platform_state'] = $refund['platform_state'];
}else{
$insert['seller_state'] = $refund['seller_state'];
$insert['is_platform_in'] = $refund['is_platform_in'];
$insert['platform_state'] = $refund['platform_state'];
}
}
if($saleOrder){
\DAO\SaleOrderModel::getInstance()->update(array('order_goods_id'=>$orderGoodsId),$update);
\DAO\SaleOrderModel::getInstance(\Our\DbNameConst::masterDBConnectName)->update(array('order_goods_id'=>$orderGoods['rec_id']),$update);
}else{
\DAO\SaleOrderModel::getInstance()->insert($insert);
\DAO\SaleOrderModel::getInstance(\Our\DbNameConst::masterDBConnectName)->insert($insert);
}
$saleOrderDAO = \DAO\SaleOrderModel::getInstance();
\Our\RedisHelper::delCachedFunction(\Redis\Db13\MemberCouponRedisModel::getInstance(), array(&$saleOrderDAO, 'getOrderGoodsList'),array(),array($order['buyer_id']));
}
}
$pageBegin++;
} while (!empty($orders['list']));
file_put_contents($savePath, $time);
}
/**
......@@ -1009,57 +1014,6 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
}
}
}
//$commonIds = array_merge($arr,$commonIds);
// $weekSales = $goodsCommonRedis->tableSmembers('weekSales:'.$storeId);
// if($weekSales) {
// $arr = array_merge(array_diff($weekSales, $existIds));
// if($arr) {
// shuffle($arr);
// $ret = array_pop($arr);
// if($ret) {
// $commonIds[] = $ret;
// $existIds[] = $ret;
// }
// }
// }
//
//
// $weekSaleGoods = $goodsCommonRedis->tableSmembers('weekSaleGoods:'.$storeId);
// if($weekSaleGoods) {
// $arr = array_merge(array_diff($weekSaleGoods, $existIds));
// if($arr) {
// shuffle($arr);
// $ret = array_pop($arr);
// if($ret) {
// $commonIds[] = $ret;
// $existIds[] = $ret;
// }
// $ret = array_pop($arr);
// if($ret) {
// $commonIds[] = $ret;
// $existIds[] = $ret;
// }
// }
// }
// $recommendGoods = $goodsCommonRedis->tableSmembers('recommendGoods:'.$storeId);
// if($recommendGoods) {
// $arr = array_merge(array_diff($recommendGoods, $existIds));
// if($arr) {
// shuffle($arr);
// while(true) {
// $ret = array_pop($arr);
// if($ret) {
// $commonIds[] = $ret;
// $existIds[] = $ret;
// }else{
// break;
// }
// if(count($commonIds) == 4){
// break;
// }
// }
// }
// }
$goods = [];
if($commonIds){
//该用户是否有参加销售活动
......@@ -1070,7 +1024,7 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
$goodsList = [];
foreach ($commonIds as $commonId){
if($goodsCommon = \Our\RedisHelper::cachedFunction(\Redis\Db4\GoodsCommonRedisModel::getInstance(),array(&$commonDAO, 'getOneById'),array($commonId),0,array($commonId))){
if($goodsCommon['goods_verify'] == 1 && $goodsCommon['goods_state'] == 1) {
if($goodsCommon['goods_verify'] == 1 && $goodsCommon['goods_state'] == 1 && $goodsCommon['is_del'] == 0) {
$goodsList[] = $goodsCommon;
}
}
......
application/models/Business/Order/OrderService.php
View file @ 3c5d0ecc
......@@ -213,6 +213,7 @@ class OrderServiceModel extends \Business\AbstractModel
*/
public function getOrderDetail($orderId)
{
// error_reporting(E_ALL);
$orderDao = \DAO\Order\OrderModel::getInstance(DbNameConst::salveDBConnectName);
$addressDao = \DAO\AddressModel::getInstance(DbNameConst::salveDBConnectName);
$orderCommonDao = \DAO\Order\OrderCommonModel::getInstance(DbNameConst::salveDBConnectName);
......@@ -260,13 +261,19 @@ class OrderServiceModel extends \Business\AbstractModel
$returnData['shippingTime'] = $this->orderCommon['shippingTime'];
if ($returnData['diliverymanId']) {
$returnData['deliveryman'] = $diliverymanDao->convert($this->diliveryman, $this->getDeliveryManFields());
if(empty($returnData['deliveryman']['qrcodePath'])){
$returnData['deliveryman']['qrcodePath']='';
}
} else {
$returnData['diliverymanId'] = ApiConst::zero;
$returnData['deliveryman'] = new \stdClass();
}
$returnData['totalGoodsNum'] = $orderGoodsDao->getGoodsCount($this->orderGoodsList);
$returnData['offlinePayway'] = $this->store['offlinePayway'] ? $this->store['offlinePayway'] : '';
$returnData['reciverInfo'] = $this->address;
$returnData['reciverInfo']['lng']=!empty($returnData['reciverInfo']['lng'])?$returnData['reciverInfo']['lng']:ApiConst::zero;
$returnData['reciverInfo']['lat']=!empty($returnData['reciverInfo']['lat'])?$returnData['reciverInfo']['lat']:ApiConst::zero;
$refundStateName = $orderDao->getRefundText($this->order);
$returnData['orderGoods'] = $goodsDao->convert($this->orderGoodsList, $refundStateName);
return $returnData;
......@@ -291,12 +298,14 @@ class OrderServiceModel extends \Business\AbstractModel
$res = $orderDao->updateStatusByOrderId($orderId, ApiConst::orderStateCancel);
if ($res) {
$order['refundOrderNo']=$refundReturnDao->getRefundsn($order['storeId']);
$resultRefund=$refundReturnDao->refundMoney($order);
if($resultRefund){
$where['order_id']=$order['orderId'];
//$orderGoodsUpdateData['refund_state_name']='退款成功';
$orderGoodsUpdateData['is_refund']=1;
$orderGoodsDao->update($where,$orderGoodsUpdateData);
if($order['paymentTime']>ApiConst::zero){
$resultRefund=$refundReturnDao->refundMoney($order);
if($resultRefund){
$where['order_id']=$order['orderId'];
//$orderGoodsUpdateData['refund_state_name']='退款成功';
$orderGoodsUpdateData['is_refund']=1;
$orderGoodsDao->update($where,$orderGoodsUpdateData);
}
}
if ($memberId) {
$orderDao->deleteOrderCache($memberId, $orderId, $order['store_id'],true);
......
application/models/Business/Order/RefundService.php
View file @ 3c5d0ecc
......@@ -12,6 +12,8 @@ use Our\DbNameConst;
use Our\DescribeConst;
use Our\ImageConst;
use Our\ImageUtil;
use Our\NameConst;
use Our\OrderConst;
/**
* 店铺service
......@@ -333,6 +335,13 @@ class RefundServiceModel extends \Business\AbstractModel
$refundReasonDao = \DAO\Order\RefundReasonModel::getInstance(DbNameConst::masterDBConnectName);
$orderDao = \DAO\Order\OrderModel::getInstance(DbNameConst::masterDBConnectName);
$orderInfo = $orderDao->findByMemberIdAndOrderId($memberId, $refund['orderId'], $this->orderField);
$whereRefund['goods_id']=$refund['goodsId'];
$whereRefund['buyer_id']=$memberId;
$whereRefund['order_id']=$orderInfo['orderId'];
$refundOne=$refundReturnDao->find($whereRefund);
if(!empty($refundOne)){
ErrorModel::throwException(CodeConfigModel::alreadyExsitRefundGoods);
}
$refundReasonList = \Our\RedisHelper::cachedFunction(\Redis\Db5\RefundReasonRedisModel::getInstance(), array(&$refundReasonDao, 'getAll'), array($this->refunReasonField), \Our\ApiConst::oneDaySecond);
$refundReasonList = $refundReasonDao->convertToKey($refundReasonList);
$orderGoodsDao = \DAO\Order\OrderGoodsModel::getInstance(DbNameConst::masterDBConnectName);
......@@ -495,9 +504,21 @@ class RefundServiceModel extends \Business\AbstractModel
public function platformIn($buyerId, $refundId, $platFormMessage = DescribeConst::unagreeSellerProccess)
{
$refundReturnDao = \DAO\Order\RefundReturnModel::getInstance(DbNameConst::masterDBConnectName);
$res = $refundReturnDao->updateStatusByBuyerIdAndRefundId($buyerId, $refundId, $platFormMessage);
if ($res) {
$orderDao=\DAO\Order\OrderModel::getInstance(DbNameConst::masterDBConnectName);
$orderGoodsDao=\DAO\Order\OrderGoodsModel::getInstance(DbNameConst::masterDBConnectName);
$where['buyer_id']=$buyerId;
$where['refund_id']=$refundId;
$res= $refundReturnDao->find($where,$refundReturnDao->refundDetailField);
if(isset($res['isPlatformIn']) && !empty($res['isPlatformIn'])){
ErrorModel::throwException(CodeConfigModel::platFormAreadyIn);
}
$re= $refundReturnDao->updateStatusByBuyerIdAndRefundId($buyerId, $refundId, $platFormMessage);
if ($re) {
$whereOrderGoods['rec_id']=$res['orderGoodsId'];
$updateData['refund_state_name']=OrderConst::platFromProccess;
$orderGoodsDao->update($whereOrderGoods,$updateData);
$refundReturnDao->deleteRefundCache($buyerId,$refundId);
$orderDao->deleteOrderCache($buyerId,$res['orderId'],$res['storeId']);
return true;
} else {
return false;
......
application/models/Business/Store/StoreService.php
View file @ 3c5d0ecc
......@@ -14,21 +14,6 @@ class StoreServiceModel extends \Business\AbstractModel{
public function init() {
}
// public function get($storeId,$label = true){
// $storeInstance = \DAO\StoreModel::getInstance();
// $storeInfo = \Our\RedisHelper::cachedFunction(\Redis\Db6\StoreRedisModel::getInstance(),array(&$storeInstance, 'getInfoById'),array($storeId));
// if(!$storeInfo){
// \Error\ErrorModel::throwException(\Error\CodeConfigModel::storeNotExistOrClose);
// }
//
// if($label){
// //店铺头像
// $storeLabel = $storeInstance->getStoreLabelSrc($storeInfo['store_label']);
//
// return array($storeInfo,$storeLabel);
// }
// return $storeInfo;
// }
/**
* 获取店铺首页渲染信息
......@@ -62,12 +47,6 @@ class StoreServiceModel extends \Business\AbstractModel{
\DAO\SaleMemberModel::getInstance()->insertOrUpdate(array('sale_id'=>$sale['member_id'],'sale_act_id'=>$sale['sale_act_id'],'member_id'=>$memberId,'store_id'=>$storeId));
}
}
// $storeMember['storeId'] = $storeId;
// $storeMember['memberId'] = $memberId;
// $storeMember['type'] = \Our\ApiConst::storeQrcodeMember;
// $storeMembers[] = $storeMember;
// $storeMemberDao = \DAO\StoreMemberModel::getInstance(\Our\DbNameConst::masterDBConnectName);
// $result = $storeMemberDao->addBatch($storeMembers);
}else{
$sess=\Yaf\Session::getInstance();
$scan_store_ids = $sess->get('scan_store_ids');
......@@ -196,7 +175,7 @@ class StoreServiceModel extends \Business\AbstractModel{
return array('storeName'=>$storeInfo['store_name'],'storeLabel'=>$storeLabel,'fansCount'=>\DAO\FavoritesStoreModel::getInstance()->getFavoritesStoreCountByStoreId($storeId),'clazz'=>$returnClass,'address'=>$address,'storePhone'=>$storeInfo['store_phone'],'openingHours'=>$openingHours,'storeService'=>$storeInfo['store_notice'],"qualificationImage"=>$detailImg);
}
public function getRecommendGoodsCache($param,$memberId){
$recommendGoods = \Our\RedisHelper::cachedFunction(\Redis\Db6\StoreGoodsClassRedisModel::getInstance(),array(&$this, 'getRecommendGoods'),array($param,$memberId),\Our\ApiConst::oneDaySecond,array(intval($param['storeId'])));
$recommendGoods = \Our\RedisHelper::cachedFunction(\Redis\Db6\StoreGoodsClassRedisModel::getInstance(),array(&$this, 'getRecommendGoods'),array($param,$memberId),\Our\ApiConst::oneHour,array(intval($param['storeId'])));
return $recommendGoods;
}
/**
......@@ -211,7 +190,6 @@ class StoreServiceModel extends \Business\AbstractModel{
\DAO\StoreModel::getInstance()->get($storeId,false);
$activities = \DAO\SaleMemberModel::getInstance()->isJoinStore($storeId,$memberId);
$storeClassDAO = \DAO\StoreGoodsClassModel::getInstance();
$tempStcs = $storeClassDAO->getList(array('store_id'=>$storeId),'stc_id,stc_name');
if($tempStcs) {
......@@ -223,11 +201,12 @@ class StoreServiceModel extends \Business\AbstractModel{
$goodsIds = array_column($stcGoods,'goods_common_id');
$goodsCommonDAO = \DAO\GoodsCommonModel::getInstance();
if($activities === false){
$tempGoods = $goodsCommonDAO->getGoodsList(array('goods_commonid in('.implode(',',$goodsIds).')'),'goods_name,goods_image,goods_price,goods_marketprice,goods_commonid');
$tempGoods = $goodsCommonDAO->getGoodsList(array('goods_commonid in('.implode(',',$goodsIds).')'),'goods_name,goods_image,goods_price as goodsPrice,goods_marketprice,goods_commonid');
}else{
$activities = array_keys($activities);
$tempGoods = $goodsCommonDAO->getListWithSale(array('han_goods_common.goods_commonid in('.implode(',',$goodsIds).')'),'goods_name,goods_image,goods_price,goods_marketprice,han_goods_common.goods_commonid',$activities);
$tempGoods = $goodsCommonDAO->getListWithSale(array('han_goods_common.goods_commonid in('.implode(',',$goodsIds).')'),'goods_name,goods_image,goods_price,goods_marketprice,han_goods_common.goods_commonid,IFNULL(discount_price,han_goods_common.goods_price) AS goodsPrice',$activities);
}
if($tempGoods && $tempStcs){
$stcs = [];
foreach ($tempStcs as $v){
......@@ -243,7 +222,7 @@ class StoreServiceModel extends \Business\AbstractModel{
'goodsCommonId'=>$v['goods_common_id'],
'goodsName'=>$goods[$v['goods_common_id']]['goods_name'],
'goodsImage'=>\Our\ImageUtil::getGoodsImgUrl($goods[$v['goods_common_id']]['goods_image']),
'goodsPrice'=>$goods[$v['goods_common_id']]['goods_price'],
'goodsPrice'=>$goods[$v['goods_common_id']]['goodsPrice'],
'goodsMarketPrice'=>$goods[$v['goods_common_id']]['goods_marketprice'],
];
if(key_exists($v['stc_id'],$recommendGoods)){
......
application/models/Business/User/MemberCenterService.php
View file @ 3c5d0ecc
......@@ -224,34 +224,6 @@ class MemberCenterServiceModel extends \Business\AbstractModel
$list = \Our\RedisHelper::cachedFunction(\Redis\Db4\FavoritesRedisModel::getInstance(),array(&$favoritesInstance, 'getList'),array($where,$field,$pageIndex,$pageSize,$memberId),\Our\ApiConst::oneDaySecond,array($memberId));
$goods = array();
if(is_array($list) && !empty($list)){
// $storeIds = array_column($list,'store_id');
// $storeIds = array_unique($storeIds);
// foreach ($storeIds as $storeId) {
// $tempStores = [];
// $queryStores = [];
// $storeDAO = \DAO\StoreModel::getInstance();
// $exist = \Our\RedisHelper::cachedFunctionExist(\Redis\Db6\StoreRedisModel::getInstance(),array(&$storeDAO, 'getInfoById'),array($storeId),array($storeId));
// if($exist) {
// $storeInfo = \Our\RedisHelper::cachedFunction(\Redis\Db6\StoreRedisModel::getInstance(),array(&$storeDAO, 'getInfoById'),array($storeId),\Our\ApiConst::sevenDaySecond,array($storeId));
// $tempStores[] = $storeInfo;
// }elseif ($exist === false) {
// $queryStores[] = $storeId;
// }
// }
// if($queryStores) {
// var_dump($queryStores);
// $storeList = $storeDAO->getList('store_id in('.implode(',',$queryStores).')',\Our\ApiConst::zero,$pageSize);
// if($storeList) {
// foreach ($storeList as $store) {
// \Our\RedisHelper::setCachedFunction(\Redis\Db6\StoreRedisModel::getInstance(),array(&$storeDAO, 'getInfoById'),$store,array($storeId),\Our\ApiConst::sevenDaySecond,array($storeId));
// $tempStores[] = $store;
// }
// }
// }
// $stores = [];
// foreach ($tempStores as $store) {
// $stores[$store['store_id']] = [$store['store_state'],$store['open_flag']];
// }
foreach ($list as $v){
//if($stores['store_id'] && $stores['store_id']['open_flag'] == 1 && $stores['store_id']['store_state'] == 1) {
$goods[] = array('favid'=>$v['favid'],'goodsCommonId'=>$v['goods_commonid'],'goodsImage'=>\Our\ImageUtil::getGoodsImgUrl($v['goods_image'],\Our\ImageConst::goodsCollectionImgSize),'goodsName'=>$v['goods_name'],'goodsPrice'=>$v['goods_price'],'goodsId'=>$v['goods_id']);
......
application/models/Business/User/SalespersonService.php
View file @ 3c5d0ecc
......@@ -78,7 +78,7 @@ class SalespersonServiceModel extends \Business\AbstractModel
$memberName = $member['memberName'];
$memberAvatarUrl = $member['memberAvatarUrl'];
$orderGoodsList = \Our\RedisHelper::cachedFunction(\Redis\Db1\SaleOrderRedisModel::getInstance(),array(&$saleOrderDAO, 'getOrderGoodsList'),array("sale_act_id in(".implode(',',$saleActArr).") AND sale_id = {$memberId} AND goods_id in(".implode(',',$goodsIds).")",'sum(goods_num) AS goodsCount,goods_name AS goodsName,goods_image AS goodsImage,goods_id AS goodsId,sale_act_id','goods_id',[],'sale_act_id'),\Our\ApiConst::tenMinSecond,array($memberId));
$orderGoodsList = \Our\RedisHelper::cachedFunction(\Redis\Db1\SaleOrderRedisModel::getInstance(),array(&$saleOrderDAO, 'getOrderGoodsList'),array("sale_act_id in(".implode(',',$saleActArr).") AND sale_id = {$memberId} AND goods_id in(".implode(',',$goodsIds).")",'sum(goods_num) AS goodsCount,goods_name AS goodsName,goods_image AS goodsImage,goods_id AS goodsId,sale_act_id','goods_id',[],'sale_act_id'),\Our\ApiConst::halfDaySecond,array($memberId));
$existIds = [];
if($orderGoodsList && is_array($orderGoodsList)) {
foreach ($orderGoodsList as $v){
......@@ -180,11 +180,13 @@ class SalespersonServiceModel extends \Business\AbstractModel
$saleOrderDAO = \DAO\SaleOrderModel::getInstance();
$where = "sale_act_id = {$actId} AND sale_id = {$memberId} AND goods_id = {$goodsId}";
if($type === 0) {
$where .= " AND (order_state=%s AND (refund_id = %s OR (refund_id > %s AND ((seller_state = %s AND is_platform_in = %s) OR (is_platform_in = %s AND platform_state = %s)))))";
$where = sprintf($where,ApiConst::orderStateComplete,ApiConst::zero,ApiConst::zero,ApiConst::refundSellerRefuse,ApiConst::platNotIn,ApiConst::platIn,ApiConst::refundPlatformRefuse);
// $where .= " AND (order_state=%s AND (refund_id = %s OR (refund_id > %s AND ((seller_state = %s AND is_platform_in = %s) OR (is_platform_in = %s AND platform_state = %s)))))";
$where .= " AND order_state=40 AND is_refund=0";
// $where = sprintf($where,ApiConst::orderStateComplete,ApiConst::zero,ApiConst::zero,ApiConst::refundSellerRefuse,ApiConst::platNotIn,ApiConst::platIn,ApiConst::refundPlatformRefuse);
}else{
$where .=" AND (order_state < %s OR (order_state = %s AND refund_id > %s AND (seller_state != %s OR (is_platform_in = %s AND platform_state != %s ))))";
$where = sprintf($where,ApiConst::orderStateComplete,ApiConst::orderStateComplete,ApiConst::zero,ApiConst::refundSellerRefuse,ApiConst::platIn,ApiConst::refundPlatformRefuse);
// $where .=" AND (order_state < %s OR (order_state = %s AND refund_id > %s AND (seller_state != %s OR (is_platform_in = %s AND platform_state != %s ))))";
$where .= " AND order_state < 40 OR (order_state = 40 AND is_refund = 1)";
// $where = sprintf($where,ApiConst::orderStateComplete,ApiConst::orderStateComplete,ApiConst::zero,ApiConst::refundSellerRefuse,ApiConst::platIn,ApiConst::refundPlatformRefuse);
}
$goodsList = $saleOrderDAO->getOrderGoodsList($where,'member_id,member_name AS memberName,member_avatar AS memberAvatar,sum(goods_num) AS goodsNum','member_id',$limit);
$orders = [];
......@@ -198,7 +200,7 @@ class SalespersonServiceModel extends \Business\AbstractModel
// }
$orders[] = [
'memberName'=>$v['memberName'],
'memberAvatar'=>\DAO\MemberModel::getInstance()->getMemberAvatarUrl($v['member_id'],$v['memberAvatar']),
'memberAvatar'=>$v['memberAvatar'],
'goodsNum'=>$v['goodsNum']
];
}
......
application/models/DAO/Goods.php
View file @ 3c5d0ecc
......@@ -51,7 +51,7 @@ class GoodsModel extends \DAO\AbstractModel {
* @return mixed
*/
public function getOnlineList($where,$field = \Our\NameConst::allField){
$whereSql = ' goods_state ='.\Our\ApiConst::onlineGoodsState.' and goods_verify='.\Our\ApiConst::onlineGoodsVerify;
$whereSql = ' goods_state ='.\Our\ApiConst::onlineGoodsState.' and goods_verify='.\Our\ApiConst::onlineGoodsVerify.' and is_del='.\Our\ApiConst::onlineGoodsDel;
if($where){
$whereSql .= ' and '.$where;
}
......@@ -61,6 +61,7 @@ class GoodsModel extends \DAO\AbstractModel {
public function getOnlineOne($goodsId,$field= \Our\NameConst::allField){
$where['goods_state'] = \Our\ApiConst::onlineGoodsState;
$where['goods_verify'] = \Our\ApiConst::onlineGoodsVerify;
$where['is_del'] = \Our\ApiConst::onlineGoodsDel;
$where['goods_id'] = $goodsId;
$goods = \Our\RedisHelper::cachedFunction(\Redis\Db4\GoodsRedisModel::getInstance(),array(&$this, 'find'),array($where,$field),\Our\ApiConst::oneHour,array($goodsId));
return $goods;
......@@ -127,6 +128,7 @@ class GoodsModel extends \DAO\AbstractModel {
}else{
$where['goods_state'] = \Our\ApiConst::onlineGoodsState;
$where['goods_verify'] = \Our\ApiConst::onlineGoodsVerify;
$where['is_del'] = \Our\ApiConst::onlineGoodsDel;
$where['goods_id'] = $goodsId;
$goods = $this->find($where,'goods_storage');
if($goods){
......@@ -285,11 +287,12 @@ class GoodsModel extends \DAO\AbstractModel {
if(empty($onlineStorageGoods)){
foreach ($goodsList as $key => $goods){
$onlineFlag = \Our\ApiConst::zero;
if($goods['goods_state'] == \Our\ApiConst::onlineGoodsState && $goods['goods_verify'] == \Our\ApiConst::onlineGoodsVerify){
if($goods['goods_state'] == \Our\ApiConst::onlineGoodsState && $goods['goods_verify'] == \Our\ApiConst::onlineGoodsVerify && $goods['is_del'] == \Our\ApiConst::onlineGoodsDel){
$onlineFlag = \Our\ApiConst::one;
}
unset($goodsList[$key]['goods_state']);
unset($goodsList[$key]['goods_verify']);
unset($goodsList[$key]['is_del']);
$data[$goods['goods_id']] = serialize(array('onlineFlag'=>$onlineFlag,'goodsStorage'=>$goods['goods_storage']));
}
$goodsRedis->tableHMSet($onlineStorageGoodsKey,$data,\Our\ApiConst::tenDaySecond);
......@@ -297,6 +300,7 @@ class GoodsModel extends \DAO\AbstractModel {
foreach ($goodsList as $key => $goods){
unset($goodsList[$key]['goods_state']);
unset($goodsList[$key]['goods_verify']);
unset($goodsList[$key]['is_del']);
}
}
......
application/models/DAO/Goods/StoreTopSaleGoods.php
View file @ 3c5d0ecc
......@@ -89,11 +89,11 @@ class StoreTopSaleGoodsModel extends \DAO\AbstractModel{
FROM
(
SELECT t1.*,(SELECT COUNT(*)+1 FROM han_goods_common WHERE store_id=t1.store_id AND sale_num>t1.sale_num) AS group_id
FROM han_goods_common t1 where t1.goods_state={1} and t1.goods_verify={2} and t1.store_id ={3}
FROM han_goods_common t1 where t1.goods_state={1} and t1.goods_verify={2} and t1.store_id ={3} and t1.is_del ={4}
) a
left join han_goods_score_statistics b
on a.goods_commonid = b.goods_commonid
WHERE a.group_id<=3 AND a.sale_num>0 ',\Our\ApiConst::defaultGoodsScore,\Our\ApiConst::onlineGoodsState,\Our\ApiConst::onlineGoodsVerify,$storeId);
WHERE a.group_id<=3 AND a.sale_num>0 ',\Our\ApiConst::defaultGoodsScore,\Our\ApiConst::onlineGoodsState,\Our\ApiConst::onlineGoodsVerify,$storeId,\Our\ApiConst::onlineGoodsState);
$list = $this->db->query($sql)->rows;
return $list;
}
......@@ -112,7 +112,7 @@ LEFT JOIN han_goods_score_statistics t2
on t1.goods_commonid = t2.goods_commonid
where t1.
) a
WHERE a.group_id<=3 AND a.sale_num>0 and a.goods_state=1 and a.goods_verify=1 ORDER BY a.store_id ,a.group_id';
WHERE a.group_id<=3 AND a.sale_num>0 and a.goods_state=1 and a.goods_verify=1 and a.is_del=0 ORDER BY a.store_id ,a.group_id';
$list = $this->db->query($sql)->rows;
return $list;
}
......
application/models/DAO/GoodsCommon.php
View file @ 3c5d0ecc
......@@ -78,7 +78,7 @@ class GoodsCommonModel extends \DAO\AbstractModel {
foreach ($where as $v){
$str .= '->where("'.$v.'")';
}
$str .="->where('goods_verify = 1')->where('goods_state = 1')";
$str .="->where('goods_verify = 1')->where('goods_state = 1')->where('is_del = 0')";
if($limit){
$str .= "->limit({$limit[0]},{$limit[1]})";
}
......@@ -114,7 +114,7 @@ class GoodsCommonModel extends \DAO\AbstractModel {
}
$str .= 'where ';
if($online){
$str .=" (goods_verify = 1) AND (goods_state = 1) AND ";
$str .=" (goods_verify = 1) AND (goods_state = 1) AND (is_del = 0) AND ";
}
$str .= '('.implode(') AND (',$where).')';
if($attrStr){
......@@ -183,9 +183,9 @@ class GoodsCommonModel extends \DAO\AbstractModel {
public function getCount($where,$attrStr=''){
$this->setDb($this->dbName);
if($attrStr){
return $this->db->from($this->_tableName)->join('han_goods_attribute_value','han_goods_attribute_value.goods_commonid = han_goods_common.goods_commonid')->where($where)->where($attrStr)->where(array('goods_state'=>1,'goods_verify'=>1))->fetchNum();
return $this->db->from($this->_tableName)->join('han_goods_attribute_value','han_goods_attribute_value.goods_commonid = han_goods_common.goods_commonid')->where($where)->where($attrStr)->where(array('goods_state'=>1,'goods_verify'=>1,'is_del'=>0))->fetchNum();
}
return $this->db->from($this->_tableName)->where(array('goods_state'=>1,'goods_verify'=>1))->where($where)->fetchNum();
return $this->db->from($this->_tableName)->where(array('goods_state'=>1,'goods_verify'=>1,'is_del'=>0))->where($where)->fetchNum();
}
/**
* 获取分享信息
......
application/models/DAO/Order/Order.php
View file @ 3c5d0ecc
......@@ -133,14 +133,20 @@ class OrderModel extends \DAO\AbstractModel
//判断订单是否允许取消
public function isAllowCancel($order)
{
if ($order['orderState'] == ApiConst::orderStateWaitPay || $order['orderState'] == ApiConst::orderStateWaitConfirm || (($order['orderState'] == ApiConst::orderStateWaitSend || $order['orderState'] == ApiConst::orderStateWaitRecieve) && $order['isReceivePayment'] == ApiConst::noreceivePayment)) {
if(($order['paymentTime']+ApiConst::tenMinSecond)<TIMESTAMP && $order['paymentTime']>ApiConst::zero ){
if($order['paymentTime']==ApiConst::zero){
if ($order['orderState'] == ApiConst::orderStateWaitPay || $order['orderState'] == ApiConst::orderStateWaitConfirm || (($order['orderState'] == ApiConst::orderStateWaitSend || $order['orderState'] == ApiConst::orderStateWaitRecieve) && $order['isReceivePayment'] == ApiConst::noreceivePayment)) {
return true;
} else {
return false;
}
return true;
} else {
return false;
}else{
if(($order['paymentTime']+ApiConst::tenMinSecond)<TIMESTAMP){
return false;
}else{
return true;
}
}
}
//列表转换
......@@ -214,6 +220,7 @@ class OrderModel extends \DAO\AbstractModel
public function update($where, $data)
{
$this->setDb(\Our\DbNameConst::masterDBConnectName);
$data['gmt_update']=TIMESTAMP;
return $this->db->update($this->_tableName)->where($where)->rows($data)->execute();
}
......@@ -787,14 +794,13 @@ class OrderModel extends \DAO\AbstractModel
}
//删除订单缓存
public function deleteOrderCache($memberId, $orderId = false, $stroeId = false, $deleteGetShopKeeperCountByStoreId = false, $deleteGetFavoritesCountByStoreId = false,$diliverymanId=0)
public function deleteOrderCache($memberId, $orderId = false, $stroeId = false, $deleteGetShopKeeperCountByStoreId = false, $deleteGetFavoritesCountByStoreId = false,$diliverymanId=ApiConst::zero)
{
if (!empty($memberId)) {
$this->deleteGetListByMemberId($memberId);
\DAO\MemberModel::getInstance()->deleteTotalCache($memberId);
}
if (!empty($stroeId)) {
if ($deleteGetShopKeeperCountByStoreId) {
$this->deleteGetShopKeeperCountByStoreId($stroeId);
......@@ -885,11 +891,12 @@ class OrderModel extends \DAO\AbstractModel
$limit = TIMESTAMP - $timeLimit;
$where[$timeField] = array('lt', $limit);
$where = $this->db->getSqlWhereByArray($where);
return $this->db->update($this->_tableName)->where($where)->rows(array('order_state' => $toState))->execute();
return $this->db->update($this->_tableName)->where($where)->rows(array('order_state' => $toState,'gmt_update'=>$toState))->execute();
}
/**
* 获取订单列表
* @param $where
......
application/models/DAO/Order/OrderGoods.php
View file @ 3c5d0ecc
......@@ -186,8 +186,13 @@ class OrderGoodsModel extends \DAO\AbstractModel {
'goodsPayPrice'=>$orderGoods['goodsPayPrice'],
);
}
//销售订单
public function getSaleOrderGoods($field,$updateTime,$pageIndex,$pageSize) {
$this->setDb($this->dbName);
$where = Common::format('sale_act_id >0 AND gmt_update >= {0}', $updateTime);
$list = $this->lists($where, '', $field, $pageIndex, $pageSize);
return $list;
}
public function insertAll($datas){
$this->setDb(\Our\DbNameConst::masterDBConnectName);
......
application/models/DAO/Order/QmDeliverymanLog.php
View file @ 3c5d0ecc
......@@ -101,6 +101,9 @@ class QmDeliverymanLogModel extends \DAO\AbstractModel
if ($type == ApiConst::deliveryStateWait) {
$where['delivery_state'] = ApiConst::deliveryStateComplete;
}
if($type==ApiConst::deliveryStateComplete){
$order = array('finish_time' => 'desc');
}
$list = $this->lists($where, $order, $this->fieldList, $pageIndex, $pageSize);
return $list;
}
......
application/models/DAO/Order/RefundReturn.php
View file @ 3c5d0ecc
......@@ -23,7 +23,8 @@ class RefundReturnModel extends \DAO\AbstractModel {
* @var string
*/
protected $_tableName = 'han_refund_return';
private $refundReturnField="seller_state,refund_state,is_platform_in,platform_state";
public $refundDetailField='is_platform_in as isPlatformIn,seller_state as sellerState,platform_state as platformState,refund_id as refundId,order_id as orderId,store_id as storeId,order_goods_id as orderGoodsId';
public $refundReturnField="seller_state,refund_state,is_platform_in,platform_state";
private $sumField="buyer_id as buyerId,store_id as storeId,goods_num as goodsNum,refund_amount as refundAmount,is_suc_refund as isSucRefund,gmt_update as gmtUpdate";
/**
* 主键
......@@ -82,10 +83,10 @@ class RefundReturnModel extends \DAO\AbstractModel {
$this->errorCode=CodeConfigModel::isNotExpressType;
$isReturn=FALSE;
}
// if($refundReturn['addressId']>ApiConst::zero){
// $this->errorCode=CodeConfigModel::isNotExpressType;
// $isReturn=FALSE;
// }
if($refundReturn['expressId']>ApiConst::zero){
$this->errorCode=CodeConfigModel::isNotExpressType;
$isReturn=FALSE;
}
return $isReturn;
}
/**
......@@ -99,6 +100,7 @@ class RefundReturnModel extends \DAO\AbstractModel {
$where['refund_id'] = $refundId;
$where['buyer_id'] = $buyerId;
$data['is_platform_in']=ApiConst::platIn;
$data['refund_state']=ApiConst::platProccess;
$data['platform_in_reason']=$applyMessage;
return $this->update($where, $data);
}
......@@ -136,35 +138,41 @@ class RefundReturnModel extends \DAO\AbstractModel {
}
public function getStatusExtent($returnRefund){
if($returnRefund['sellerState']==ApiConst::refundSellerAgree){
if($returnRefund['isSucRefund']==ApiConst::refundSuccess){
return OrderConst::refoundSuccess;
}
if($returnRefund['refundType']==ApiConst::refundTypeMoney){
return OrderConst::sellerAgree;
if($returnRefund['refundState']!=ApiConst::refundCompleted){
if($returnRefund['sellerState']==ApiConst::refundSellerAgree){
if($returnRefund['isSucRefund']==ApiConst::refundSuccess){
return OrderConst::refoundSuccess;
}
if($returnRefund['refundType']==ApiConst::refundTypeMoney){
return OrderConst::sellerAgree;
}
if($returnRefund['refundType']==ApiConst::refundTypeGoods){
if($returnRefund['isSucRefund']==ApiConst::refundSuccess){
return OrderConst::sellerAgreeGoods;
}else{
return OrderConst::waitSellerRecieve;
}
}
}
if($returnRefund['refundType']==ApiConst::refundTypeGoods){
if($returnRefund['sellerState']==ApiConst::refundSellerRefuse){
if($returnRefund['isSucRefund']==ApiConst::refundSuccess){
return OrderConst::sellerAgreeGoods;
}else{
return OrderConst::waitSellerRecieve;
return OrderConst::refoundSuccess;
}
if($returnRefund['isPlatformIn']==ApiConst::platIn){
return OrderConst::platFromProccess;
}
if($returnRefund['refundType']==ApiConst::refundTypeMoney){
return OrderConst::sellerRefuse;
}
if($returnRefund['refundType']==ApiConst::refundTypeGoods){
return OrderConst::sellerRefuseGoods;
}
}
}
if($returnRefund['sellerState']==ApiConst::refundSellerRefuse){
if($returnRefund['isSucRefund']==ApiConst::refundSuccess){
}else{
return OrderConst::refoundSuccess;
}
if($returnRefund['isPlatformIn']==ApiConst::platIn){
return OrderConst::platFromProccess;
}
if($returnRefund['refundType']==ApiConst::refundTypeMoney){
return OrderConst::sellerRefuse;
}
if($returnRefund['refundType']==ApiConst::refundTypeGoods){
return OrderConst::sellerRefuseGoods;
}
}
}
public function getRefundTextStatus($refundReturn){
$refundText='';
......@@ -172,6 +180,9 @@ class RefundReturnModel extends \DAO\AbstractModel {
case ApiConst::refundSellerVerify:$refundText=OrderConst::waitVerify;break;
case ApiConst::refundSellerAgree:$refundText=$this->getStatusExtent($refundReturn);break;
case ApiConst::refundSellerRefuse:$refundText=$this->getStatusExtent($refundReturn);break;
}
if($refundReturn['']){
}
return $refundText;
}
......
application/models/DAO/SaleOrder.php 100755 → 100644
View file @ 3c5d0ecc
......@@ -36,26 +36,26 @@ class SaleOrderModel extends \DAO\AbstractModel {
return $this->db->insert($this->_tableName)->query($sql);
}
public function insert($data){
$this->setDb(\Our\DbNameConst::masterDBConnectName);
$this->setDb($this->dbName);
return $this->db->insert($this->_tableName)->rows($data)->execute();
}
public function update($where,$data){
$this->setDb(\Our\DbNameConst::masterDBConnectName);
return $this->db->update($this->_tableName)->rows($data)->where($where)->execute();
$this->setDb($this->dbName);
return $this->db->update($this->_tableName)->where($where)->rows($data)->execute();
}
public function getOrderGoodsList($where,$field,$group = null,$limit = [],$group2 = null){
$this->setDb();
$this->setDb($this->dbName);
if($limit){
return $this->db->from($this->_tableName)->select($field)->where($where)->group($group)->group($group2)->limit($limit[0],$limit[1])->fetchAll();
}
return $this->db->from($this->_tableName)->select($field)->where($where)->group($group)->group($group2)->fetchAll();
}
public function getCount($where){
$this->setDb();
$this->setDb($this->dbName);
return $this->db->from($this->_tableName)->where($where)->fetchNum();
}
public function getCountGroup($where, $group) {
$this->setDb();
$this->setDb($this->dbName);
$sql = "SELECT COUNT(*) AS count from (SELECT id FROM {$this->_tableName} where {$where} GROUP BY {$group}) a";
$row = $this->db->query($sql);
if($row) {
......
application/models/DAO/Store.php
View file @ 3c5d0ecc
......@@ -268,7 +268,7 @@ class StoreModel extends \DAO\AbstractModel
public function get($storeId,$label = true)
{
$storeInfo = \Our\RedisHelper::cachedFunction(\Redis\Db6\StoreRedisModel::getInstance(),array(&$this, 'getInfoById'),array($storeId),\Our\ApiConst::sevenDaySecond,array($storeId));
if(!$storeInfo){
if(!$storeInfo || $storeInfo['open_flag'] == 0 || $storeInfo['store_state'] != 1){
\Error\ErrorModel::throwException(\Error\CodeConfigModel::storeNotExistOrClose);
}
......
application/models/Error/CodeConfig.php
View file @ 3c5d0ecc
......@@ -274,6 +274,7 @@ class CodeConfigModel {
const noExpressDeliveryForOrder1 = 30115;
const goodsNoStoreForCartOrOrder1 = 30116;
const platFormAreadyIn=300117;
//店铺相关错误码
//商品分类
......@@ -671,6 +672,7 @@ class CodeConfigModel {
self::notExsitOrder=>'订单不存在',
self::alreadyExsitRefundGoods=>'退款订单已经存在',
self::notAllowDelete=>'当前订单状态不允许删除',
self::platFormAreadyIn=>'您已经申请过平台介入',
self::deleteError=>'放入回收站失败，订单状态有误',
self::restoreError=>'永久删除、从回收站还原失败，订单状态有误',
self::shareError=>'分享失败，订单状态有误',
......
scripts/crontab/order/saleGoods.php 100755 → 100644
View file @ 3c5d0ecc
......@@ -2,7 +2,7 @@
/**
* 销售订单商品表写入
* 执行时间：每隔5分钟执行一次
* 执行时间：每隔2分钟执行一次
*/
define("APPLICATION_PATH", realpath(dirname(__FILE__) . '/../../../')); //指向public的上一级
......@@ -59,9 +59,9 @@ class cliSaleOrder extends basecli
if( file_exists( $this->lockFileName ) )
{
$stat = stat($this->lockFileName);
if( (TIMESTAMP - $stat['mtime']) > 1800 )
if( (TIMESTAMP - $stat['mtime']) > 1200 )
{
echo "文件被锁超过1800秒，被强制删除";
echo "文件被锁超过1200秒，被强制删除";
@unlink($this->lockFileName);
}
else
......
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