refund

application/library/Our/DescribeConst.php

@@ -152,6 +152,9 @@ class DescribeConst
     const refund='退款';
     const refundRetund='退货';
 
+    const sellerRefuseReturn='卖家拒绝退货';
+    const sellerAgreeReturn='卖家同意退货';
+
     //用户订单送达消息
     const reacheRemindTitle='你的订单卖家已经送达';
     const reacheRemindContent='你有新的订单号为{0}的订单已经已经送达';

application/models/Error/CodeConfig.php

@@ -130,6 +130,7 @@ class CodeConfigModel
     const emptyScanStoreId = 40010;
     const emptyScanStoreInfo = 40011;
     const saveScanStoreInfoFailed = 40012;
+    const storeNotOpen = 40013;
 
     //购物车
     const wrongCartType = 50001;
@@ -314,7 +315,9 @@ class CodeConfigModel
 
     const orderWxPayError = 30137;
     const orderWxPaySignError = 30138;
-
+    const wrongRefundState=300139;
+    const updateIsRefundFail=300140;
+    const updateRefundStateNameFail=300141;
     //店铺相关错误码
 
     //商品分类
@@ -549,6 +552,7 @@ class CodeConfigModel
             self::emptyScanStoreId => '扫码关注店铺ID为空',
             self::emptyScanStoreInfo => '扫码关注店铺不存在',
             self::saveScanStoreInfoFailed => '扫码店铺保存失败',
+            self::storeNotOpen => '店铺还未配置开启',
 
             //购物车相关
             self::wrongCartType => '加入购物车类型不能为空',
@@ -809,6 +813,9 @@ class CodeConfigModel
             self::selfGoodsForStoreOrder => '店主不能购买自己的商品',
             self::orderWxPayError => '微信支付尚未开通',
             self::orderWxPaySignError => '微信支付签名错误',
+            self::wrongRefundState=>'订单状态有误',
+            self::updateIsRefundFail=>'更新is_refund失败',
+            self::updateRefundStateNameFail=>'更新order表refund_state_name失败',
             //销售员
             self::emptySaleGoodsId => '商品id不能为空',
             self::emptySaleGoods => '销售商品不存在',

application/modules/Client/controllers/Shopkeeper.php

@@ -202,16 +202,16 @@ class ShopkeeperController extends \Our\Controller_AbstractClient {
      * 查询配送员
      *
      */
-      public function searchDeliveryAction(){
-          $shopkeeperService=\Business\Store\ShopkeeperServiceModel::getInstance();
-          $res=$shopkeeperService->getDiliveryMan($this->req['data']['mobile']);
-          $res=$res?$res:new \stdClass();
-          $this->success($res,\Our\DescribeConst::successMessage);
-      }
-   /**
-    * 单一属性商品库存预警
-    * @author king
-    */
+    public function searchDeliveryAction(){
+        $shopkeeperService=\Business\Store\ShopkeeperServiceModel::getInstance();
+        $res=$shopkeeperService->getDiliveryMan($this->req['data']['mobile']);
+        $res=$res?$res:new \stdClass();
+        $this->success($res,\Our\DescribeConst::successMessage);
+    }
+    /**
+     * 单一属性商品库存预警
+     * @author king
+     */
     public function warningAction(){
         $goodsCommonService = \Business\Goods\GoodsCommonServiceModel::getInstance();
         $pageIndex=$this->getPageIndex();
@@ -259,8 +259,13 @@ class ShopkeeperController extends \Our\Controller_AbstractClient {
         $refundService=\Business\Order\RefundServiceModel::getInstance();
         $refundAmount = floatval($this->req['data']['refundAmount']);
         $text = trim($this->req['data']['text']);
-        $res = $refundService->refund($this->storeId, $this->sellerId, $this->sellerName, $refundId, $refundAmount, $text);
-        $this->success($res);
+        $isGiveUp=$this->req['data']['isGiveUp']?$this->req['data']['isGiveUp']:\Our\ApiConst::zero;
+        $res = $refundService->refund($this->storeId, $this->sellerId, $this->sellerName, $refundId, $refundAmount, $text,\Our\ApiConst::refundSellerAgree,$isGiveUp);
+        if($res){
+            $this->success('操作成功');
+        }
+        ErrorModel::throwException(CodeConfigModel::commonError);
+
     }
 
     /**
@@ -278,9 +283,9 @@ class ShopkeeperController extends \Our\Controller_AbstractClient {
     }
 
     /**
- * 确认收货
- * @throws Exception
- */
+     * 确认收货
+     * @throws Exception
+     */
     public function confirmReceiveAction(){
         $refundId= intval($this->req['data']['refundId']);
         if(!$refundId) {