Merge branch 'master_dev' of git.shenbd.com:qm-develop/shenbd into master_dev

application/models/Business/Order/OrderService.php

@@ -336,6 +336,8 @@ class OrderServiceModel extends \Business\AbstractModel
         //$isAllowCance = true;
         if ($isAllowCancel) {
             $res = $orderDao->updateStatusByOrderId($orderId, ApiConst::orderStateCancel,false,ApiConst::cancelOrderBySelf);
+            $orderDao->setDb($orderDao->dbName);
+            $orderDao->db->doTransaction();
             if ($res) {
                 $this->updateOrderGoodsStoregeByOrderIds(array($orderId));
                 $order['refundOrderNo']=$refundReturnDao->getRefundsn($order['storeId']);
@@ -346,6 +348,10 @@ class OrderServiceModel extends \Business\AbstractModel
                         //$orderGoodsUpdateData['refund_state_name']='退款成功';
                         $orderGoodsUpdateData['is_refund']=ApiConst::refundSuccess;
                         $orderGoodsDao->update($where,$orderGoodsUpdateData);
+                        $orderDao->db->doCommit();
+                    }else{
+                        $orderDao->db->doRollback();
+                        ErrorModel::throwException(CodeConfigModel::cancelRefundMoneyError);
                     }
                 }
                 $push=\Our\Push::getInstance();

application/models/Error/CodeConfig.php

@@ -326,6 +326,7 @@ class CodeConfigModel
     const beyondRecieverTime=300144;
     const payTypeUpdateError = 30145;
     const beyongRefundAmount = 300146;
+    const cancelRefundMoneyError = 300147;
     //店铺相关错误码
 
     //商品分类
@@ -834,6 +835,7 @@ class CodeConfigModel
             self::beyondRecieverTime=>'设置收货时间不能早于当前时间',
             self::payTypeUpdateError=> '更新支付类型失败',
             self::beyongRefundAmount=>'退款金额不能超过可退款金额',
+            self::cancelRefundMoneyError=>'退款有误，请于商家联系',
             //销售员
             self::emptySaleGoodsId => '商品id不能为空',
             self::emptySaleGoods => '销售商品不存在',