goods

application/library/Our/NameConst.php

@@ -181,7 +181,7 @@ class NameConst {
 
     const logOut='logOut';
 
-    const versionOne = '1.0.0';
+    const versionOne = '1.0.1';
     const versionDefault = '1.0';
 
 

application/models/Business/Order/OrderService.php

@@ -27,7 +27,7 @@ use Our\RedisHelper;
 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 $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";
 
@@ -780,12 +780,14 @@ class OrderServiceModel extends \Business\AbstractModel
         $orderConfirmUtilDao=OrderConfirmUtil::getInstance(DbNameConst::masterDBConnectName);
         $storeCartsList=array();
         $storeCarts=array();
+        $convertGoods=array();
         $storeCarts['storeCarts']=array();
         foreach($orderGoods as $orderGood){
             $orderGood['type']=!empty($orderGood['goodsGroup'])? \Our\ApiConst::addBundingToCart:\Our\ApiConst::addGoodsToCart;
             $orderGood['goodsNum']=$orderGood['goodsNum'];
             $orderGood['goodsList']=\Our\Common::isSerialized($orderGood['goodsGroup'])?unserialize($orderGood['goodsGroup']):array();
-            array_push($storeCarts['storeCarts'],$orderGood);
+            $convertGoods[$orderGood['storeId']]=$orderGood;
+            array_push($storeCarts['storeCarts'],$convertGoods);
         }
         if(!empty($storeCarts['storeCarts'])){
             array_push($storeCartsList,$storeCarts);