kq

application/models/Business/Order/OrderService.php

@@ -776,11 +776,22 @@ class OrderServiceModel extends \Business\AbstractModel
         file_put_contents($this->baseDir . \Our\PathConst::orderCloseWaitRecieveOrder, $endTime);
     }
 
-    public function updateOrderGoodsStoregeByOrderIds($orderIds){
+    public function updateOrderGoodsStoregeByOrderIds($orderIds,$orderGoodsId=false){
         $orderGoodsDao = \DAO\Order\OrderGoodsModel::getInstance(DbNameConst::masterDBConnectName);
         $orderConfirmUtilDao=OrderConfirmUtil::getInstance(DbNameConst::masterDBConnectName);
         //更新商品库存
-        $orderGoods = $orderGoodsDao->getOrderGoodsByOrderIds($orderIds, $this->getGoodsDetailField());
+        $orderGoodses = $orderGoodsDao->getOrderGoodsByOrderIds($orderIds, $this->getGoodsDetailField());
+        $orderGoods=array();
+        if(!empty($orderGoodsId)){
+            foreach($orderGoodses as $orderGood){
+                    if($orderGood['recId']==$orderGoodsId){
+                        array_push($orderGoods,$orderGood);
+                    }
+            }
+        }
+        if(empty($orderGoods)){
+            $orderGoods=$orderGoodses;
+        }
         $storeCartsList=array();
         $storeCarts=array();
         $storeCarts['storeCarts']=array();

application/models/Business/User/ShareService.php

@@ -61,6 +61,12 @@ class ShareServiceModel extends \Business\AbstractModel
                 $data['imgUrl']=$storeDao->getStoreLabelSrc($store['store_label']);
                 $data['storeName']=$store['store_name'];
                 $data['desc']=$store['store_notice'];
+
+                $data['storeWorkingtime']=$store['store_workingtime'];
+                $data['buyerDistribution']=$store['buyer_distribution'];
+                $data['sellerDistribution']=$store['seller_distribution'];
+                $data['startShippingPrice']=$store['start_shipping_price'];
+                $data['freeShippingPrice']=$store['free_shipping_price'];
             }
 
         }