测试问题

application/models/Business/Goods/GroupSaleService.php

@@ -159,7 +159,10 @@ class GroupSaleServiceModel extends \Business\AbstractModel {
                             }else{
                                 $tempObj['blChangeFlag'] = \Our\ApiConst::one;
                             }
-                            $tempObj['goodsPrice'] = \Goods\GoodsUtil::getInstance()->getRealPrice($pBundling['blId'],null,null,\Our\ApiConst::addBundingToCart,\Our\DbNameConst::salveDBConnectName);
+                            $tempPrice = \Goods\GoodsUtil::getInstance()->getRealPrice($pBundling['blId'],null,null,\Our\ApiConst::addBundingToCart,\Our\DbNameConst::salveDBConnectName);
+                            if($tempPrice){
+                                $tempObj['goodsPrice'] = $tempPrice;
+                            }
                             $tempObj['goodsList'] = \Our\Common::convertUnderline($pBundling['goodsList']);
                             $tempObj['goodsOriginalPrice'] = $pBundling['sumPrice'];
                         } else if ($tempCart['type'] == \Our\ApiConst::addGoodsToCart) {
@@ -181,7 +184,7 @@ class GroupSaleServiceModel extends \Business\AbstractModel {
                                 $tempObj['goodsState'] = \Our\ApiConst::cartGoodsOffline;
                             }
                             $price = \Goods\GoodsUtil::getInstance()->getRealPrice($tempCart['goods_id'],$memberId);
-                            $tempObj['goodsPrice'] = $price?$price:intval($tempCart['goods_price']);
+                            $tempObj['goodsPrice'] = $price?$price:$tempObj['goodsPrice'];
                         }
                         $tempObj['goodsAttr'] = $goodsDao->getFormatGoodsAttr($tempCart['goods_spec']);
                         $tempObj['goodsMid'] = $tempCart['goods_mid'];

application/models/Business/Order/PaymentService.php

@@ -22,6 +22,11 @@ class PaymentServiceModel extends \Business\AbstractModel{
         if(!$data['paySn']){
             \Error\ErrorModel::throwException(\Error\CodeConfigModel::emptyPaySnForPay);
         }
+        $orderModel = \DAO\Order\OrderModel::getInstance();
+        $order = $orderModel->find(array('pay_sn'=>$data['paySn'],'payment_type'=>\Our\ApiConst::one,'order_state'=>\Our\ApiConst::orderStateWaitPay));
+        if(!$order){
+            \Error\ErrorModel::throwException(\Error\CodeConfigModel::noOrderWaitToPay);
+        }
     }
 
     public function updateOrderToPayedWxLite(){

application/models/Error/CodeConfig.php

@@ -277,6 +277,7 @@ class CodeConfigModel {
     const platFormAreadyIn=300117;
 
     const noEnoughStorageForBundlingGoods = 30118;
+    const noOrderWaitToPay = 30119;
     //店铺相关错误码
 
     //商品分类
@@ -746,6 +747,7 @@ class CodeConfigModel {
             self::noExpressDeliveryForOrder1 => '该店铺未配置快递配送',
             self::goodsNoStoreForCartOrOrder1 => '商品库存紧张,您的购买数量太多啦',
             self::noEnoughStorageForBundlingGoods =>'组合销售库存紧张,您购买的数量太多啦',
+            self::noOrderWaitToPay => '您的订单已支付,请勿重复重复',
             //销售员
             self::emptySaleGoodsId=>'商品id不能为空',
             self::emptySaleGoods=>'销售商品不存在',