goods

application/models/Business/Goods/GoodsCommonService.php

@@ -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;
                         }
                     }
                 }
@@ -857,55 +857,48 @@ 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::orderConfirmTaskAddTime;
+        $addTime = file_get_contents($savePath);
+        $addTime = $addTime ? $addTime : ApiConst::zero;
+        $orderDao = \DAO\Order\OrderGoodsModel::getInstance(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', $addTime, $pageBegin, \Our\PageConst::taskPageSize, 'send_time');
+            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');
                 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;
+                    $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'];
-                }
-                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'];
-                    }
+                    $insert['is_refund'] = $orderGoods['is_refund'];
                 }
                 if($saleOrder){
-                    \DAO\SaleOrderModel::getInstance()->update(array('order_goods_id'=>$orderGoodsId),$update);
+                    \DAO\SaleOrderModel::getInstance()->update(array('order_goods_id'=>$orderGoods['rec_id']),$update);
                 }else{
                     \DAO\SaleOrderModel::getInstance()->insert($insert);
                 }
             }
-        }
+            $pageBegin++;
+        } while (!empty($orders['list']));
+        file_put_contents($savePath, $time);
     }
 
     /**

application/models/Business/Store/StoreService.php

@@ -175,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;
     }
     /**
@@ -190,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) {
@@ -202,7 +201,7 @@ 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);
@@ -222,7 +221,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/DAO/Order/Order.php

@@ -890,6 +890,7 @@ class OrderModel extends \DAO\AbstractModel
 
     }
 
+
     /**
      * 获取订单列表
      * @param $where

application/models/DAO/Order/OrderGoods.php

@@ -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 >= {1}', $updateTime);
+        $list = $this->lists($where, '', $field, $pageIndex, $pageSize);
+        return $list;
+    }
 
     public function insertAll($datas){
         $this->setDb(\Our\DbNameConst::masterDBConnectName);