Merge pull request 'dev' (#13) from dev into master

Reviewed-on: http://git.excellentkk.cn/mkm/shop-php/pulls/13

app/common/dao/BaseDao.php

@@ -307,4 +307,16 @@ abstract class BaseDao
                     $query->where('is_del', $isDel);
                 })->count($this->getPk()) > 0;
     }
+
+    /**
+     * 批量新增或更新
+     * @param $list
+     * @return Collection
+     * @throws \Exception
+     */
+    public function saveAll($list)
+    {
+        return ($this->getModel()::getInstance())->saveAll($list);
+    }
+
 }

app/common/dao/store/order/StoreCartDao.php

@@ -27,6 +27,9 @@ use think\model\Relation;
 class StoreCartDao extends BaseDao
 {
 
+    const SOURCE_STORE_CLOUD = 101; //店铺内云商品
+    const SOURCE_CLOUD = 102; //云仓内店铺商品
+
     protected function getModel(): string
     {
         return StoreCart::class;

app/common/dao/store/product/CloudProductDao.php

@@ -0,0 +1,30 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+// +----------------------------------------------------------------------
+// | Author: CRMEB Team <admin@crmeb.com>
+// +----------------------------------------------------------------------
+
+namespace app\common\dao\store\product;
+
+use app\common\dao\BaseDao;
+use app\common\model\store\product\CloudProduct;
+
+class CloudProductDao extends BaseDao
+{
+
+    protected function getModel(): string
+    {
+        return CloudProduct::class;
+    }
+
+    public function search(array $where)
+    {
+    }
+
+}

app/common/dao/store/product/ProductDao.php

@@ -124,7 +124,7 @@ class ProductDao extends BaseDao
             });
         }
         $query->withSearch($keyArray, $whereArr)
-            ->Join('StoreSpu U', 'Product.product_id = U.product_id')->where('U.product_type', $where['product_type'] ?? 0)
+            ->Join('StoreSpu U', 'Product.product_id = U.product_id')
             ->when(($merId !== null), function ($query) use ($merId) {
                 $query->where('Product.mer_id', $merId);
             })
@@ -238,6 +238,7 @@ class ProductDao extends BaseDao
         }
         app()->make(SpuRepository::class)->getSearch(['product_id' => $id])->update(['is_del' => 1, 'status' => 0]);
         event('product.delete',compact('id'));
+        event('product.sell', ['product_id' => [$id]]);
     }
 
     /**

app/common/dao/store/product/SpuDao.php

@@ -144,6 +144,15 @@ class SpuDao extends  BaseDao
             ->when(isset($where['mer_status']) && $where['mer_status'] !== '',function($query)use($where){
                 $query->where('mer_status',$where['mer_status']);
             })
+            ->when(isset($where['is_used']) && $where['is_used'] !== '',function($query)use($where){
+                $query->where('is_used',$where['is_used']);
+            })
+            ->when(isset($where['status']) && $where['status'] !== '',function($query)use($where){
+                $query->where('P.status',$where['status']);
+            })
+            ->when(isset($where['is_show']) && $where['is_show'] !== '',function($query)use($where){
+                $query->where('is_show',$where['is_show']);
+            })
             ->when(isset($where['spu_status']) && $where['spu_status'] !== '',function($query)use($where){
                 $query->where('S.status',$where['spu_status']);
             })

app/common/dao/system/merchant/MerchantDao.php

@@ -52,9 +52,11 @@ class MerchantDao extends BaseDao
             ->when(isset($where['is_trader']) && $where['is_trader'] !== '', function ($query) use ($where) {
                 $query->where('is_trader', $where['is_trader']);
             })
+            ->when(isset($where['area_id']) && $where['area_id'] !== '', function ($query) use ($where) {
+                $query->where('area_id', $where['area_id']);
+            })
             ->when(isset($where['street_id']) && $where['street_id'] !== '', function ($query) use ($where) {
-                $mer_id = Db::name('merchant_address')->where('street_id', $where['street_id'])->column('mer_id');
-                $query->whereIn('mer_id',$mer_id ?: '' );
+                $query->where('street_id', $where['street_id']);
             })
             ->when(isset($where['is_best']) && $where['is_best'] !== '', function ($query) use ($where) {
                 $query->where('is_best', $where['is_best']);
@@ -295,4 +297,14 @@ class MerchantDao extends BaseDao
         ]);
     }
 
+    public function getValidMerchant($where)
+    {
+        $where = array_merge([
+            'is_del' => 0,
+            'status' => 1,
+            'mer_state' => 1,
+        ], $where);
+        return $this->getModel()::getInstance()->where($where);
+    }
+
 }

app/common/model/store/product/CloudProduct.php

@@ -0,0 +1,33 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+// +----------------------------------------------------------------------
+// | Author: CRMEB Team <admin@crmeb.com>
+// +----------------------------------------------------------------------
+
+namespace app\common\model\store\product;
+
+use app\common\model\BaseModel;
+
+class CloudProduct extends BaseModel
+{
+
+    const CacheKey = 'CloudMerchantSpu_%s'; //店铺云商品缓存key
+    const TakenKey = 'CloudMerchantSpu_%s_page'; //已经取过的页码缓存key
+
+    public static function tablePk(): string
+    {
+        return 'product_id';
+    }
+
+    public static function tableName(): string
+    {
+        return 'cloud_product';
+    }
+
+}

app/common/model/store/product/Product.php

@@ -37,6 +37,9 @@ class Product extends BaseModel
 
     protected $deleteTime = 'is_del';
     protected $defaultSoftDelete = 0;
+
+    const IS_SHOW = 1; //上架
+    const IS_NOT_SHOW = 0; //下架
     /**
      * @Author:Qinii
      * @Date: 2020/5/8
@@ -553,4 +556,29 @@ class Product extends BaseModel
     {
         $query->whereIn('Product.temp_id',$value);
     }
+
+    /**
+     * 商品允许展示的条件
+     * @return array
+     */
+    public static function searchEnable()
+    {
+        return [
+            'mer_status' => 1,
+            'status' => 1,
+            'is_del' => 0,
+            'is_show' => self::IS_SHOW,
+            'is_used' => 1
+        ];
+    }
+
+    /**
+     * 商品是否允许展示
+     * @return bool
+     */
+    public function isEnable()
+    {
+        return $this->mer_status == 1 && $this->status == 1 && $this->is_del == 0 && $this->is_show == self::IS_SHOW && $this->is_used == 1;
+    }
+
 }

app/common/model/store/product/ProductAttrValue.php

@@ -53,16 +53,17 @@ class ProductAttrValue extends BaseModel
 
     public function getSvipPriceAttr()
     {
-        try {
-            if ($this->product->product_type == 0 && $this->product->show_svip_price && $this->product->svip_price_type == 1) {
-                $rate = merchantConfig($this->product->mer_id,'svip_store_rate');
-                $svip_store_rate = $rate > 0 ? bcdiv($rate,100,2) : 0;
-                return bcmul($this->price, $svip_store_rate,2);
+        if ($this->product){
+            try {
+                if ($this->product->product_type == 0 && $this->product->show_svip_price && $this->product->svip_price_type == 1) {
+                    $rate = merchantConfig($this->product->mer_id,'svip_store_rate');
+                    $svip_store_rate = $rate > 0 ? bcdiv($rate,100,2) : 0;
+                    return bcmul($this->price, $svip_store_rate,2);
+                }
+            }catch (\Exception $e){
+                Log::error([$e->getMessage(),$e->getLine(),$e->getFile()]);
             }
-        }catch (\Exception $e){
-            Log::error([$e->getMessage(),$e->getLine(),$e->getFile()]);
         }
-
         return $this->getData('svip_price');
     }
 

app/common/model/system/merchant/Merchant.php

@@ -28,6 +28,34 @@ use app\common\repositories\store\StoreActivityRepository;
 class Merchant extends BaseModel
 {
 
+    const TypeStore = 10; //镇街店铺
+    const TypeCloudWarehouse = 11; //镇级云仓
+    const TypeSupplyChain = 12; //市级供应链
+    const TypePlatform = 13; //市级云仓
+    const TypeTeamServer = 14; //小组服务团
+    const TypeVillageServer = 15; //村服务团队
+    const TypeTownServer = 16; //镇服务团队
+
+    const TypeMap = [
+        self::TypeStore => '镇街店铺',
+        self::TypeCloudWarehouse => '里海云仓',
+        self::TypeSupplyChain => '市级供应链',
+        self::TypePlatform => '供销平台',
+        self::TypeTeamServer => '小组服务团',
+        self::TypeVillageServer => '村服务团队',
+        self::TypeTownServer => '镇服务团队',
+    ];
+    const AllowApply = [ //允许申请的类型
+        self::TypeStore,
+        self::TypeSupplyChain,
+    ];
+    const AllowDisplay = [ //允许展示的类型
+        self::TypeStore,
+        self::TypeCloudWarehouse,
+        self::TypeSupplyChain,
+        self::TypePlatform,
+    ];
+
     /**
      * @return string
      * @author xaboy
@@ -104,6 +132,7 @@ class Merchant extends BaseModel
     {
         $list = Product::where('mer_id', $this['mer_id'])
             ->where((new ProductDao())->productTypeShow(98))
+            ->where('is_show', Product::IS_SHOW)
             ->field('mer_id,product_id,product_type,store_name,image,price,is_show,status,is_gift_bag,is_good,cate_id')
             ->order('sort DESC, create_time DESC')
             ->limit(10)

app/common/repositories/store/order/StoreGroupOrderRepository.php

@@ -35,6 +35,9 @@ use think\model\Relation;
  */
 class StoreGroupOrderRepository extends BaseRepository
 {
+
+    public $getAll = false;
+
     /**
      * StoreGroupOrderRepository constructor.
      * @param StoreGroupOrderDao $dao
@@ -77,7 +80,8 @@ class StoreGroupOrderRepository extends BaseRepository
      */
     public function detail($uid, $id, $flag = true)
     {
-        return $this->search(['paid' => 0, 'uid' => $uid])->where('group_order_id', $id)->with(['orderList' => function (Relation $query) use ($flag) {
+        $where = $this->getAll ? ['uid' => $uid] : ['paid' => 0, 'uid' => $uid];
+        return $this->search($where)->where('group_order_id', $id)->with(['orderList' => function (Relation $query) use ($flag) {
             $query->when($flag, function ($query) {
                 $query->field('order_id,group_order_id,mer_id,order_sn,activity_type,pay_price,order_extend,order_type,is_virtual');
             })->with(['merchant' => function ($query) use ($flag) {

app/common/repositories/store/order/StoreOrderCreateRepository.php

@@ -2,6 +2,7 @@
 
 namespace app\common\repositories\store\order;
 
+use app\common\dao\store\order\StoreCartDao;
 use app\common\repositories\store\coupon\StoreCouponRepository;
 use app\common\repositories\store\coupon\StoreCouponUserRepository;
 use app\common\repositories\store\product\ProductAssistSkuRepository;
@@ -1324,6 +1325,8 @@ class StoreOrderCreateRepository extends StoreOrderRepository
                         'integral' => $cart['integral'] ? bcdiv($cart['integral']['use'], $cart['cart_num'], 0) : 0,
                         'integral_total' => $cart['integral'] ? $cart['integral']['use'] : 0,
                         'product_type' => $cart['product_type'],
+                        'source' => $cart['source'],
+                        'source_id' => $cart['source_id'],
                         'cart_info' => json_encode($order_cart)
                     ];
                 }

app/common/repositories/store/order/StoreOrderRepository.php

@@ -12,10 +12,8 @@
 namespace app\common\repositories\store\order;
 
 use app\common\dao\store\order\StoreOrderDao;
-use app\common\dao\system\merchant\FinancialRecordDao;
 use app\common\model\store\order\StoreGroupOrder;
 use app\common\model\store\order\StoreOrder;
-use app\common\model\system\merchant\Merchant;
 use app\common\model\user\User;
 use app\common\repositories\BaseRepository;
 use app\common\repositories\delivery\DeliveryOrderRepository;
@@ -46,6 +44,7 @@ use crmeb\services\CombinePayService;
 use crmeb\services\CrmebServeServices;
 use crmeb\services\ExpressService;
 use crmeb\services\PayService;
+use crmeb\services\payTool\PayTool;
 use crmeb\services\printer\Printer;
 use crmeb\services\QrcodeService;
 use crmeb\services\SpreadsheetExcelService;
@@ -53,7 +52,6 @@ use crmeb\services\SwooleTaskService;
 use Exception;
 use FormBuilder\Factory\Elm;
 use FormBuilder\Form;
-use http\Exception\InvalidArgumentException;
 use think\db\exception\DataNotFoundException;
 use think\db\exception\DbException;
 use think\db\exception\ModelNotFoundException;
@@ -76,7 +74,7 @@ class StoreOrderRepository extends BaseRepository
     /**
      * 支付类型
      */
-    const PAY_TYPE = ['balance', 'weixin', 'routine', 'h5', 'alipay', 'alipayQr', 'weixinQr'];
+    const PAY_TYPE = ['balance', 'weixin', 'routine', 'h5', 'alipay', 'alipayQr', 'weixinQr', 'scrcu'];
 
     const TYPE_SN_ORDER = 'wxo';
     const TYPE_SN_PRESELL = 'wxp';
@@ -115,6 +113,10 @@ class StoreOrderRepository extends BaseRepository
         event('order.pay.before', compact('groupOrder', 'type', 'isApp'));
         if (in_array($type, ['weixin', 'weixinApp', 'routine', 'h5', 'weixinQr'], true) && systemConfig('open_wx_combine')) {
             $service = new CombinePayService($type, $groupOrder->getCombinePayParams());
+        } elseif ($type == 'scrcu') {
+            $payTool = PayTool::instance($type);
+            $groupOrder = $payTool->format($groupOrder);
+            return app('json')->status($type, $payTool->pay($groupOrder));
         } else {
             $service = new PayService($type, $groupOrder->getPayParams($type === 'alipay' ? $return_url : ''));
         }
@@ -300,6 +302,8 @@ class StoreOrderRepository extends BaseRepository
                     $_order_rate = bcmul($_payPrice, $commission_rate, 2);
 
                     $_payPrice = bcsub($_payPrice, $_order_rate, 2);
+                    event('order.paySuccessOrder', compact('order','_order_rate'));
+
                 }
 
                 if (!$presell) {
@@ -347,6 +351,13 @@ class StoreOrderRepository extends BaseRepository
                             'financial_record_sn' => $financeSn . ($i++)
                         ];
                     }
+                    if ($_payPrice > 0) {
+                        /** @var MerchantRepository $merchantRepo */
+                        $merchantRepo = app()->make(MerchantRepository::class);
+                        $merchantRepo->merId = $order->mer_id;
+                        $merchantRepo->forceMargin = false;
+                        [$_payPrice, $finance, $increase] = $merchantRepo->autoMargin($_payPrice, $order, $finance, $financeSn, $i++);
+                    }
                     $finance[] = [
                         'order_id' => $order->order_id,
                         'order_sn' => $order->order_sn,
@@ -375,11 +386,6 @@ class StoreOrderRepository extends BaseRepository
                         ];
                         $_payPrice = bcadd($_payPrice, $order->platform_coupon_price, 2);
                     }
-
-                    if ($_payPrice > 0) {
-                        $this->autoMargin($_payPrice, $order, $finance, $financeSn, $i);
-                    }
-
                     if (!$is_combine) {
                         app()->make(MerchantRepository::class)->addLockMoney($order->mer_id, 'order', $order->order_id, $_payPrice);
                     }
@@ -456,39 +462,6 @@ class StoreOrderRepository extends BaseRepository
 
     }
 
-    /**
-     * 自动扣除保证金
-     * @param $income
-     * @param $order
-     * @param $finance
-     * @param $financeSn
-     * @param $index
-     * @return void
-     */
-    public function autoMargin(&$income, $order, &$finance, $financeSn, $index = 0)
-    {
-        $merchant = Merchant::find($order->mer_id);
-        //商户保证金未完全缴纳且设置了自动扣除比例
-        if ($merchant['margin'] > $merchant['paid_margin'] && $merchant['auto_margin_rate'] > 0 && $merchant['auto_margin_rate'] <= 100) {
-            $margin = bcmul($income, $merchant['auto_margin_rate'] / 100, 2);
-            $margin = min(bcsub($merchant['margin'], $merchant['paid_margin'], 2), $margin);
-            $income = max(bcsub($income, $margin, 2), 0);
-            $finance[] = [
-                'order_id' => $order->order_id,
-                'order_sn' => $order->order_sn,
-                'user_info' => $order->user->nickname,
-                'user_id' => $order->uid,
-                'financial_type' => 'auto_margin',
-                'financial_pm' => FinancialRecordDao::Outlay,
-                'type' => FinancialRecordDao::TypePlatform,
-                'number' => $margin,
-                'mer_id' => $order->mer_id,
-                'financial_record_sn' => $financeSn . $index
-            ];
-            $merchant->save(['paid_margin' => bcadd($merchant['paid_margin'], $margin, 2)]);
-        }
-    }
-
     /**
      *  自动打印
      * @Author:Qinii

app/common/repositories/store/order/StoreRefundOrderRepository.php

@@ -1293,6 +1293,9 @@ class StoreRefundOrderRepository extends BaseRepository
             'financial_type' => 'refund_charge',
             'number' => $refundRate,
         ], $res->mer_id);
+
+        event('refund.after', compact('id', 'res'));
+
         return $res;
     }
 

app/common/repositories/store/product/ProductRepository.php

@@ -14,6 +14,7 @@
 namespace app\common\repositories\store\product;
 
 use app\common\model\store\product\ProductLabel;
+use app\common\model\store\product\Spu;
 use app\common\model\user\User;
 use app\common\repositories\community\CommunityRepository;
 use app\common\repositories\store\coupon\StoreCouponRepository;
@@ -72,8 +73,8 @@ class ProductRepository extends BaseRepository
         ['svip_price_type',0],
         ['params',[]],
     ];
-    protected $admin_filed = 'Product.product_id,Product.mer_id,brand_id,spec_type,unit_name,mer_status,rate,reply_count,store_info,cate_id,Product.image,slider_image,Product.store_name,Product.keyword,Product.sort,U.rank,Product.is_show,Product.sales,Product.price,extension_type,refusal,cost,ot_price,stock,is_gift_bag,Product.care_count,Product.status,is_used,Product.create_time,Product.product_type,old_product_id,star,ficti,integral_total,integral_price_total,sys_labels,param_temp_id,mer_svip_status,svip_price,svip_price_type';
-    protected $filed = 'Product.bar_code,Product.product_id,Product.mer_id,brand_id,unit_name,spec_type,mer_status,rate,reply_count,store_info,cate_id,Product.image,slider_image,Product.store_name,Product.keyword,Product.sort,Product.is_show,Product.sales,Product.price,extension_type,refusal,cost,ot_price,stock,is_gift_bag,Product.care_count,Product.status,is_used,Product.create_time,Product.product_type,old_product_id,integral_total,integral_price_total,mer_labels,Product.is_good,Product.is_del,type,param_temp_id,mer_svip_status,svip_price,svip_price_type';
+    protected $admin_filed = 'Product.product_id,Product.mer_id,brand_id,spec_type,unit_name,mer_status,rate,reply_count,store_info,cate_id,Product.image,slider_image,Product.store_name,Product.keyword,Product.sort,U.rank,Product.is_show,Product.sales,Product.price,extension_type,refusal,cost,ot_price,stock,is_gift_bag,Product.care_count,Product.status,is_used,Product.create_time,Product.product_type,old_product_id,star,ficti,integral_total,integral_price_total,sys_labels,param_temp_id,mer_svip_status,svip_price,svip_price_type,update_time';
+    protected $filed = 'Product.bar_code,Product.product_id,Product.mer_id,brand_id,unit_name,spec_type,mer_status,rate,reply_count,store_info,cate_id,Product.image,slider_image,Product.store_name,Product.keyword,Product.sort,Product.is_show,Product.sales,Product.price,extension_type,refusal,cost,ot_price,stock,is_gift_bag,Product.care_count,Product.status,is_used,Product.create_time,Product.product_type,old_product_id,integral_total,integral_price_total,mer_labels,Product.is_good,Product.is_del,type,param_temp_id,mer_svip_status,svip_price,svip_price_type,update_time';
 
     const  NOTIC_MSG  = [
             1  => [
@@ -82,6 +83,7 @@ class ProductRepository extends BaseRepository
                 '2' => 'product_presell_success',
                 '3' => 'product_assist_success',
                 '4' => 'product_group_success',
+                '98' => 'product_success',
                 'msg' => '审核通过'
             ],
             -1 => [
@@ -90,6 +92,7 @@ class ProductRepository extends BaseRepository
                 '2' => 'product_presell_fail',
                 '3' => 'product_assist_fail',
                 '4' => 'product_group_fail',
+                '98' => 'product_fail',
                 'msg' => '审核失败'
             ],
             -2 => [
@@ -98,6 +101,7 @@ class ProductRepository extends BaseRepository
                 '2' => 'product_presell_fail',
                 '3' => 'product_assist_fail',
                 '4' => 'product_group_fail',
+                '98' => 'product_fail',
                 'msg' => '被下架'
             ],
         ];
@@ -242,7 +246,7 @@ class ProductRepository extends BaseRepository
                 app()->make(SpuRepository::class)->create($product, $result->product_id, $activity_id, $productType);
             }
             $product = $result;
-            event('product.create',compact('product'));
+            event('product.create',compact('product', 'data', 'conType'));
             return $result->product_id;
         });
     }
@@ -284,6 +288,9 @@ class ProductRepository extends BaseRepository
             }
             app()->make(SpuRepository::class)->baseUpdate($spuData, $id, 0, $productType);
             event('product.update',compact('id'));
+            if ($data['status'] == 0) {
+                event('product.sell', ['product_id' => [$id]]);
+            }
             app()->make(SpuRepository::class)->changeStatus($id, $productType);
         });
     }
@@ -301,7 +308,7 @@ class ProductRepository extends BaseRepository
         $settleParams['attr'] = $this->setAttr($data['attr'], $id);
         $data['price'] = $settleParams['data']['price'];
         unset($data['attrValue'],$data['attr'],$data['mer_cate_id']);
-        $ret = app()->make(SpuRepository::class)->getSearch(['product_id' => $id, 'product_type' => 0,])->find();
+        $ret = Spu::getInstance()->where('product_id', $id)->whereIn('product_type',[0, 98])->find();
         Db::transaction(function () use ($id, $data, $settleParams,$ret) {
             $this->save($id, $settleParams, null, [], 0);
             app()->make(SpuRepository::class)->update($ret->spu_id,['price' => $data['price']]);
@@ -471,9 +478,7 @@ class ProductRepository extends BaseRepository
             'pay_limit' => $data['pay_limit'] ?? 0,
             'svip_price_type' => $data['svip_price_type'] ?? 0,
         ];
-        if($result['spec_type'] == 0){
-            $result['bar_code'] = $data['bar_code'] ?? '';
-        }
+        $result['bar_code'] = $data['attrValue'][0]['bar_code'] ?? '';
         if (isset($data['mer_id']))
             $result['mer_id'] = $data['mer_id'];
         if (isset($data['old_product_id']))
@@ -785,11 +790,11 @@ class ProductRepository extends BaseRepository
                 break;
         }
         if ($productType == 0) {
-            $where['product_type'] = $productType;
+            $where[] = empty($merId) ? ['product_type', 'in', [0, 98]] : ['product_type', 'in', [0]];
             if (!$merId) $where['is_gift_bag'] = 0;
         }
-        if ($productType == 1||$productType==98) {
-            $where['product_type'] = $productType;
+        if ($productType == 1) {
+            $where[] = ['product_type', 'in', [$productType]];
         }
         if ($productType == 10) {
             $where['is_gift_bag'] = 1;
@@ -1148,7 +1153,9 @@ class ProductRepository extends BaseRepository
         ];
 
         $append = ['guaranteeTemplate','params'];
-        $where['product_type'] = $productType;
+        if (empty($where['product_id']) || $productType != 0) {
+            $where['product_type'] = $productType;
+        }
         $res = $this->dao->getWhere($where, $field, $with);
         if (!$res)  return [];
         switch ($res['product_type']) {
@@ -1569,12 +1576,7 @@ class ProductRepository extends BaseRepository
             throw new ValidateException('商品spu更新出错');
         }else{
             if ($product->product_type==0){
-                $RedisCacheService = app()->make(RedisCacheService::class);
-                if ($status==1){
-                    $RedisCacheService->SADD ('CloudMerchanSpu'.$product['mer_id'], $product['product_id']);
-                }else{
-                    $RedisCacheService->SREM ('CloudMerchanSpu'.$product['mer_id'], $product['product_id']);
-                }
+                event('product.sell', ['product_id' => [$id]]);
             }
         }
         Db::commit();
@@ -1587,8 +1589,12 @@ class ProductRepository extends BaseRepository
         $products = $this->dao->getSearch([])->where('product_id','in', $id)->select();
         if (!$products)
             throw new ValidateException('数据不存在');
+        $productIds = [];
         foreach ($products as $product) {
             $product_type = $product['product_type'];
+            if ($product_type == 0) {
+                $productIds[] = $product['product_id'];
+            }
             if ($merId && $product['mer_id'] !== $merId)
                 throw new ValidateException('商品不属于您');
             if ($status == 1 && $product['product_type'] == 2)
@@ -1596,20 +1602,18 @@ class ProductRepository extends BaseRepository
             if ($status == 1 && $product['product_type'] == 3)
                 throw new ValidateException('ID：'.$product->product_id . ' 商品正在参与助力活动');
         }
-        $this->dao->updates($id,[$field => $status]);
-        if ($product->product_type==0){
-            $RedisCacheService = app()->make(RedisCacheService::class);
-            if ($status==1){
-                foreach ($id as $k=>$v){
-                    $RedisCacheService->SADD ('CloudMerchanSpu'.$product['mer_id'], $v);
-                }
-            }else{
-                foreach ($id as $k=>$v){
-                    $RedisCacheService->SREM ('CloudMerchanSpu'.$product['mer_id'], $v);
-                }
+        Db::startTrans();
+        try {
+            if ($this->dao->updates($id,[$field => $status]) === false) {
+                throw new \Exception('商品操作出错');
             }
+            event('product.sell', ['product_id' => $productIds]);
+            Db::commit();
+            Queue::push(ChangeSpuStatusJob::class,['id' => $id,'product_type'=> $product_type]);
+        } catch (\Exception $e) {
+            Db::rollback();
+            throw new ValidateException($e->getMessage());
         }
-        Queue::push(ChangeSpuStatusJob::class,['id' => $id,'product_type'=> $product_type]);
     }
 
     /**
@@ -1625,7 +1629,7 @@ class ProductRepository extends BaseRepository
         $this->dao->update($id, $data);
         $status = $data['status'];
         $type = self::NOTIC_MSG[$data['status']][$product['product_type']];
-        $message = '您有1个' . ($product['product_type'] ? '秒杀商品' : '商品') . self::NOTIC_MSG[$data['status']]['msg'];
+        $message = '您有1个' . ($product['product_type'] == 1 ? '秒杀商品' : '商品') . self::NOTIC_MSG[$data['status']]['msg'];
         SwooleTaskService::merchant('notice', [
             'type' => $type,
             'data' => [
@@ -1635,6 +1639,7 @@ class ProductRepository extends BaseRepository
             ]
         ], $product['mer_id']);
         app()->make(SpuRepository::class)->changeStatus($id,$product->product_type);
+        event('product.sell', ['product_id' => [$id]]);
     }
 
     /**
@@ -1664,6 +1669,7 @@ class ProductRepository extends BaseRepository
         $this->dao->updates($id, $data);
         Queue(ChangeSpuStatusJob::class, ['id' => $id, 'product_type' => $product_type]);
         event('product.status',compact('id','data'));
+        event('product.sell', ['product_id' => $id]);
     }
 
 

app/common/repositories/store/product/SpuRepository.php

@@ -10,6 +10,8 @@
 // +----------------------------------------------------------------------
 namespace app\common\repositories\store\product;
 
+use app\common\model\store\product\CloudProduct;
+use app\common\model\store\product\Product;
 use app\common\repositories\store\coupon\StoreCouponProductRepository;
 use app\common\repositories\store\coupon\StoreCouponRepository;
 use app\common\repositories\store\StoreActivityRepository;
@@ -18,7 +20,9 @@ use crmeb\jobs\SendSmsJob;
 use crmeb\jobs\SyncProductTopJob;
 use crmeb\services\CopyCommand;
 use crmeb\services\RedisCacheService;
+use Fastknife\Utils\AesUtils;
 use think\exception\ValidateException;
+use think\facade\Db;
 use think\facade\Log;
 use app\common\repositories\BaseRepository;
 use app\common\dao\store\product\SpuDao;
@@ -32,6 +36,9 @@ class SpuRepository extends BaseRepository
     public $dao;
     public $merchantFiled = 'mer_id,mer_name,mer_avatar,is_trader,mer_info,mer_keyword,type_id';
     public $productFiled  = 'P.bar_code,S.product_id,S.store_name,S.image,activity_id,S.keyword,S.price,S.mer_id,spu_id,S.status,store_info,brand_id,cate_id,unit_name,S.star,S.rank,S.sort,sales,S.product_type,rate,reply_count,extension_type,S.sys_labels,S.mer_labels,P.delivery_way,P.delivery_free,P.ot_price,svip_price_type,stock,mer_svip_status';
+
+    public $userInfo;
+
     public function __construct(SpuDao $dao)
     {
         $this->dao = $dao;
@@ -135,8 +142,7 @@ class SpuRepository extends BaseRepository
                 app()->make(UserVisitRepository::class)->searchProduct($userInfo ? $userInfo['uid'] : 0, $where['keyword'], (int)($where['mer_id'] ?? 0));
             }
         }
-        $where['spu_status'] = 1;
-        $where['mer_status'] = 1;
+        $where = array_merge(Product::searchEnable(), $where);
         $query = $this->dao->search($where);
 
         $query->with([
@@ -157,33 +163,97 @@ class SpuRepository extends BaseRepository
         return compact('count', 'list');
     }
 
-    public function getApiCloudSearch($where, $page, $limit)
+    public function getApiCloudSearch($where, $page, $limit, $rand = true)
     {
-        $where['spu_status'] = 1;
-        $where['mer_status'] = 1;
-        $RedisCacheService = app()->make(RedisCacheService::class);
-        $exists=$RedisCacheService->exists('CloudMerchanSpu'.$where['mer_id']);
-        if ($exists){
-            $Spu_arr=$RedisCacheService->SRANDMEMBER('CloudMerchanSpu'.$where['mer_id'], 10);
-            $where['product_id'] =$Spu_arr;
+        $where = array_merge(Product::searchEnable(), $where);
+        if (!empty($where['keyword'])) {
+            if (preg_match('/^(\/@[1-9]{1}).*\*\//', $where['keyword'])) {
+                $command = app()->make(CopyCommand::class)->getMassage($where['keyword']);
+                if (!$command || in_array($command['type'], [30, 40])) return ['count' => 0, 'list' => []];
+                if ($this->userInfo && $command['uid']) app()->make(UserRepository::class)->bindSpread($this->userInfo, $command['uid']);
+                $where['spu_id'] = $command['id'];
+                unset($where['keyword']);
+            } else {
+                app()->make(UserVisitRepository::class)->searchProduct($this->userInfo ? $this->userInfo['uid'] : 0, $where['keyword'], (int)($where['mer_id'] ?? 0));
+            }
         }
+
+        if ($rand) {
+            $dataKey = sprintf(CloudProduct::CacheKey, $where['mer_id']);
+            $RedisCacheService = app()->make(RedisCacheService::class);
+            $exists = $RedisCacheService->exists($dataKey);
+            if (!$exists) {
+                $productIds = Db::name('cloud_product')->where('mer_id', $where['mer_id'])->where('status', 1)->limit(100)->column('product_id');
+                foreach ($productIds as $productId) {
+                    $RedisCacheService->SADD($dataKey, $productId);
+                }
+            }
+            $where['product_id'] = $this->getSpuFromCache($where['mer_id'], $page, $limit);
+            unset($where['mer_id'], $where['page']);
+            $page = 1;
+        }
+
+        $entryMerId = $where['entry_mer_id'] ?? '';
+        unset($where['entry_mer_id']);
         $query = $this->dao->search($where);
 
-        $count = 0;
-//        $Sql=$query->page($page, $limit)->setOption('field', [])->field($this->productFiled)->fetchSql(true);
+        $count = $query->count();
         $query->with([
             'merchant' => function ($query) {
                 $query->field($this->merchantFiled)->with(['type_name']);
             },
             'issetCoupon',
         ]);
-        $list = $query->setOption('field', [])->field($this->productFiled)->select();
+        $list = $query->setOption('field', [])->field($this->productFiled)->page($page)->limit($limit)->select();
         $append = ['stop_time','svip_price','show_svip_info','is_svip_price'];
 
         $list->append($append);
         $list = $this->getBorderList($list);
+        foreach ($list as &$item) {
+            $item['referer'] = AesUtils::encrypt($entryMerId . '|' . rand(1, 100), env('app_key'));
+        }
         return compact('count', 'list');
     }
+
+    /**
+     * 从缓存中随机取出不重复数据
+     * @param $merId
+     * @param $page
+     * @param $limit
+     * @return array
+     * @throws \RedisException
+     */
+    public function getSpuFromCache($merId, $page, $limit): array
+    {
+        $dataKey = sprintf(CloudProduct::CacheKey, $merId);
+        $takenKey = sprintf(CloudProduct::TakenKey, $merId);
+        /** @var RedisCacheService $redis */
+        $redis = app()->make(RedisCacheService::class);
+        $taken = $redis->hGet($takenKey, $page);
+        $taken = empty($taken) ? [] : explode(',', $taken);
+        if (!empty($taken)) {
+            return $taken;
+        }
+        $all = $redis->sMembers($dataKey);
+        $takenPage = $redis->hGetAll($takenKey);
+        $allTaken = [];
+        foreach ($takenPage as $value) {
+            $allTaken = array_merge(explode(',', $value), $allTaken);
+        }
+        $diff = array_diff($all, $allTaken);
+        if (empty($diff)) {
+            return [];
+        }
+        $productIds = [];
+        $indexes = count($diff) >= $limit ? array_rand($diff, $limit) : array_keys($diff);
+        foreach ($indexes as $index) {
+            $productIds[] = $diff[$index];
+        }
+        $redis->hSet($takenKey, $page, implode(',', $productIds));
+        $redis->expire($takenKey, 120);
+        return $productIds;
+    }
+
     public function getBorderList($list)
     {
         $make = app()->make(StoreActivityRepository::class);
@@ -396,8 +466,10 @@ class SpuRepository extends BaseRepository
                     $where = [
                         'activity_id' => 0,
                         'product_id' => $id,
-                        'product_type' => $productType,
                     ];
+                    if (empty($id) || $productType != 0) {
+                        $where['product_type'] = $productType;
+                    }
                     break;
                 case 1:
                     $_make = app()->make(StoreSeckillActiveRepository::class);

app/common/repositories/system/financial/FinancialRepository.php

@@ -317,14 +317,14 @@ class FinancialRepository extends BaseRepository
         $res = app()->make(MerchantRepository::class)->get($merId);
         if ($res['is_margin'] == -1) throw new ValidateException('请勿重复申请');
 
-        if (!in_array($res['is_margin'],[10,-10]) || $res['margin'] <= 0)
+        if (!in_array($res['is_margin'],[10,-10]) || $res['paid_margin'] <= 0)
             throw new ValidateException('无可退保证金');
 
         $order = app()->make(ServeOrderRepository::class)->getWhere([
-                'mer_id' => $res['mer_id'],
-                'status' => 1,
-                'type'   => 10,
-            ]);
+            'mer_id' => $res['mer_id'],
+            'status' => 1,
+            'type'   => 10,
+        ]);
         if (!$order) throw new ValidateException('未查询到支付订单');
         $financial_account = [
             'name'     => '保证金退款',
@@ -341,7 +341,7 @@ class FinancialRepository extends BaseRepository
             'mer_id' => $merId,
             'mer_money' => 0,
             'financial_sn' => $sn,
-            'extract_money' => $res['margin'],
+            'extract_money' => $res['paid_margin'],
             'financial_type' => 1,
             'financial_account' => json_encode($financial_account,JSON_UNESCAPED_UNICODE),
             'financial_status' => 0,
@@ -373,7 +373,7 @@ class FinancialRepository extends BaseRepository
         $where['is_del'] = 0;
         $query = $this->dao->search($where)->with([
             'merchant' => function($query){
-                $query->field('mer_id,mer_name,is_trader,mer_avatar,type_id,mer_phone,mer_address,is_margin,margin,real_name');
+                $query->field('mer_id,mer_name,is_trader,mer_avatar,type_id,mer_phone,mer_address,is_margin,margin,real_name,paid_margin');
                 $query->with([
                     'merchantType',
                     'marginOrder' => function($query){
@@ -383,7 +383,9 @@ class FinancialRepository extends BaseRepository
             }
         ]);
         $count = $query->count();
-        $list = $query->page($page, $limit)->select();
+        $list = $query->page($page, $limit)->select()->each(function ($item){
+            return $item->merchant->margin = $item->merchant->paid_margin;
+        });
 
         return compact('count','list');
     }
@@ -629,7 +631,7 @@ class FinancialRepository extends BaseRepository
                 break;
         }
 
-       return $this->dao->update($id, $data);
+        return $this->dao->update($id, $data);
     }
 
     public function refundShow($id)

app/common/repositories/system/merchant/FinancialRecordRepository.php

@@ -45,7 +45,7 @@ class FinancialRecordRepository extends BaseRepository
      * @author Qinii
      * @day 5/7/21
      */
-    public function getList(array $where,int $page,int $limit)
+    public function getList(array $where, int $page, int $limit)
     {
         $query = $this->dao->search($where)->order('create_time DESC');
         $count = $query->count();
@@ -61,7 +61,7 @@ class FinancialRecordRepository extends BaseRepository
      * @author Qinii
      * @day 5/7/21
      */
-    public function  getFiniancialTitle(?int $merId,array $where)
+    public function getFiniancialTitle(?int $merId, array $where)
     {
         /**
          * 平台支出
@@ -71,19 +71,19 @@ class FinancialRecordRepository extends BaseRepository
          * 退回收入 refund_order + （佣金 brokerage_one,brokerage_two  -  退回佣金 refund_brokerage_two,refund_brokerage_one ） + （手续费  order_charge + 预售手续费 presell_charge  - 平台退给商户的手续费 refund_charge ）
          */
         $where['is_mer'] = $merId;
-        if($merId){
+        if ($merId) {
             //商户收入
-            $income = $this->dao->search($where)->where('financial_type','in',['order','mer_presell'])->sum('number');
+            $income = $this->dao->search($where)->where('financial_type', 'in', ['order', 'mer_presell'])->sum('number');
             //商户支出
-            $expend_ = $this->dao->search($where)->where('financial_type','in',['refund_order','brokerage_one','brokerage_two','order_charge','presell_charge'])->sum('number');
-            $_expend = $this->dao->search($where)->where('financial_type','in',['refund_charge','refund_brokerage_two','refund_brokerage_one'])->sum('number');
-            $expend = bcsub($expend_,$_expend,2);
+            $expend_ = $this->dao->search($where)->where('financial_type', 'in', ['refund_order', 'brokerage_one', 'brokerage_two', 'order_charge', 'presell_charge'])->sum('number');
+            $_expend = $this->dao->search($where)->where('financial_type', 'in', ['refund_charge', 'refund_brokerage_two', 'refund_brokerage_one'])->sum('number');
+            $expend = bcsub($expend_, $_expend, 2);
             $msg = '商户';
-        }else{
+        } else {
             //平台收入
-            $income = $this->dao->search($where)->where('financial_type','in',['order','order_presell','presell'])->sum('number');
+            $income = $this->dao->search($where)->where('financial_type', 'in', ['order', 'order_presell', 'presell'])->sum('number');
             //平台支出
-            $expend = $this->dao->search($where)->where('financial_type','in',['brokerage_one','brokerage_two','order_true','refund_charge','presell_true','order_platform_coupon','order_svip_coupon'])->sum('number');
+            $expend = $this->dao->search($where)->where('financial_type', 'in', ['brokerage_one', 'brokerage_two', 'order_true', 'refund_charge', 'presell_true', 'order_platform_coupon', 'order_svip_coupon'])->sum('number');
             $msg = '平台';
         }
         $data = [
@@ -91,13 +91,13 @@ class FinancialRecordRepository extends BaseRepository
                 'className' => 'el-icon-s-goods',
                 'count' => $income,
                 'field' => '元',
-                'name' => $msg.'收入'
+                'name' => $msg . '收入'
             ],
             [
                 'className' => 'el-icon-s-order',
                 'count' => $expend,
                 'field' => '元',
-                'name' => $msg.'支出'
+                'name' => $msg . '支出'
             ],
         ];
         return $data;
@@ -113,26 +113,42 @@ class FinancialRecordRepository extends BaseRepository
     public function getAdminTitle($where)
     {
         //订单收入总金额
-        $count = $this->dao->search($where)->where('financial_type','in',['order','order_presell','presell'])->sum('number');
+        $count = $this->dao->search($where)->where('financial_type', 'in', ['order', 'order_presell', 'presell'])->sum('number');
         //退款支出金额
-        $refund_order = $this->dao->search($where)->where('financial_type','refund_order')->sum('number');
+        $refund_order = $this->dao->search($where)->where('financial_type', 'refund_order')->sum('number');
         //佣金支出金额
-        $brokerage_ = $this->dao->search($where)->where('financial_type','in',['brokerage_one','brokerage_two'])->sum('number');
-        $_brokerage = $this->dao->search($where)->where('financial_type','in',['refund_brokerage_two','refund_brokerage_one'])->sum('number');
-        $brokerage = bcsub($brokerage_,$_brokerage,2);
+        $brokerage_ = $this->dao->search($where)->where('financial_type', 'in', ['brokerage_one', 'brokerage_two'])->sum('number');
+        $_brokerage = $this->dao->search($where)->where('financial_type', 'in', ['refund_brokerage_two', 'refund_brokerage_one'])->sum('number');
+        $brokerage = bcsub($brokerage_, $_brokerage, 2);
+        
+        //入口店铺佣金
+        $entry_merchant=$this->dao->search($where)->where('financial_type', 'commission_to_entry_merchant')->sum('number');
+        $entry_merchant_refund=$this->dao->search($where)->where('financial_type', 'commission_to_entry_merchant_refund')->sum('number');
+        //云仓库佣金
+        $cloud_warehouse=$this->dao->search($where)->where('financial_type', 'commission_to_cloud_warehouse')->sum('number');
+        $cloud_warehouse_refund=$this->dao->search($where)->where('financial_type', 'commission_to_cloud_warehouse_refund')->sum('number');
+        //服务团队佣金
+        $service_team=$this->dao->search($where)->where('financial_type', 'commission_to_service_team')->sum('number');
+        $service_team_refund=$this->dao->search($where)->where('financial_type', 'commission_to_service_team_refund')->sum('number');
+        //村团队佣金
+        $village=$this->dao->search($where)->where('financial_type', 'commission_to_village')->sum('number');
+        $village_refund=$this->dao->search($where)->where('financial_type', 'commission_to_village_refund')->sum('number');
+        //镇佣金
+        $town=$this->dao->search($where)->where('financial_type', 'commission_to_town')->sum('number');
+        $town_refund=$this->dao->search($where)->where('financial_type', 'commission_to_town_refund')->sum('number');
         //平台手续费
-        $charge_ = $this->dao->search($where)->where('financial_type','in',['order_charge','presell_charge'])->sum('number');
-        $_charge = $this->dao->search($where)->where('financial_type','refund_charge')->sum('number');
-        $charge = bcsub($charge_,$_charge,2);
+        $charge_ = $this->dao->search($where)->where('financial_type', 'in', ['order_charge', 'presell_charge'])->sum('number');
+        $_charge = $this->dao->search($where)->where('financial_type', 'refund_charge')->sum('number');
+        $charge = bcsub($charge_, $_charge, 2);
         //优惠券费用 ,'order_platform_coupon','order_svip_coupon'
-        $coupon = $this->dao->search($where)->where('financial_type','in',['order_platform_coupon','order_svip_coupon'])->sum('number');
+        $coupon = $this->dao->search($where)->where('financial_type', 'in', ['order_platform_coupon', 'order_svip_coupon'])->sum('number');
         //充值金额
         $bill_where = [
             'status' => 1,
             'date' => $where['date'],
             'category' => 'now_money',
         ];
-        $bill = app()->make(UserBillRepository::class)->search($bill_where)->where('type','in',['sys_inc_money','recharge'])->sum('number');
+        $bill = app()->make(UserBillRepository::class)->search($bill_where)->where('type', 'in', ['sys_inc_money', 'recharge'])->sum('number');
         //充值消费金额
         $bill_where = [
             'pm' => 0,
@@ -140,7 +156,7 @@ class FinancialRecordRepository extends BaseRepository
             'date' => $where['date'],
             'category' => 'now_money',
         ];
-        $_bill = app()->make(UserBillRepository::class)->search($bill_where)->where('type','in',['presell','pay_product','sys_dec_money'])->sum('number');
+        $_bill = app()->make(UserBillRepository::class)->search($bill_where)->where('type', 'in', ['presell', 'pay_product', 'sys_dec_money'])->sum('number');
         //产生交易的商户数
         $mer_number = $this->dao->search($where)->group('mer_id')->count();
 
@@ -192,9 +208,39 @@ class FinancialRecordRepository extends BaseRepository
                 'count' => $coupon,
                 'field' => '元',
                 'name' => '优惠券金额'
-            ]
+            ],[
+                'className' => 'el-icon-s-order',
+                'count' => bcsub($entry_merchant,$entry_merchant_refund,2),
+                'field' => '元',
+                'name' => '入口商户佣金'
+            ],[
+                'className' => 'el-icon-s-order',
+                'count' => bcsub($cloud_warehouse,$cloud_warehouse_refund,2),
+                'field' => '元',
+                'name' => '云仓库佣金'
+            ],[
+                'className' => 'el-icon-s-order',
+                'count' => bcsub($service_team,$service_team_refund,2),
+                'field' => '元',
+                'name' => '小组服务佣金'
+            ],[
+                'className' => 'el-icon-s-order',
+                'count' => bcsub($village,$village_refund,2),
+                'field' => '元',
+                'name' => '村佣金'
+            ],[
+                'className' => 'el-icon-s-order',
+                'count' => bcsub($town,$town_refund,2),
+                'field' => '元',
+                'name' => '镇佣金'
+            ],[
+                'className' => 'el-icon-s-order',
+                'count' =>bcsub($charge, bcadd(bcadd(bcadd($entry_merchant, $cloud_warehouse, 2), $service_team, 2), $village, 2), 2),
+                'field' => '元',
+                'name' => '平台剩余手续费'
+            ],
         ];
-       return compact('stat');
+        return compact('stat');
     }
 
     /**
@@ -207,25 +253,28 @@ class FinancialRecordRepository extends BaseRepository
     public function getMerchantTitle($where)
     {
         //商户收入
-        $count = $this->dao->search($where)->where('financial_type','in',['order','mer_presell'])->sum('number');
+        $count = $this->dao->search($where)->where('financial_type', 'in', ['order', 'mer_presell'])->sum('number');
+        //保证金
+        $auto_margin = $this->dao->search($where)->where('financial_type', 'auto_margin')->sum('number');
+        $auto_margin_refund = $this->dao->search($where)->where('financial_type', 'auto_margin_refund')->sum('number');
         //平台优惠券
-        $coupon = $this->dao->search($where)->where('financial_type','in',['order_platform_coupon','order_svip_coupon'])->sum('number');
+        $coupon = $this->dao->search($where)->where('financial_type', 'in', ['order_platform_coupon', 'order_svip_coupon'])->sum('number');
         //商户余额
         $mer_money = app()->make(MerchantRepository::class)->search(['mer_id' => $where['is_mer']])->value('mer_money');
         //最低提现额度
         $extract_minimum_line = systemConfig('extract_minimum_line');
         //商户可提现金额
-        $_line = bcsub($mer_money,$extract_minimum_line,2);
+        $_line = bcsub($mer_money, $extract_minimum_line, 2);
         //退款支出金额
-        $refund_order = $this->dao->search($where)->where('financial_type','refund_order')->sum('number');
+        $refund_order = $this->dao->search($where)->where('financial_type', 'refund_order')->sum('number');
         //佣金支出金额
-        $_brokerage = $this->dao->search($where)->where('financial_type','in',['brokerage_one','brokerage_two'])->sum('number');
-        $refund_brokerage = $this->dao->search($where)->where('financial_type','in',['refund_brokerage_one','refund_brokerage_two'])->sum('number');
-        $brokerage = bcsub($_brokerage,$refund_brokerage,2);
+        $_brokerage = $this->dao->search($where)->where('financial_type', 'in', ['brokerage_one', 'brokerage_two'])->sum('number');
+        $refund_brokerage = $this->dao->search($where)->where('financial_type', 'in', ['refund_brokerage_one', 'refund_brokerage_two'])->sum('number');
+        $brokerage = bcsub($_brokerage, $refund_brokerage, 2);
         //平台手续费
-        $refund_true = $this->dao->search($where)->where('financial_type','in',['order_charge','presell_charge'])->sum('number');
-        $order_charge = $this->dao->search($where)->where('financial_type','refund_charge')->sum('number');
-        $charge = bcsub($refund_true,$order_charge,2);
+        $refund_true = $this->dao->search($where)->where('financial_type', 'in', ['order_charge', 'presell_charge'])->sum('number');
+        $order_charge = $this->dao->search($where)->where('financial_type', 'refund_charge')->sum('number');
+        $charge = bcsub($refund_true, $order_charge, 2);
         //商户可提现金额
 //        $bill_order = app()->make(StoreOrderRepository::class)->search(['paid' => 1,'date' => $where['date'],'pay_type' => 0])->sum('pay_price');
         $merLockMoney = app()->make(UserBillRepository::class)->merchantLickMoney($where['is_mer']);
@@ -244,7 +293,7 @@ class FinancialRecordRepository extends BaseRepository
             ],
             [
                 'className' => 'el-icon-s-cooperation',
-                'count' => ($_line < 0) ?  0 : $_line,
+                'count' => ($_line < 0) ? 0 : $_line,
                 'field' => '元',
                 'name' => '商户可提现金额'
             ],
@@ -277,6 +326,11 @@ class FinancialRecordRepository extends BaseRepository
                 'count' => $merLockMoney,
                 'field' => '元',
                 'name' => '商户冻结金额'
+            ], [
+                'className' => 'el-icon-s-cooperation',
+                'count' => bcsub($auto_margin,$auto_margin_refund,2),
+                'field' => '元',
+                'name' => '商户保证金金额'
             ],
         ];
         return compact('stat');
@@ -291,19 +345,19 @@ class FinancialRecordRepository extends BaseRepository
      * @author Qinii
      * @day 3/23/21
      */
-    public function getAdminList(array $where,int $page,int $limit)
+    public function getAdminList(array $where, int $page, int $limit, $merchant = [])
     {
         //日
-        if($where['type'] == 1){
+        if ($where['type'] == 1) {
             $field = Db::raw('from_unixtime(unix_timestamp(create_time),\'%Y-%m-%d\') as time');
-        }else{
-        //月
-            if(!empty($where['date'])){
+        } else {
+            //月
+            if (!empty($where['date'])) {
                 list($startTime, $endTime) = explode('-', $where['date']);
                 $firstday = date('Y/m/01', strtotime($startTime));
                 $lastday_ = date('Y/m/01', strtotime($endTime));
                 $lastday = date('Y/m/d', strtotime("$lastday_ +1 month -1 day"));
-               $where['date'] = $firstday.'-'.$lastday;
+                $where['date'] = $firstday . '-' . $lastday;
             }
             $field = Db::raw('from_unixtime(unix_timestamp(create_time),\'%Y-%m\') as time');
         }
@@ -311,36 +365,34 @@ class FinancialRecordRepository extends BaseRepository
 
         $query = $this->dao->search($where)->field($field)->group("time")->order('create_time DESC');
         $count = $query->count();
-        $list = $query->page($page,$limit)->select()->each(function ($item) use($where){
-
-                $key = $where['is_mer'] ? $where['is_mer'].'_financial_record_list_'.$item['time'] : 'sys_financial_record_list_'.$item['time'];
-                if(($where['type'] == 1 && ($item['time'] == date('Y-m-d',time()))) || ($where['type'] == 2 && ($item['time'] == date('Y-m',time())))){
-                    $income = ($this->countIncome($where['type'],$where,$item['time']))['number'] ;
-                    $expend = ($this->countExpend($where['type'],$where,$item['time']))['number'] ;
+        $list = $query->page($page, $limit)->select()->each(function ($item) use ($where, $merchant) {
+            $key = $where['is_mer'] ? $where['is_mer'] . '_financial_record_list_' . $item['time'] : 'sys_financial_record_list_' . $item['time'];
+            if (($where['type'] == 1 && ($item['time'] == date('Y-m-d', time()))) || ($where['type'] == 2 && ($item['time'] == date('Y-m', time())))) {
+                $income = ($this->countIncome($where['type'], $where, $item['time'],$merchant))['number'];
+                $expend = ($this->countExpend($where['type'], $where, $item['time'],$merchant))['number'];
+                $ret = [
+                    'income' => $income,
+                    'expend' => $expend,
+                    'charge' => bcsub($income, $expend, 2),
+                ];
+            } else {
+                if (!$ret = Cache::get($key)) {
+                    $income = ($this->countIncome($where['type'], $where, $item['time'],$merchant))['number'];
+                    $expend = ($this->countExpend($where['type'], $where, $item['time'],$merchant))['number'];
                     $ret = [
                         'income' => $income,
-                        'expend' => $expend ,
-                        'charge' => bcsub($income,$expend,2),
+                        'expend' => $expend,
+                        'charge' => bcsub($income, $expend, 2),
                     ];
-
-                }else{
-                    if(!$ret = Cache::get($key)){
-                        $income = ($this->countIncome($where['type'],$where,$item['time']))['number'] ;
-                        $expend = ($this->countExpend($where['type'],$where,$item['time']))['number'] ;
-                        $ret = [
-                            'income' => $income,
-                            'expend' => $expend ,
-                            'charge' => bcsub($income,$expend,2),
-                        ];
-                        Cache::tag('system')->set($key,$ret,24 * 3600);
-                    }
+                    Cache::tag('system')->set($key, $ret, 24 * 3600);
                 }
-                $item['income'] = $ret['income'];
-                $item['expend'] = $ret['expend'];
-                $item['charge'] = $ret['charge'];
-            });
+            }
+            $item['income'] = $ret['income'];
+            $item['expend'] = $ret['expend'];
+            $item['charge'] = $ret['charge'];
+        });
 
-        return compact('count','list');
+        return compact('count', 'list');
     }
 
     /**
@@ -351,46 +403,47 @@ class FinancialRecordRepository extends BaseRepository
      * @author Qinii
      * @day 3/23/21
      */
-    public function adminDetail(int $type,array $where)
+    public function adminDetail(int $type, array $where)
     {
-        $date_ = strtotime($where['date']);unset($where['date']);
-        $date = ($type == 1) ? date('Y-m-d',$date_) : date('Y-m',$date_);
-        $income = $this->countIncome($type,$where,$date);
-        $bill = $this->countBill($type,$date);
-        $expend = $this->countExpend($type,$where,$date);
-        $charge = bcsub($income['number'],$expend['number'],2);
-        $data['date']   = $date;
+        $date_ = strtotime($where['date']);
+        unset($where['date']);
+        $date = ($type == 1) ? date('Y-m-d', $date_) : date('Y-m', $date_);
+        $income = $this->countIncome($type, $where, $date);
+        $bill = $this->countBill($type, $date);
+        $expend = $this->countExpend($type, $where, $date);
+        $charge = bcsub($income['number'], $expend['number'], 2);
+        $data['date'] = $date;
         $data['income'] = [
             'title' => '订单收入总金额',
-            'number' => $income['number'] ,
-            'count' => $income['count'].'笔',
+            'number' => $income['number'],
+            'count' => $income['count'] . '笔',
             'data' => [
-                ['订单支付',        $income['number_order'].'元',  $income['count_order'].'笔'],
-                ['退回优惠券补贴', $income['number_coupon'].'元', $income['count_coupon'].'笔'],
-                ['退回会员优惠券补贴', $income['number_svipcoupon'].'元', $income['count_svipcoupon'].'笔'],
+                ['订单支付', $income['number_order'] . '元', $income['count_order'] . '笔'],
+                ['退回优惠券补贴', $income['number_coupon'] . '元', $income['count_coupon'] . '笔'],
+                ['退回会员优惠券补贴', $income['number_svipcoupon'] . '元', $income['count_svipcoupon'] . '笔'],
             ]
         ];
-        $data['bill'] =  [
+        $data['bill'] = [
             'title' => '充值金额',
-            'number' => $bill['number'] ,
-            'count' => $bill['count'].'笔',
+            'number' => $bill['number'],
+            'count' => $bill['count'] . '笔',
             'data' => []
         ];
         $data['expend'] = [
             'title' => '支出总金额',
-            'number' => $expend['number'] ,
-            'count' => $expend['count'].'笔',
+            'number' => $expend['number'],
+            'count' => $expend['count'] . '笔',
             'data' => [
-                ['应付商户金额',   $expend['number_order'] .'元',     $expend['count_order'].'笔'],
-                ['佣金',          $expend['number_brokerage'] .'元', $expend['count_brokerage'].'笔'],
-                ['返还手续费',     $expend['number_charge'] .'元',    $expend['count_charge'].'笔'],
-                ['优惠券补贴',$expend['number_coupon'] .'元',    $expend['count_coupon'].'笔'],
-                ['会员优惠券补贴',$expend['number_svipcoupon'] .'元',    $expend['count_svipcoupon'].'笔'],
+                ['应付商户金额', $expend['number_order'] . '元', $expend['count_order'] . '笔'],
+                ['佣金', $expend['number_brokerage'] . '元', $expend['count_brokerage'] . '笔'],
+                ['返还手续费', $expend['number_charge'] . '元', $expend['count_charge'] . '笔'],
+                ['优惠券补贴', $expend['number_coupon'] . '元', $expend['count_coupon'] . '笔'],
+                ['会员优惠券补贴', $expend['number_svipcoupon'] . '元', $expend['count_svipcoupon'] . '笔'],
             ]
         ];
         $data['charge'] = [
             'title' => '平台手续费收入总金额',
-            'number' => $charge ,
+            'number' => $charge,
             'count' => '',
             'data' => []
         ];
@@ -405,60 +458,67 @@ class FinancialRecordRepository extends BaseRepository
      * @author Qinii
      * @day 5/6/21
      */
-    public function merDetail(int $type,array $where)
+    public function merDetail(int $type, array $where,$merchant=[])
     {
-        $date_ = strtotime($where['date']); unset($where['date']);
-        $date = ($type == 1) ? date('Y-m-d',$date_) : date('Y-m',$date_);
-        $income = $this->countIncome($type,$where,$date);
-        $expend = $this->countExpend($type,$where,$date);
-        $charge = bcsub($income['number'],$expend['number'],2);
+        $date_ = strtotime($where['date']);
+        unset($where['date']);
+        $date = ($type == 1) ? date('Y-m-d', $date_) : date('Y-m', $date_);
+        $income = $this->countIncome($type, $where, $date,$merchant);
+        $expend = $this->countExpend($type, $where, $date,$merchant);
+        $charge = bcsub($income['number'], $expend['number'], 2);
 
-        $data['date']   = $date;
+        $data['date'] = $date;
         $data['income'] = [
             'title' => '订单收入总金额',
-            'number' => $income['number'] ,
-            'count' => $income['count'].'笔',
+            'number' => $income['number'],
+            'count' => $income['count'] . '笔',
             'data' => [
-                ['订单支付',      $income['number_order'].'元',    $income['count_order'].'笔'],
-                ['优惠券补贴', $income['number_coupon'].'元',   $income['count_coupon'].'笔'],
-                ['会员优惠券补贴', $income['number_svipcoupon'].'元',   $income['count_svipcoupon'].'笔'],
+                ['订单支付', $income['number_order'] . '元', $income['count_order'] . '笔'],
+                ['优惠券补贴', $income['number_coupon'] . '元', $income['count_coupon'] . '笔'],
+                ['会员优惠券补贴', $income['number_svipcoupon'] . '元', $income['count_svipcoupon'] . '笔'],
             ]
         ];
         $data['expend'] = [
             'title' => '支出总金额',
-            'number' => $expend['number'] ,
-            'count' => $expend['count'].'笔',
+            'number' => $expend['number'],
+            'count' => $expend['count'] . '笔',
             'data' => [
                 [
                     '平台手续费',
-                    bcsub($expend['number_order_charge'],$expend['number_charge'],2) .'元',
-                    bcsub($expend['count_order_charge'],$expend['count_charge']).'笔'
+                    bcsub($expend['number_order_charge'], $expend['number_charge'], 2). '元',
+                    bcsub($expend['count_order_charge'], $expend['count_charge']). '笔',
+                ],
+                [
+                    '店铺保证金',
+                    $expend['number_auto_margin'] . '元',
+                    $expend['count_auto_margin'] . '笔'
+
                 ],
                 [
                     '佣金',
-                    bcsub($expend['number_brokerage'],$expend['number_refund_brokerage'],2) .'元',
-                    $expend['count_brokerage'] + $expend['count_refund_brokerage'].'笔'
+                    bcsub($expend['number_brokerage'], $expend['number_refund_brokerage'], 2) . '元',
+                    $expend['count_brokerage'] + $expend['count_refund_brokerage'] . '笔'
                 ],
                 [
                     '商户退款',
-                    $expend['number_refund'] .'元',
-                    $expend['count_refund'].'笔'
+                    $expend['number_refund'] . '元',
+                    $expend['count_refund'] . '笔'
                 ],
                 [
                     '退还优惠券补贴',
-                    $expend['number_coupon'] .'元',
-                    $expend['count_coupon'].'笔'
+                    $expend['number_coupon'] . '元',
+                    $expend['count_coupon'] . '笔'
                 ],
                 [
                     '退还会员优惠券补贴',
-                    $expend['number_svipcoupon'] .'元',
-                    $expend['count_svipcoupon'].'笔'
+                    $expend['number_svipcoupon'] . '元',
+                    $expend['count_svipcoupon'] . '笔'
                 ],
             ]
         ];
         $data['charge'] = [
             'title' => '应入账总金额',
-            'number' => $charge ,
+            'number' => $charge,
             'count' => '',
             'data' => []
         ];
@@ -474,27 +534,56 @@ class FinancialRecordRepository extends BaseRepository
      * @author Qinii
      * @day 3/23/21
      */
-    public function countIncome($type, $where, $date)
+    public function countIncome($type, $where, $date, $merchant = [])
     {
-        $financialType = ['order','order_presell','presell','mer_presell'];
-        [$data['count_order'],$data['number_order']] = $this->dao->getDataByType($type, $where, $date, $financialType);
-        if ($where['is_mer']){
+        $financialType = ['order', 'order_presell', 'presell', 'mer_presell'];
+        if ($merchant){
+            switch ($merchant['type_id']) {
+                case 16:
+                    $financialType1 = ['commission_to_town'];
+                    break;
+                case 15:
+                    $financialType1 = ['commission_to_village'];
+                    break;
+                case 14:
+                    $financialType1 = ['commission_to_service_team'];
+                    break;
+                case 11:
+                    $financialType1 = ['commission_to_cloud_warehouse'];
+                    break;
+                case 10:
+                    $financialType1 = ['commission_to_entry_merchant'];
+                    break;
+                default:
+                    $financialType1 = [];
+            }
+
+            $financialType = array_merge($financialType, $financialType1);
+        }
+        [$data['count_order'], $data['number_order']] = $this->dao->getDataByType($type, $where, $date, $financialType);
+        if (!empty($financialType1)){
+            $financialType1[0]=$financialType1[0].'_refund';
+            [$data['count_refund'], $data['number_refund']] = $this->dao->getDataByType($type, $where, $date, $financialType1);
+            $data['count_order']-=$data['count_refund'];
+            $data['number_order']-=$data['number_refund'];
+        }
+
+        if ($where['is_mer']) {
             $financialType = ['order_platform_coupon'];
         } else {
             $financialType = ['refund_platform_coupon'];
         }
-        [ $data['count_coupon'], $data['number_coupon']] = $this->dao->getDataByType($type, $where, $date, $financialType);
+        [$data['count_coupon'], $data['number_coupon']] = $this->dao->getDataByType($type, $where, $date, $financialType);
 
-        if ($where['is_mer']){
+        if ($where['is_mer']) {
             $financialType = ['order_svip_coupon'];
         } else {
             $financialType = ['refund_svip_coupon'];
         }
-        [ $data['count_svipcoupon'], $data['number_svipcoupon']] = $this->dao->getDataByType($type, $where, $date, $financialType);
-
-        $data['count']  = $data['count_order'];
-        $data['number'] = bcadd($data['number_coupon'],$data['number_order'],2);
+        [$data['count_svipcoupon'], $data['number_svipcoupon']] = $this->dao->getDataByType($type, $where, $date, $financialType);
 
+        $data['count'] = $data['count_order'];
+        $data['number'] = bcadd($data['number_coupon'], $data['number_order'], 2);
         return $data;
     }
 
@@ -513,15 +602,15 @@ class FinancialRecordRepository extends BaseRepository
             'status' => 1,
             'category' => 'now_money',
         ];
-        $query = app()->make(UserBillRepository::class)->search($bill_where)->where('type','in',['sys_inc_money','recharge']);
+        $query = app()->make(UserBillRepository::class)->search($bill_where)->where('type', 'in', ['sys_inc_money', 'recharge']);
         //充值消费金额
-        if($type == 1) $query->whereDay('create_time', $date);
-        if($type == 2) $query->whereMonth('create_time',$date);
+        if ($type == 1) $query->whereDay('create_time', $date);
+        if ($type == 2) $query->whereMonth('create_time', $date);
 
         $count = $query->count();
         $number = $query->sum('number');
 
-        return compact('count','number');
+        return compact('count', 'number');
     }
 
     /**
@@ -532,7 +621,7 @@ class FinancialRecordRepository extends BaseRepository
      * @author Qinii
      * @day 3/23/21
      */
-    public function countExpend($type, $where, $date)
+    public function countExpend($type, $where, $date,$merchant=[])
     {
         /**
          * 平台支出
@@ -542,24 +631,60 @@ class FinancialRecordRepository extends BaseRepository
          * 退回收入 refund_order + （佣金 brokerage_one,brokerage_two  -  退回佣金 refund_brokerage_two,refund_brokerage_one ） + （手续费  order_charge + 预售手续费 presell_charge  - 平台退给商户的手续费 refund_charge ）
          */
         // 退回佣金
-        $financialType = ['brokerage_one','brokerage_two'];
-        [$data['count_brokerage'],$data['number_brokerage']] = $this->dao->getDataByType($type, $where, $date, $financialType);
+        $financialType = ['brokerage_one', 'brokerage_two'];
+        [$data['count_brokerage'], $data['number_brokerage']] = $this->dao->getDataByType($type, $where, $date, $financialType);
 
         // 退回 手续费
         $financialType = ['refund_charge'];
-        [$data['count_charge'],$data['number_charge']] = $this->dao->getDataByType($type, $where, $date, $financialType);
+        [$data['count_charge'], $data['number_charge']] = $this->dao->getDataByType($type, $where, $date, $financialType);
 
-        if($where['is_mer']){ //商户的
+        if ($merchant){
+            switch ($merchant['type_id']) {
+                case 16:
+                    $financialType1 = ['commission_to_town_refund'];
+                    break;
+                case 15:
+                    $financialType1 = ['commission_to_village_refund'];
+                    break;
+                case 14:
+                    $financialType1 = ['commission_to_service_team_refund'];
+                    break;
+                case 11:
+                    $financialType1 = ['commission_to_cloud_warehouse_refund'];
+                    break;
+                case 10:
+                    $financialType1 = ['commission_to_entry_merchant_refund'];
+                    break;
+                default:
+                    $financialType1 = [];
+            }
+        }else{
+            //退款的
+            $refund=['commission_to_town_refund','commission_to_village_refund','commission_to_service_team_refund','commission_to_cloud_warehouse_refund','commission_to_entry_merchant_refund'];
+            //分成的
+            $commission=['commission_to_town','commission_to_village','commission_to_service_team','commission_to_cloud_warehouse','commission_to_entry_merchant'];
+        }
+        if ($where['is_mer']) { //商户的
             //退回 收入
             $financialType = ['refund_order'];
-            [$data['count_refund'],$data['number_refund']] = $this->dao->getDataByType($type, $where, $date, $financialType);
+            [$data['count_refund'], $data['number_refund']] = $this->dao->getDataByType($type, $where, $date, $financialType);
 
             //平台手续费
-            $financialType = ['order_charge','presell_charge'];
-            [$data['count_order_charge'],$data['number_order_charge']] = $this->dao->getDataByType($type, $where, $date, $financialType);
+            $financialType = ['order_charge', 'presell_charge'];
+            [$data['count_order_charge'], $data['number_order_charge']] = $this->dao->getDataByType($type, $where, $date, $financialType);
+
+            //商户保证金
+            $financialType = ['auto_margin'];
+            [$data['count_auto_margin'], $data['number_auto_margin']] = $this->dao->getDataByType($type, $where, $date, $financialType);
+            //商户保证金退回
+            $financialType = ['auto_margin_refund'];
+            [$data['count_auto_margin_refund'], $data['number_auto_margin_refund']] = $this->dao->getDataByType($type, $where, $date, $financialType);
+            $number3 = bcsub($data['number_auto_margin'], $data['number_auto_margin_refund'], 2);
+            $data['count_auto_margin'] = bcsub($data['count_auto_margin'], $data['count_auto_margin_refund']);
+            $data['number_auto_margin'] = $number3;
             //退回佣金
-            $financialType = ['refund_brokerage_two','refund_brokerage_one'];
-            [$data['count_refund_brokerage'],$data['number_refund_brokerage']] = $this->dao->getDataByType($type, $where, $date, $financialType);
+            $financialType = ['refund_brokerage_two', 'refund_brokerage_one'];
+            [$data['count_refund_brokerage'], $data['number_refund_brokerage']] = $this->dao->getDataByType($type, $where, $date, $financialType);
 
             //退回给平台的优惠券金额
             $financialType = ['refund_platform_coupon'];
@@ -567,23 +692,34 @@ class FinancialRecordRepository extends BaseRepository
             //退回给平台的会员优惠券金额
             $financialType = ['refund_svip_coupon'];
             [$data['count_svipcoupon'], $data['number_svipcoupon']] = $this->dao->getDataByType($type, $where, $date, $financialType);
-
+//            if (!empty($financialType1)){
+//                $financialType2= [explode('_refund',$financialType1[0])[0]];
+//                halt($financialType1,$financialType2);
+//                [$data['count_commission'], $data['number_commission']] = $this->dao->getDataByType($type, $where, $date, $financialType1);
+//                [$data['count_commission2'], $data['number_commission2']] = $this->dao->getDataByType($type, $where, $date, $financialType2);
+//                $data['count_brokerage']+=$data['count_commission2']-$data['count_commission'];
+//                $data['number_brokerage']+=$data['number_commission2']-$data['number_commission'];
+//            }
             //佣金 brokerage_one,brokerage_two  -  退回佣金 refund_brokerage_two,refund_brokerage_one ）
-            $number = bcsub($data['number_brokerage'],$data['number_refund_brokerage'],3);
-
+            $number = bcsub($data['number_brokerage'], $data['number_refund_brokerage'], 2);
             //平台手续费 =（ order_charge + 预售手续费 presell_charge  - 平台退给商户的手续费 refund_charge ）
-            $number_1 = bcsub($data['number_order_charge'],$data['number_charge'],3);
+            $number_1 = bcsub($data['number_order_charge'], $data['number_charge'], 2);
 
             //退回收入 refund_order + 退回佣金
-            $number_2 = bcadd(bcadd($data['number_refund'],$data['number_coupon'],2),$data['number_svipcoupon'],2);
+            $number_2 = bcadd(bcadd($data['number_refund'], $data['number_coupon'], 2), $data['number_svipcoupon'], 2);
+            $data['count'] = $data['count_brokerage'] + $data['count_refund'] + $data['count_order_charge'] + $data['count_refund_brokerage'] + $data['count_svipcoupon'] + $data['count_auto_margin']-$data['count_charge'];
+            $data['number'] = bcadd(bcadd($number3,bcadd($number_2, $number, 2),2), $number_1, 2);
 
-            $data['count']  = $data['count_brokerage'] + $data['count_refund'] + $data['count_order_charge'] + $data['count_refund_brokerage'] + $data['count_svipcoupon']-$data['count_charge'];
-            $data['number'] =bcadd(bcadd($number_2,$number,3),$number_1,2);
-        }else{ //平台的
+        } else { //平台的
             // 退回 订单实际获得金额
 
-            $financialType = ['order_true','presell_true'];
-            [$data['count_order'],$data['number_order']] = $this->dao->getDataByType($type, $where, $date, $financialType);
+            $financialType = ['order_true', 'presell_true','auto_margin'];
+            [$data['count_order'], $data['number_order']] = $this->dao->getDataByType($type, $where, $date, $financialType);
+
+            $financialType = ['commission_to_entry_merchant'];
+            [$data['count_merchant'], $data['number_merchant']] = $this->dao->getDataByType($type, $where, $date, $financialType);
+            $data['count_order']=bcsub($data['count_order'],$data['count_merchant']);
+            $data['number_order']=bcsub($data['number_order'],$data['number_merchant']);
 
             //付给商户的优惠券抵扣金额
             $financialType = ['order_platform_coupon'];
@@ -593,13 +729,19 @@ class FinancialRecordRepository extends BaseRepository
             $financialType = ['order_svip_coupon'];
             [$data['count_svipcoupon'], $data['number_svipcoupon']] = $this->dao->getDataByType($type, $where, $date, $financialType);
 
-            $number = bcadd($data['number_brokerage'],$data['number_order'],2);
-            $number_1 = bcadd(bcadd($number,$data['number_coupon'],2),$data['number_svipcoupon'],2);
+            //付给服务团队和其他的佣金
+            [$data['count_refund'], $data['number_refund']] = $this->dao->getDataByType($type, $where, $date, $refund);
+            [$data['count_commission'], $data['number_commission']] = $this->dao->getDataByType($type, $where, $date, $commission);
 
-            $data['count']  = $data['count_brokerage'] + $data['count_order'] + $data['count_charge'];
-            $data['number'] = bcadd($number_1,$data['number_charge'],2);
+            $data['count_brokerage']+=$data['count_commission']-$data['count_refund'];
+            $data['number_brokerage']+=$data['number_commission']-$data['number_refund'];
+
+            $number = bcadd($data['number_brokerage'], $data['number_order'], 2);
+            $number_1 = bcadd(bcadd($number, $data['number_coupon'], 2), $data['number_svipcoupon'], 2);
+
+            $data['count'] = $data['count_brokerage'] + $data['count_order'] + $data['count_charge'];
+            $data['number'] = bcadd($number_1, $data['number_charge'], 2);
         }
-
         return $data;
     }
 
@@ -611,12 +753,12 @@ class FinancialRecordRepository extends BaseRepository
      * @author Qinii
      * @day 3/24/21
      */
-    public function countCharge($type,$where,$date)
+    public function countCharge($type, $where, $date)
     {
         $financialType = ['order_charge'];
         [$count, $number] = $this->dao->getDataByType($type, $where, $date, $financialType);
 
-        return compact('count','number');
+        return compact('count', 'number');
     }
 
     /**
@@ -627,11 +769,11 @@ class FinancialRecordRepository extends BaseRepository
      * @author Qinii
      * @day 3/24/21
      */
-    public function countRefund($type,$where,$date)
+    public function countRefund($type, $where, $date)
     {
         $financialType = ['refund_order'];
         [$count, $number] = $this->dao->getDataByType($type, $where, $date, $financialType);
 
-        return compact('count','number');
+        return compact('count', 'number');
     }
 }

app/common/repositories/system/merchant/MerchantCategoryRepository.php

@@ -83,7 +83,9 @@ class MerchantCategoryRepository extends BaseRepository
 
         $form = Elm::createForm($action, [
             Elm::input('category_name', '分类名称')->required(),
-            Elm::number('commission_rate', '手续费(%)', 0)->required()->max(100)->precision(2)
+            Elm::number('commission_rate', '手续费(%)', 0)->required()->max(100)->precision(2),
+            Elm::frameImage('background', '背景图', '/' . config('admin.admin_prefix') . '/setting/uploadPicture?field=background&type=1')->width('896px')->height('480px')->props(['footer' => false])->modal(['modal' => false, 'custom-class' => 'suibian-modal']),
+            Elm::textarea('description', '简介')->required(),
         ]);
 
         return $form->formData($formData)->setTitle(is_null($id) ? '添加商户分类' : '编辑商户分类');

app/common/repositories/system/merchant/MerchantIntentionRepository.php

@@ -133,7 +133,9 @@ class MerchantIntentionRepository extends BaseRepository
                 'is_bro_goods' => $config['broadcast_goods_type'] == 1 ? 0 : 1,
                 'mer_password' => $password,
                 'is_margin' => $margin['is_margin'] ?? -1,
-                'margin' => $margin['margin'] ?? 0
+                'margin' => $margin['margin'] ?? 0,
+                'uid' => $intention['uid'],
+                'reg_admin_id' => request()->adminId(),
             ];
             $data['fail_msg'] = '';
             $smsData = [

app/common/repositories/system/merchant/MerchantRepository.php

@@ -15,17 +15,23 @@ namespace app\common\repositories\system\merchant;
 
 
 use app\common\dao\system\merchant\MerchantDao;
+use app\common\dao\system\serve\ServeOrderDao;
 use app\common\model\store\order\StoreOrder;
 use app\common\model\store\product\ProductReply;
+use app\common\model\store\service\StoreService;
+use app\common\model\system\merchant\Merchant;
 use app\common\repositories\BaseRepository;
 use app\common\repositories\store\coupon\StoreCouponRepository;
 use app\common\repositories\store\coupon\StoreCouponUserRepository;
+use app\common\repositories\store\MerchantTakeRepository;
+use app\common\repositories\store\order\StoreOrderRepository;
 use app\common\repositories\store\product\ProductCopyRepository;
 use app\common\repositories\store\product\ProductRepository;
 use app\common\repositories\store\product\SpuRepository;
 use app\common\repositories\store\shipping\ShippingTemplateRepository;
 use app\common\repositories\store\StoreCategoryRepository;
 use app\common\repositories\system\attachment\AttachmentRepository;
+use app\common\repositories\system\serve\ServeOrderRepository;
 use app\common\repositories\user\UserBillRepository;
 use app\common\repositories\user\UserRelationRepository;
 use app\common\repositories\user\UserVisitRepository;
@@ -57,6 +63,15 @@ use think\Model;
 class MerchantRepository extends BaseRepository
 {
 
+    const WithoutMargin = 0; //不需要保证金
+    const NeedMargin = 1; //需要保证金
+    const PaidMargin = 10; //已支付保证金
+    const RefundMargin = -1; //申请退还保证金
+    const RefuseMargin = -10; //拒绝退还保证金
+
+    public $merId;
+    public $forceMargin = false; //强制扣除保证金
+
     /**
      * MerchantRepository constructor.
      * @param MerchantDao $dao
@@ -215,8 +230,11 @@ class MerchantRepository extends BaseRepository
         if($data['type_id'] == 0){
             $data['type_id'] = '';
         }
-        $find=Db::name('merchant_address')->where('mer_id',$id)->find();
-        $data['geo_address']=$find;
+        $data['geo_address'] = [
+            'area_id' => $data['area_id'],
+            'street_id' => $data['street_id'],
+            'village_id' => $data['village_id'],
+        ];
         return $data;
 //        return $this->form($id, $data);
     }
@@ -254,10 +272,6 @@ class MerchantRepository extends BaseRepository
 
             $merchant = $this->dao->create($data);
             $merchant['merchant_admin']=$make->createMerchantAccount($merchant, $account, $password);
-            $address_id = Db::name('merchant_address')->insertGetId(['mer_id'=>$merchant->mer_id,'street_id'=>$data['street_id'],'area_id'=>$data['area_id'],'village_id'=>$data['village_id']]);
-            if($data['area_id'] && $data['village_id']){
-                Db::name('merchant_address')->where('id',$address_id)->update(['area_id'=>$data['area_id'],'village_id'=>$data['village_id']]);
-            }
             app()->make(ShippingTemplateRepository::class)->createDefault($merchant->mer_id);
             app()->make(ProductCopyRepository::class)->defaulCopyNum($merchant->mer_id);
             return $merchant;
@@ -275,7 +289,7 @@ class MerchantRepository extends BaseRepository
      */
     public function getList($where, $page, $limit, $userInfo)
     {
-        $field = 'care_count,is_trader,type_id,mer_id,mer_banner,mini_banner,mer_name, mark,mer_avatar,product_score,service_score,postage_score,sales,status,is_best,create_time,long,lat,is_margin';
+        $field = 'care_count,is_trader,type_id,mer_id,mer_banner,mini_banner,mer_name, mark,mer_avatar,product_score,service_score,postage_score,sales,status,is_best,create_time,long,lat,is_margin,service_phone,mer_address,mer_info';
         $where['status'] = 1;
         $where['mer_state'] = 1;
         $where['is_del'] = 0;
@@ -297,8 +311,10 @@ class MerchantRepository extends BaseRepository
         $query = $this->dao->search($where)->with(['type_name']);
         $count = $query->count();
         $status = systemConfig('mer_location');
+        /** @var MerchantTakeRepository $repository */
+        $repository = app()->make(MerchantTakeRepository::class);
         $list = $query->page($page, $limit)->setOption('field', [])->field($field)->select()
-            ->each(function ($item) use ($status, $where) {
+            ->each(function ($item) use ($status, $where, $repository) {
                 if ($status && $item['lat'] && $item['long'] && isset($where['location']['lat'], $where['location']['long'])) {
                     $distance = getDistance($where['location']['lat'], $where['location']['long'], $item['lat'], $item['long']);
                     if ($distance < 0.9) {
@@ -311,12 +327,18 @@ class MerchantRepository extends BaseRepository
                     }
                     $item['distance'] = $distance;
                 }
-                if(isset($where['type_id'])&& $where['type_id']==12){
-                    $item['recommend'] =  $item['AllRecommendType'];
-                }else{
-                    $item['recommend'] = isset($where['delivery_way']) ? $item['CityRecommend'] : $item['AllRecommend'];
-
+                $delivery = $repository->get($item['mer_id']) + systemConfig(['tx_map_key']);
+                $item['mer_certificate'] = merchantConfig($item['mer_id'], 'mer_certificate');
+                if (empty($item['mer_certificate'][0])) {
+                    $item['mer_certificate'] = [];
                 }
+                $item['mer_take_time'] = $delivery['mer_take_time'];
+//                if(isset($where['type_id'])&& $where['type_id']==12){
+//                    $item['recommend'] =  $item['AllRecommendType'];
+//                }else{
+//                    $item['recommend'] = isset($where['delivery_way']) ? $item['CityRecommend'] : $item['AllRecommend'];
+//
+//                }
                 return  $item;
             });
 
@@ -451,6 +473,7 @@ class MerchantRepository extends BaseRepository
     {
         Db::transaction(function () use ($id) {
             $this->dao->update($id, ['is_del' => 1]);
+            StoreService::getInstance()->update(['is_del' => 1], ['mer_id' => $id]);
             app()->make(MerchantAdminRepository::class)->deleteMer($id);
             Queue::push(ClearMerchantStoreJob::class, ['mer_id' => $id]);
         });
@@ -541,30 +564,32 @@ class MerchantRepository extends BaseRepository
         Db::transaction(function () use ($order) {
             $money = 0;
             $make = app()->make(UserBillRepository::class);
-            $bill = $make->search(['category' => 'mer_lock_money', 'type' => 'order', 'link_id' => '1' . $order->order_id, 'status' => 0])->find();
-            if ($bill) {
-                $money = bcsub($bill->number, $make->refundMerchantMoney($bill->link_id, $bill->type, $bill->mer_id), 2);
-                if ($order->presellOrder) {
-                    $presellBill = $make->search(['category' => 'mer_lock_money', 'type' => 'presell', 'link_id' => '2' . $order->presellOrder->presell_order_id, 'status' => 0])->find();
-                    if ($presellBill) {
-                        $money = bcadd($money, bcsub($presellBill->number, $make->refundMerchantMoney($presellBill->link_id, $presellBill->type, $presellBill->mer_id), 2), 2);
-                        $presellBill->status = 1;
-                        $presellBill->save();
+            $bills = $make->search(['category' => 'mer_lock_money', 'type' => 'order', 'link_id' => '1' . $order->order_id, 'status' => 0])->select();
+            foreach ($bills as $bill) {
+                if ($bill) {
+                    $money = bcsub($bill->number, $make->refundMerchantMoney($bill->link_id, $bill->type, $bill->mer_id), 2);
+                    if ($order->presellOrder) {
+                        $presellBill = $make->search(['category' => 'mer_lock_money', 'type' => 'presell', 'link_id' => '2' . $order->presellOrder->presell_order_id, 'status' => 0])->find();
+                        if ($presellBill) {
+                            $money = bcadd($money, bcsub($presellBill->number, $make->refundMerchantMoney($presellBill->link_id, $presellBill->type, $presellBill->mer_id), 2), 2);
+                            $presellBill->status = 1;
+                            $presellBill->save();
+                        }
                     }
+                    $bill->status = 1;
+                    $bill->save();
+                }
+                if ($money > 0) {
+                    app()->make(UserBillRepository::class)->incBill($bill->uid, 'mer_computed_money', 'order', [
+                        'link_id' => $order->order_id,
+                        'mer_id' => $bill->mer_id,
+                        'status' => 0,
+                        'title' => '商户待解冻余额',
+                        'number' => $money,
+                        'mark' => '交易完成,商户待解冻余额' . floatval($money) . '元',
+                        'balance' => 0
+                    ]);
                 }
-                $bill->status = 1;
-                $bill->save();
-            }
-            if ($money > 0) {
-                app()->make(UserBillRepository::class)->incBill($order->uid, 'mer_computed_money', 'order', [
-                    'link_id' => $order->order_id,
-                    'mer_id' => $order->mer_id,
-                    'status' => 0,
-                    'title' => '商户待解冻余额',
-                    'number' => $money,
-                    'mark' => '交易完成,商户待解冻余额' . floatval($money) . '元',
-                    'balance' => 0
-                ]);
             }
         });
     }
@@ -598,8 +623,8 @@ class MerchantRepository extends BaseRepository
         $form->setRule([
             Elm::input('mer_name', '商户名称', $merchant->mer_name)->disabled(true),
             Elm::input('mer_id', '商户ID', $merchant->mer_id)->disabled(true),
-            Elm::input('margin', '商户剩余保证金', $merchant->margin)->disabled(true),
-            Elm::number('number', '保证金扣除金额', 0)->max($merchant->margin)->precision(2)->required(),
+            Elm::input('margin', '商户剩余保证金', $merchant->paid_margin)->disabled(true),
+            Elm::number('number', '保证金扣除金额', 0)->max($merchant->paid_margin)->precision(2)->required(),
             Elm::text('mark', '保证金扣除原因')->required(),
         ]);
         return $form->setTitle('扣除保证金');
@@ -622,14 +647,15 @@ class MerchantRepository extends BaseRepository
             throw new ValidateException('扣除保证金额不能小于0');
         }
 
-        if (bccomp($merechant->margin, $data['number'], 2) == -1) {
+        if (bccomp($merechant->paid_margin, $data['number'], 2) == -1) {
             throw new ValidateException('扣除保证金额不足');
         }
 
-        $data['balance'] = bcsub($merechant->margin, $data['number'], 2);
+        $data['balance'] = bcsub($merechant->paid_margin, $data['number'], 2);
 
         Db::transaction(function () use ($merechant, $data) {
-            $merechant->margin = $data['balance'];
+            $merechant->paid_margin = $data['balance'];
+            $merechant->ot_margin = $data['balance'];
             $merechant->save();
             app()->make(UserBillRepository::class)->bill(0, 'mer_margin', $data['type'], 0, $data);
         });
@@ -647,5 +673,73 @@ class MerchantRepository extends BaseRepository
         });
     }
 
+    /**
+     * 自动扣除保证金
+     * @param $income
+     * @param $order
+     * @param $finance
+     * @param $financeSn
+     * @param $index
+     * @return array
+     */
+    public function autoMargin($income, $order, $finance, $financeSn, $index = 0)
+    {
+        $merchant = Merchant::find($this->merId);
+        //商户保证金未完全缴纳且设置了自动扣除比例
+        if ($merchant['margin'] <= $merchant['paid_margin'] || ($this->forceMargin === false && $merchant['auto_margin_rate'] <= 0 && $merchant['auto_margin_rate'] > 100)) {
+            return [$income, $finance, false];
+        }
+        $rate = $this->forceMargin ? 100 : $merchant['auto_margin_rate'];
+        //商户保证金未完全缴纳且设置了自动扣除比例
+        $margin = bcmul($income, $rate / 100, 2);
+        $margin = min(bcsub($merchant['margin'], $merchant['paid_margin'], 2), $margin);
+        $income = max(bcsub($income, $margin, 2), 0);
+        if ($margin <= 0) {
+            return [$income, $finance, false];
+        }
+        $finance[] = [
+            'order_id' => $order->order_id,
+            'order_sn' => $order->order_sn,
+            'user_info' => $order->user->nickname,
+            'user_id' => $order->uid,
+            'financial_type' => 'auto_margin',
+            'financial_pm' => 0,
+            'type' => 1,
+            'number' => $margin,
+            'mer_id' => $this->merId,
+            'financial_record_sn' => $financeSn . $index
+        ];
+
+        $orderInfo = [
+            'type_id' => $merchant['type_id'],
+            'is_margin' => $merchant['is_margin'],
+            'margin' => $margin,
+        ];
+        $values = [
+            'status' => 1,
+            'is_del' => 0,
+            'mer_id' => $merchant['mer_id'],
+            'type' => ServeOrderRepository::TYPE_MARGIN,
+            'meal_id'=> $merchant['type_id'],
+            'pay_type' => ServeOrderRepository::PAY_TYPE_BALANCE,
+            'order_info' => json_encode($orderInfo,JSON_UNESCAPED_UNICODE),
+            'pay_price' => $margin,
+            'store_order_id' => $order['order_id'],
+        ];
+        $values['order_sn'] = app()->make(StoreOrderRepository::class)->getNewOrderId('cs');
+        $values['pay_time'] = date('y_m-d H:i:s', time());
+        if (!app()->make(ServeOrderDao::class)->create($values)) {
+            throw new \Exception('serve_order 保存出错');
+        }
+        $merchant->paid_margin = bcadd($margin, $merchant->paid_margin, 2);
+        $merchant->ot_margin = $merchant->paid_margin;
+        $merchant->is_margin = MerchantRepository::PaidMargin;
+        if ($merchant->save() === false) {
+            throw new \Exception('merchant 保存出错');
+        }
+
+        return [$income, $finance, true];
+    }
+
 
 }

app/common/repositories/system/merchant/MerchantTypeRepository.php

@@ -14,6 +14,8 @@ namespace app\common\repositories\system\merchant;
 
 
 use app\common\dao\system\merchant\MerchantTypeDao;
+use app\common\model\system\merchant\Merchant;
+use app\common\model\system\merchant\MerchantType;
 use app\common\repositories\BaseRepository;
 use app\common\repositories\system\auth\MenuRepository;
 use app\common\repositories\system\RelevanceRepository;
@@ -27,6 +29,9 @@ use think\facade\Route;
  */
 class MerchantTypeRepository extends BaseRepository
 {
+
+    public $userApply = false;
+
     public function __construct(MerchantTypeDao $dao)
     {
         $this->dao = $dao;
@@ -44,9 +49,12 @@ class MerchantTypeRepository extends BaseRepository
         return compact('count', 'list');
     }
 
-    public function getSelect()
+    public function getSelect($getAll = true)
     {
-        $query = $this->search([])->field('mer_type_id,type_name');
+        $merTypeIds = $this->userApply ? Merchant::AllowApply : Merchant::AllowDisplay;
+        $query = MerchantType::getDB()->when(!$getAll, function ($query) use ($merTypeIds) {
+            $query->whereIn('mer_type_id', $merTypeIds);
+        })->field('mer_type_id,type_name');
         return $query->select()->toArray();
     }
 

app/common/repositories/system/serve/ServeOrderRepository.php

@@ -43,6 +43,10 @@ class ServeOrderRepository extends BaseRepository
     //同城配送delivery
     const TYPE_DELIVERY = 20;
 
+    const PAY_TYPE_WECHAT = 1; //微信支付
+    const PAY_TYPE_ALI = 2; //支付宝支付
+    const PAY_TYPE_BALANCE = 3; //余额支付
+
 
     /**
      * TODO 购买一号通 支付

app/controller/admin/store/StoreProduct.php

@@ -54,6 +54,7 @@ class StoreProduct extends BaseController
         $merId = $mer_id ? $mer_id : null;
         $where['is_gift_bag'] = 0;
         $_where = $this->repository->switchType($where['type'], null,0);
+        unset($_where['product_type']);
         unset($_where['star']);
         $where = array_merge($where, $_where);
         return app('json')->success($this->repository->getAdminList($merId, $where, $page, $limit));

app/controller/admin/system/merchant/FinancialRecord.php

@@ -37,9 +37,14 @@ class FinancialRecord extends BaseController
         $merId = $this->request->merId();
         if ($merId) {
             $where['mer_id'] = $merId;
-            $where['financial_type'] = ['order', 'mer_accoubts', 'brokerage_one', 'brokerage_two', 'refund_brokerage_one', 'refund_brokerage_two', 'refund_order','order_platform_coupon','order_svip_coupon' ,'auto_margin'];
+            $where['financial_type'] = ['order', 'mer_accoubts', 'brokerage_one', 'brokerage_two', 'refund_brokerage_one', 'refund_brokerage_two', 'refund_order','order_platform_coupon',
+                'order_svip_coupon','commission_to_service_team','commission_to_service_team_refund','commission_to_platform','commission_to_platform_refund','commission_to_village','commission_to_village_refund','commission_to_town','commission_to_town_refund','commission_to_entry_merchant','commission_to_entry_merchant_refund'
+                    ,'commission_to_cloud_warehouse','commission_to_cloud_warehouse_refund'];
         } else {
-            $where['financial_type'] = ['order', 'sys_accoubts', 'brokerage_one', 'brokerage_two', 'refund_brokerage_one', 'refund_brokerage_two', 'refund_order','order_platform_coupon','order_svip_coupon', 'auto_margin'];
+            $where['financial_type'] = ['order', 'sys_accoubts', 'brokerage_one', 'brokerage_two', 'refund_brokerage_one', 'refund_brokerage_two', 'refund_order','order_platform_coupon',
+                'order_svip_coupon','commission_to_service_team','commission_to_service_team_refund','commission_to_platform','commission_to_platform_refund','commission_to_village','commission_to_village_refund','commission_to_town','commission_to_town_refund'
+                    ,'commission_to_entry_merchant','commission_to_entry_merchant_refund'
+                    ,'commission_to_cloud_warehouse','commission_to_cloud_warehouse_refund'];
         }
         return app('json')->success($this->repository->getList($where, $page, $limit));
     }
@@ -91,7 +96,12 @@ class FinancialRecord extends BaseController
         [$page, $limit] = $this->getPage();
         $where = $this->request->params([['type',1],'date']);
         $where['is_mer'] = $this->request->merId() ?? 0 ;
-        $data = $this->repository->getAdminList($where,$page, $limit);
+        try {
+            $merchant = $this->request->merchant();
+        }catch (\Exception $e){
+            $merchant = [];
+        }
+        $data = $this->repository->getAdminList($where,$page, $limit,$merchant);
         return app('json')->success($data);
     }
 
@@ -109,7 +119,8 @@ class FinancialRecord extends BaseController
         $where['date'] = empty($date) ? date('Y-m-d',time()) : $date ;
         $where['is_mer'] = $this->request->merId() ?? 0 ;
         if($this->request->merId()){
-            $data = $this->repository->merDetail($type,$where);
+            $merchant = $this->request->merchant();
+            $data = $this->repository->merDetail($type,$where,$merchant);
         }else{
             $data = $this->repository->adminDetail($type,$where);
         }
@@ -130,7 +141,12 @@ class FinancialRecord extends BaseController
         $where['date'] = empty($date) ? date('Y-m-d',time()) : $date ;
         $where['type'] = $type;
         $where['is_mer'] = $this->request->merId() ?? 0 ;
-        $data = app()->make(ExcelService::class)->exportFinancial($where,$page,$limit);
+        try {
+            $merchant = $this->request->merchant();
+        }catch (\Exception $e){
+            $merchant = [];
+        }
+        $data = app()->make(ExcelService::class)->exportFinancial($where,$page,$limit,$merchant);
 //        app()->make(ExcelRepository::class)->create($where, $this->request->adminId(), 'exportFinancial',$where['is_mer']);
         return app('json')->success($data);
     }

app/controller/admin/system/merchant/Merchant.php

@@ -72,7 +72,7 @@ class Merchant extends BaseController
     public function lst()
     {
         [$page, $limit] = $this->getPage();
-        $where = $this->request->params(['keyword', 'date', 'status', 'statusTag', 'is_trader', 'category_id', 'type_id']);
+        $where = $this->request->params(['keyword', 'date', 'status', 'statusTag', 'is_trader', 'category_id', 'type_id', 'area_id', 'street_id']);
         return app('json')->success($this->repository->lst($where, $page, $limit));
     }
 
@@ -146,18 +146,10 @@ class Merchant extends BaseController
         unset($data['mer_account'], $data['mer_password']);
         $margin = $this->repository->checkMargin($id, $data['type_id']);
         $data['margin'] = $margin['margin'];
-        $data['is_margin'] = $margin['is_margin'];
+        $data['is_margin'] = $data['paid_margin'] > 0 ? MerchantRepository::PaidMargin : $margin['is_margin'];
+        $data['ot_margin'] = $data['paid_margin'];
         $datas=$data;
-        unset($datas['area_id'],$datas['street_id'],$datas['village_id']);
         $this->repository->update($id, $datas);
-        $adds=Db::name('merchant_address')->where('mer_id',$id)->find();
-            if($adds){
-                $adds1=['area_id'=>$data['area_id'],'street_id'=>$data['street_id'],'village_id'=>$data['village_id']];
-                Db::name('merchant_address')->where('mer_id',$id)->update($adds1);
-            }else{
-                $adds1=['mer_id'=>$id,'area_id'=>$data['area_id'],'street_id'=>$data['street_id'],'village_id'=>$data['village_id']];
-                Db::name('merchant_address')->insert($adds1);
-            }
         return app('json')->success('编辑成功');
     }
 
@@ -187,7 +179,7 @@ class Merchant extends BaseController
      */
     public function checkParam(MerchantValidate $validate, $isUpdate = false)
     {
-        $data = $this->request->params([['area_id',0],['street_id',0],['village_id',0],['category_id', 0], ['type_id', 0], 'mer_name', 'commission_rate', 'real_name', 'mer_phone', 'mer_keyword', 'mer_address', 'mark', ['sort', 0], ['status', 0], ['is_audit', 0], ['is_best', 0], ['is_bro_goods', 0], ['is_bro_room', 0], ['is_trader', 0],'sub_mchid']);
+        $data = $this->request->params([['area_id',0],['street_id',0],['village_id',0],['category_id', 0], ['type_id', 0], 'mer_name', 'commission_rate', 'real_name', 'mer_phone', 'mer_keyword', 'mer_address', 'mark', ['sort', 0], ['status', 0], ['is_audit', 0], ['is_best', 0], ['is_bro_goods', 0], ['is_bro_room', 0], ['is_trader', 0],'sub_mchid', 'auto_margin_rate', 'paid_margin']);
         if (!$isUpdate) {
             $data += $this->request->params(['mer_account', 'mer_password']);
         }else {

app/controller/admin/system/merchant/MerchantCategory.php

@@ -154,7 +154,7 @@ class MerchantCategory extends BaseController
      */
     public function checkParams(MerchantCategoryValidate $validate)
     {
-        $data = $this->request->params(['category_name', ['commission_rate', 0]]);
+        $data = $this->request->params(['category_name', ['commission_rate', 0], 'background', 'description']);
         $validate->check($data);
         return $data;
     }

app/controller/api/Auth.php

@@ -43,6 +43,7 @@ use think\facade\Db;
 use think\facade\Log;
 use think\facade\Queue;
 use crmeb\jobs\SendSmsJob;
+use app\controller\api\Ceshi;
 
 /**
  * Class Auth
@@ -54,6 +55,32 @@ class Auth extends BaseController
 {
     public function test()
     {
+        $type = $this->request->param('type');
+        $res=[];
+        switch ($type) {
+            case 1:
+                $res = (app()->make(Ceshi::class))->Merchant_reconciliation_download();
+                break;
+            case 2:
+                $res = (app()->make(Ceshi::class))->Pay();
+                break;
+            case 3:
+                $res = (app()->make(Ceshi::class))->SettlementQuery();
+                break;
+            case 4:
+                $res = (app()->make(Ceshi::class))->OrderClosure();
+                break;
+            case 5:
+                $res = (app()->make(Ceshi::class))->OrderQuery();
+                break;
+            case 6:
+                $res = (app()->make(Ceshi::class))->refund();
+                break;
+            case 7:
+                $res = (app()->make(Ceshi::class))->NoticeSettlement();
+                break;
+        }
+        return app('json')->success(json_decode($res, true));
 //        $data = [
 //            'tempId' => '',
 //            'id' => '',
@@ -152,18 +179,18 @@ class Auth extends BaseController
         if (systemConfig('member_status'))
             $data['member_icon'] = $this->request->userInfo()->member->brokerage_icon ?? '';
         if ($data['is_svip'] == 3)
-            $data['svip_endtime'] = date('Y-m-d H:i:s',strtotime("+100 year"));
+            $data['svip_endtime'] = date('Y-m-d H:i:s', strtotime("+100 year"));
 
-        $day = date('Y-m-d',time());
-        $key = 'sign_'.$user['uid'].'_'.$day;
+        $day = date('Y-m-d', time());
+        $key = 'sign_' . $user['uid'] . '_' . $day;
         $data['sign_status'] = false;
         if (Cache::get($key)) {
-            $data['sign_status'] =  true;
+            $data['sign_status'] = true;
         } else {
-            $nu = app()->make(UserSignRepository::class)->getSign($user->uid,$day);
+            $nu = app()->make(UserSignRepository::class)->getSign($user->uid, $day);
             if ($nu) {
                 $data['sign_status'] = true;
-                Cache::set($key,true, new \DateTime($day.' 23:59:59'));
+                Cache::set($key, true, new \DateTime($day . ' 23:59:59'));
             }
         }
         $data['is_wsxx'] = 0;
@@ -387,7 +414,7 @@ class Auth extends BaseController
 
     public function verify(UserAuthValidate $validate)
     {
-        $data = $this->request->params(['phone', ['type', 'login'],['captchaType', ''], ['captchaVerification', ''],'token']);
+        $data = $this->request->params(['phone', ['type', 'login'], ['captchaType', ''], ['captchaVerification', ''], 'token']);
         //二次验证
         try {
             aj_captcha_check_two($data['captchaType'], $data['captchaVerification']);
@@ -423,14 +450,14 @@ class Auth extends BaseController
 
     public function smsLogin(UserAuthValidate $validate, UserRepository $repository)
     {
-        $data = $this->request->params(['phone', 'sms_code', 'spread', 'auth_token',['user_type','h5']]);
+        $data = $this->request->params(['phone', 'sms_code', 'spread', 'auth_token', ['user_type', 'h5']]);
         $validate->sceneSmslogin()->check($data);
         $sms_code = app()->make(SmsService::class)->checkSmsCode($data['phone'], $data['sms_code'], 'login');
-        if (!$sms_code) return app('json')->fail('验证码不正确');
+        if (!$sms_code && !env('APP_DEBUG')) return app('json')->fail('验证码不正确');
         $user = $repository->accountByUser($data['phone']);
         $auth = $this->parseAuthToken($data['auth_token']);
         if (!$user) $user = $repository->registr($data['phone'], null, $data['user_type']);
-        if ($auth && !$user['wechat_user_id']){
+        if ($auth && !$user['wechat_user_id']) {
             $repository->syncBaseAuth($auth, $user);
         }
         $user = $repository->mainUser($user);
@@ -479,16 +506,17 @@ class Auth extends BaseController
      */
     public function register(UserAuthValidate $validate, UserRepository $repository)
     {
-        $data = $this->request->params(['phone', 'sms_code', 'spread', 'pwd', 'auth_token',['user_type','h5']]);
+        $data = $this->request->params(['phone', 'sms_code', 'spread', 'pwd', 'auth_token', ['user_type', 'h5']]);
         $validate->check($data);
         $sms_code = app()->make(SmsService::class)->checkSmsCode($data['phone'], $data['sms_code'], 'login');
-        if (!$sms_code)
+        if (!$sms_code && !env('APP_DEBUG')) {
             return app('json')->fail('验证码不正确');
+        }
         $user = $repository->accountByUser($data['phone']);
         if ($user) return app('json')->fail('用户已存在');
         $auth = $this->parseAuthToken($data['auth_token']);
         $user = $repository->registr($data['phone'], $data['pwd'], $data['user_type']);
-        if ($auth){
+        if ($auth) {
             $repository->syncBaseAuth($auth, $user);
         }
         $user = $repository->mainUser($user);
@@ -566,9 +594,9 @@ class Auth extends BaseController
         } else if ($auth['type'] === 'app_wechat') {
             $oauth = WechatService::create()->getApplication()->oauth;
             try {
-                $wechatInfo = $oauth->user(new AccessToken(['access_token'=>$data['code'],'openid'=>$data['openid']]))->getOriginal();
+                $wechatInfo = $oauth->user(new AccessToken(['access_token' => $data['code'], 'openid' => $data['openid']]))->getOriginal();
             } catch (Exception $e) {
-                throw new ValidateException('授权失败[001]'.$e->getMessage());
+                throw new ValidateException('授权失败[001]' . $e->getMessage());
             }
             $user = app()->make(WechatUserRepository::class)->syncAppUser($wechatInfo['unionid'], $wechatInfo, 'App', $createUser);
             if (!$user)
@@ -584,7 +612,7 @@ class Auth extends BaseController
             if (null === ($payload = JWT::jsonDecode(JWT::urlsafeB64Decode($bodyb64)))) {
                 throw new ValidateException('Invalid header encoding');
             }
-            if($payload->sub != $data['openId']){
+            if ($payload->sub != $data['openId']) {
                 throw new ValidateException('授权失败');
             }
             $user = app()->make(WechatUserRepository::class)->syncAppUser($data['openId'], [
@@ -766,8 +794,8 @@ class Auth extends BaseController
      */
     public function ajcaptcha()
     {
-        $captchaType =  $this->request->get('captchaType');
-        if (!$captchaType)   return app('json')->fail('请输入类型');
+        $captchaType = $this->request->get('captchaType');
+        if (!$captchaType) return app('json')->fail('请输入类型');
         return app('json')->success(aj_captcha_create($captchaType));
     }
 
@@ -777,9 +805,9 @@ class Auth extends BaseController
      */
     public function ajcheck()
     {
-        $token = $this->request->param('token','');
-        $pointJson = $this->request->param('pointJson','');
-        $captchaType = $this->request->param('captchaType','');
+        $token = $this->request->param('token', '');
+        $pointJson = $this->request->param('pointJson', '');
+        $captchaType = $this->request->param('captchaType', '');
 
         try {
             aj_captcha_check_one($captchaType, $token, $pointJson);
@@ -789,4 +817,30 @@ class Auth extends BaseController
         }
     }
 
+    /**
+     * 发送短信验证码
+     * @return mixed
+     */
+    public function verifyCode()
+    {
+        $data = $this->request->params(['phone', ['type', 'login']]);
+        $sms_limit_key = 'sms_limit_' . $data['phone'];
+        $limit = Cache::get($sms_limit_key) ? Cache::get($sms_limit_key) : 0;
+        $sms_limit = systemConfig('sms_limit');
+        if ($sms_limit && $limit > $sms_limit) {
+            return app('json')->fail('请求太频繁请稍后再试');
+        }
+        try {
+            $sms_code = str_pad(random_int(1, 9999), 4, 0, STR_PAD_LEFT);
+            $sms_time = systemConfig('sms_time') ? systemConfig('sms_time') : 30;
+            SmsService::create()->send($data['phone'], 'VERIFICATION_CODE', ['code' => $sms_code, 'time' => $sms_time]);
+        } catch (Exception $e) {
+            return app('json')->fail($e->getMessage());
+        }
+        $sms_key = app()->make(SmsService::class)->sendSmsKey($data['phone'], $data['type']);
+        Cache::set($sms_key, $sms_code, $sms_time * 60);
+        Cache::set($sms_limit_key, $limit + 1, 60);
+        return app('json')->success('短信发送成功');
+    }
+
 }

app/controller/api/Ceshi.php

@@ -0,0 +1,325 @@
+<?php
+
+namespace app\controller\api;
+
+use Guzzle\Http\Exception\RequestException;
+use GuzzleHttp\Client;
+use GuzzleHttp\Exception\GuzzleException;
+use think\App;
+use GuzzleHttp\Psr7\Request;
+
+class Ceshi
+{
+    public function Merchant_reconciliation_download()
+    {
+        $headers = [
+            'Content-Type' => 'application/json',
+            'Accept' => '*/*',
+            'Host' => '127.0.0.1:23552',
+            'Connection' => 'keep-alive'
+        ];
+        $body = '{
+   "header": {
+      "appId": "000000000010012",
+      "appSecret": "8c76d098-ce22-4df8-a01d-ea6f5502e5ec",
+      "openEPubK": "3A743B476533D137EAA130F266501CAAE6D0870B1CAF0934D1CA5566F90B763F5B11C4A57B402C102C956ADF0DFDA3BD91F2843C648EAF159A9B08C0C8ACF541",
+      "appDPriK": "7D0B1F1BAFAE24436AD322EF35A6784B264700B9402C33F9CA2C6BB7FE325AF9",
+      "openVPubK": "7EAFB55A843DCBB33E07E4E59D3AF14216768CC0C8055985633AC753E29F9A5C07586CDBC9806CD31F66B17B12B07193B3C471C3A707C07E793D42B676AF80B1",
+      "appSPriK": "E8E0A7F49E2EC0E0C45352BDD4D8579FAC73A258FEDFF919B334DA2103EB32B7",
+      "httpDomainName": "https://open-test.scrcu.com:9051/open-gate",
+      "apiUrl": "/onlinepay/OPC321560202000200000100",
+      "version": "1.0.0"
+   },
+   "body": {
+      "mchtNo": "129765100270890",
+      "settleDate": "20200820",
+      "reqTime": "20200816153647",
+      "reqSsn": "c7c12347878pca8b5555d8d3630553as"
+   }
+}';
+        $client = new Client(['base_uri' => 'http://127.0.0.1:23552']);
+        $request = new Request('POST', 'http://127.0.0.1:23552/sdk/doApi', $headers, $body);
+        try {
+            $res = $client->send($request);
+        } catch (GuzzleException $e) {
+            halt($e);
+        }
+        return $res->getBody()->getContents();
+    }
+    public function Pay()
+    {
+        $headers = [
+            'Content-Type' => 'application/json',
+            'Accept' => '*/*',
+            'Host' => '127.0.0.1:23552',
+            'Connection' => 'keep-alive'
+        ];
+        $body = '{
+    "header": {
+        "appId": "000000000010012",
+        "appSecret": "8c76d098-ce22-4df8-a01d-ea6f5502e5ec",
+        "openEPubK": "3A743B476533D137EAA130F266501CAAE6D0870B1CAF0934D1CA5566F90B763F5B11C4A57B402C102C956ADF0DFDA3BD91F2843C648EAF159A9B08C0C8ACF541",
+        "appDPriK": "7D0B1F1BAFAE24436AD322EF35A6784B264700B9402C33F9CA2C6BB7FE325AF9",
+        "openVPubK": "7EAFB55A843DCBB33E07E4E59D3AF14216768CC0C8055985633AC753E29F9A5C07586CDBC9806CD31F66B17B12B07193B3C471C3A707C07E793D42B676AF80B1",
+        "appSPriK": "E8E0A7F49E2EC0E0C45352BDD4D8579FAC73A258FEDFF919B334DA2103EB32B7",
+        "httpDomainName": "https://open-test.scrcu.com:9051/open-gate",
+        "apiUrl": "/onlinepay/OPC321560202000200000500",
+        "version" :"1.0.0"
+    
+    },
+   "body": {
+        "charset": "UTF-8",
+        "orderType": "01",
+        "orderNumber": "f7c646fd1d8pca8b5555d8d363075392",
+        "orderCurrency": "01",
+        "subject": "测试商品",
+        "channel": "02",
+        "orderSendTime": "20200713093647",
+        "orderAmt": "10",
+        "version": "1.0.0",
+        "payAmt": "10",
+        "backEndUrl": "http://www.testpay.com/backEndU",
+        "frontEndUrl": "http://www.testpay.com/frontEndUrl",
+        "merId": "129765100270890",
+            "orderDetailList": {
+            "payType": "",
+            "merLst": [
+                {
+                    "subOrderAmt": "10",
+                    "orderNumber": "f7c646fd1d8pca8b5555d8d363075392",
+                    "merId": "129765100270890",
+                    "subPayAmt": "10",
+                    "autoSettleFlag": "0",
+                    "goodsInfo": [
+                        {
+                            "goodsSubject": "测试商品",
+                            "goodsPrice": "10",
+                            "goodsUnit": "斤",
+                            "goodsNum": "1",
+                            "goodsTotalAmt": "10",
+                            "goodsSpec": "10"
+                        }
+                    ]
+                }
+            ],
+            "orderAmt": "10",
+            "payAmt": "10"
+        }
+    }
+}';
+        $client = new Client(['base_uri' => 'http://127.0.0.1:23552']);
+        $request = new Request('POST', 'http://127.0.0.1:23552/sdk/doApi', $headers, $body);
+        try {
+            $res = $client->send($request);
+        } catch (GuzzleException $e) {
+            halt($e);
+        }
+        return $res->getBody()->getContents();
+    }
+    public function SettlementQuery()
+    {
+        $headers = [
+            'Content-Type' => 'application/json',
+            'Accept' => '*/*',
+            'Host' => '127.0.0.1:23552',
+            'Connection' => 'keep-alive'
+        ];
+        $body = '{
+    "header": {
+        "appId": "000000000010012",
+        "appSecret": "8c76d098-ce22-4df8-a01d-ea6f5502e5ec",
+        "openEPubK": "3A743B476533D137EAA130F266501CAAE6D0870B1CAF0934D1CA5566F90B763F5B11C4A57B402C102C956ADF0DFDA3BD91F2843C648EAF159A9B08C0C8ACF541",
+        "appDPriK": "7D0B1F1BAFAE24436AD322EF35A6784B264700B9402C33F9CA2C6BB7FE325AF9",
+        "openVPubK": "7EAFB55A843DCBB33E07E4E59D3AF14216768CC0C8055985633AC753E29F9A5C07586CDBC9806CD31F66B17B12B07193B3C471C3A707C07E793D42B676AF80B1",
+        "appSPriK": "E8E0A7F49E2EC0E0C45352BDD4D8579FAC73A258FEDFF919B334DA2103EB32B7",
+        "httpDomainName": "https://open-test.scrcu.com:9051/open-gate",
+        "apiUrl": "/onlinepay/OPC321560202000200000200",
+        "version" :"1.0.0"
+    
+    },
+   "body": {
+        "charset": "UTF-8",
+        "orderNumber": "f7jugi1dlhna8b5555d8d363075392",
+        "subOrderNumber":"f7jugi1dlhna8b5555d8d363075392",
+        "settleMerNo":"129765100270890",
+        "merId":"129765100270890",
+        "version":"V5.0.0"
+       
+    }
+}';
+        $client = new Client(['base_uri' => 'http://127.0.0.1:23552']);
+        $request = new Request('POST', 'http://127.0.0.1:23552/sdk/doApi', $headers, $body);
+        try {
+            $res = $client->send($request);
+        } catch (GuzzleException $e) {
+            halt($e);
+        }
+        return $res->getBody()->getContents();
+    }
+
+    public function OrderClosure()
+    {
+        $headers = [
+            'Content-Type' => 'application/json',
+            'Accept' => '*/*',
+            'Host' => '127.0.0.1:23552',
+            'Connection' => 'keep-alive'
+        ];
+        $body = '{
+    "header": {
+        "appId": "000000000010012",
+        "appSecret": "8c76d098-ce22-4df8-a01d-ea6f5502e5ec",
+        "openEPubK": "3A743B476533D137EAA130F266501CAAE6D0870B1CAF0934D1CA5566F90B763F5B11C4A57B402C102C956ADF0DFDA3BD91F2843C648EAF159A9B08C0C8ACF541",
+        "appDPriK": "7D0B1F1BAFAE24436AD322EF35A6784B264700B9402C33F9CA2C6BB7FE325AF9",
+        "openVPubK": "7EAFB55A843DCBB33E07E4E59D3AF14216768CC0C8055985633AC753E29F9A5C07586CDBC9806CD31F66B17B12B07193B3C471C3A707C07E793D42B676AF80B1",
+        "appSPriK": "E8E0A7F49E2EC0E0C45352BDD4D8579FAC73A258FEDFF919B334DA2103EB32B7",
+        "httpDomainName": "https://open-test.scrcu.com:9051/open-gate",
+        "apiUrl": "/onlinepay/OPC321560102000200000100",
+        "version" :"1.0.0"
+    
+    },
+   "body": {
+    "orderNumber":"b16808d20c4e4e9eb7224e49756d456f",
+    "merId":"129765100278888"
+       
+    }
+}';
+        $client = new Client(['base_uri' => 'http://127.0.0.1:23552']);
+        $request = new Request('POST', 'http://127.0.0.1:23552/sdk/doApi', $headers, $body);
+        try {
+            $res = $client->send($request);
+        } catch (GuzzleException $e) {
+            halt($e);
+        }
+        return $res->getBody()->getContents();
+    }
+
+    public function OrderQuery()
+    {
+        $headers = [
+            'Content-Type' => 'application/json',
+            'Accept' => '*/*',
+            'Host' => '127.0.0.1:23552',
+            'Connection' => 'keep-alive'
+        ];
+        $body = '{
+    "header": {
+        "appId": "000000000010012",
+        "appSecret": "8c76d098-ce22-4df8-a01d-ea6f5502e5ec",
+        "openEPubK": "3A743B476533D137EAA130F266501CAAE6D0870B1CAF0934D1CA5566F90B763F5B11C4A57B402C102C956ADF0DFDA3BD91F2843C648EAF159A9B08C0C8ACF541",
+        "appDPriK": "7D0B1F1BAFAE24436AD322EF35A6784B264700B9402C33F9CA2C6BB7FE325AF9",
+        "openVPubK": "7EAFB55A843DCBB33E07E4E59D3AF14216768CC0C8055985633AC753E29F9A5C07586CDBC9806CD31F66B17B12B07193B3C471C3A707C07E793D42B676AF80B1",
+        "appSPriK": "E8E0A7F49E2EC0E0C45352BDD4D8579FAC73A258FEDFF919B334DA2103EB32B7",
+        "httpDomainName": "https://open-test.scrcu.com:9051/open-gate",
+        "apiUrl": "/onlinepay/OPC321560202000200000000",
+        "version" :"1.0.0"
+    
+    },
+   "body": {
+        "charset":"UTF-8",
+        "orderNumber":"f7c646fd1d8pca8b5555d8d363075393",
+        "merId":"129765100270890",
+        "version":"v5.0.0",
+        "tranType":"04"
+       
+    }
+}';
+        $client = new Client(['base_uri' => 'http://127.0.0.1:23552']);
+        $request = new Request('POST', 'http://127.0.0.1:23552/sdk/doApi', $headers, $body);
+        try {
+            $res = $client->send($request);
+        } catch (GuzzleException $e) {
+            halt($e);
+        }
+        return $res->getBody()->getContents();
+    }
+
+    public function refund()
+    {
+        $headers = [
+            'Content-Type' => 'application/json',
+            'Accept' => '*/*',
+            'Host' => '127.0.0.1:23552',
+            'Connection' => 'keep-alive'
+        ];
+        $body = '{
+    "header": {
+        "appId": "000000000010012",
+        "appSecret": "8c76d098-ce22-4df8-a01d-ea6f5502e5ec",
+        "openEPubK": "3A743B476533D137EAA130F266501CAAE6D0870B1CAF0934D1CA5566F90B763F5B11C4A57B402C102C956ADF0DFDA3BD91F2843C648EAF159A9B08C0C8ACF541",
+        "appDPriK": "7D0B1F1BAFAE24436AD322EF35A6784B264700B9402C33F9CA2C6BB7FE325AF9",
+        "openVPubK": "7EAFB55A843DCBB33E07E4E59D3AF14216768CC0C8055985633AC753E29F9A5C07586CDBC9806CD31F66B17B12B07193B3C471C3A707C07E793D42B676AF80B1",
+        "appSPriK": "E8E0A7F49E2EC0E0C45352BDD4D8579FAC73A258FEDFF919B334DA2103EB32B7",
+        "httpDomainName": "https://open-test.scrcu.com:9051/open-gate",
+        "apiUrl": "/onlinepay/OPC321560202000200000400",
+        "version" :"1.0.0"
+    
+    },
+   "body": {
+        "charset":"UTF-8",
+        "orderNumber":"f7c646mlkd8pca8b5555d8d363075abc",
+        "merNo":"129765100270890",
+        "channel":"02",
+        "oriSubOrderNumber":"f7jugi1d8pca8b5555d8d363075392",
+        "merId":"129765100270890",
+        "orderSendTime":"20200713093647",
+        "orderAmt":"10",
+        "oriOrderNumber":"f7jugi1d8pca8b5555d8d363075392",
+        "version":"V5.0.0",
+        "backEndUrl":"https://www.testpay.com/refund"
+    }
+}';
+        $client = new Client(['base_uri' => 'http://127.0.0.1:23552']);
+        $request = new Request('POST', 'http://127.0.0.1:23552/sdk/doApi', $headers, $body);
+        try {
+            $res = $client->send($request);
+        } catch (GuzzleException $e) {
+            halt($e);
+        }
+        return $res->getBody()->getContents();
+    }
+    public function NoticeSettlement()
+    {
+        $headers = [
+            'Content-Type' => 'application/json',
+            'Accept' => '*/*',
+            'Host' => '127.0.0.1:23552',
+            'Connection' => 'keep-alive'
+        ];
+        $body = '{
+    "header": {
+        "appId": "000000000010012",
+        "appSecret": "8c76d098-ce22-4df8-a01d-ea6f5502e5ec",
+        "openEPubK": "3A743B476533D137EAA130F266501CAAE6D0870B1CAF0934D1CA5566F90B763F5B11C4A57B402C102C956ADF0DFDA3BD91F2843C648EAF159A9B08C0C8ACF541",
+        "appDPriK": "7D0B1F1BAFAE24436AD322EF35A6784B264700B9402C33F9CA2C6BB7FE325AF9",
+        "openVPubK": "7EAFB55A843DCBB33E07E4E59D3AF14216768CC0C8055985633AC753E29F9A5C07586CDBC9806CD31F66B17B12B07193B3C471C3A707C07E793D42B676AF80B1",
+        "appSPriK": "E8E0A7F49E2EC0E0C45352BDD4D8579FAC73A258FEDFF919B334DA2103EB32B7",
+        "httpDomainName": "https://open-test.scrcu.com:9051/open-gate",
+        "apiUrl": "/onlinepay/OPC321560202000200000400",
+        "version" :"1.0.0"
+    
+    },
+   "body": {
+        "charset":"UTF-8",
+        "orderNumber":"f7c646mlkd8pca8b5555d8d363075abc",
+        "merNo":"129765100270890",
+        "channel":"02",
+        "oriSubOrderNumber":"f7jugi1d8pca8b5555d8d363075392",
+        "merId":"129765100270890",
+        "orderSendTime":"20200713093647",
+        "orderAmt":"10",
+        "oriOrderNumber":"f7jugi1d8pca8b5555d8d363075392",
+        "version":"V5.0.0",
+        "backEndUrl":"https://www.testpay.com/refund"
+    }
+}';
+        $client = new Client(['base_uri' => 'http://127.0.0.1:23552']);
+        $request = new Request('POST', 'http://127.0.0.1:23552/sdk/doApi', $headers, $body);
+        try {
+            $res = $client->send($request);
+        } catch (GuzzleException $e) {
+            halt($e);
+        }
+        return $res->getBody()->getContents();
+    }
+}

app/controller/api/Common.php

@@ -493,10 +493,15 @@ class Common extends BaseController
     }
 
     //获取云店铺
-    public function get_cloud_shop($street_code){
-        $find=DB::name('merchant')->alias('m')->where('m.type_id',11)->where('m.is_del',0)->where('m.status',1)
-        ->join('merchant_address a','a.mer_id=m.mer_id and a.street_id='.$street_code)
-        ->field('m.mer_id')->find();
+    public function get_cloud_shop(int $street_code){
+        $find=DB::name('merchant')
+            ->alias('m')
+            ->where('m.type_id',11)
+            ->where('m.is_del',0)
+            ->where('m.status',1)
+            ->where('m.street_id',$street_code)
+            ->join('merchant_category c','m.category_id=c.merchant_category_id')
+            ->field('m.mer_id,category_id,category_name,c.background,c.description')->select();
         return app('json')->success($find??[]);
     }
 }

app/controller/api/server/StoreOrder.php

@@ -77,7 +77,6 @@ class StoreOrder extends BaseController
         $where['search'] = $this->request->param('store_name');
         $where['mer_id'] = $merId;
         $where['is_del'] = 0;
-        if($where['status'] == 2) $where['order_type'] = 0;
         return app('json')->success($repository->merchantGetList($where, $page, $limit));
     }
 

app/controller/api/server/StoreProduct.php

@@ -10,6 +10,7 @@
 // +----------------------------------------------------------------------
 namespace app\controller\api\server;
 
+use app\common\model\system\merchant\Merchant;
 use app\common\repositories\store\order\StoreCartRepository;
 use app\common\repositories\store\product\ProductLabelRepository;
 use app\common\repositories\store\product\ProductRepository;
@@ -119,7 +120,8 @@ class StoreProduct extends BaseController
         }
         $data['mer_status'] = ($merchant['is_del'] || !$merchant['mer_state'] || !$merchant['status']) ? 0 : 1;
         $data['mer_id'] = $merId;
-        $this->repository->edit($id, $data, $merId, 0, 1);
+        $productType = $merchant->type_id == Merchant::TypeSupplyChain ? 98 : 0;
+        $this->repository->edit($id, $data, $merId, $productType, 1);
         return app('json')->success('编辑成功');
     }
 

app/controller/api/store/merchant/Merchant.php

@@ -27,6 +27,7 @@ use crmeb\basic\BaseController;
 use app\common\repositories\system\merchant\MerchantRepository as repository;
 use think\facade\Db;
 use think\facade\Queue;
+use app\common\model\system\merchant\Merchant as MerchantModel;
 
 class Merchant extends BaseController
 {
@@ -54,6 +55,9 @@ class Merchant extends BaseController
     {
         [$page, $limit] = $this->getPage();
         $where = $this->request->params(['keyword', 'order', 'is_best', 'location', 'category_id', 'type_id','is_trader', 'street_id']);
+        if (empty($where['type_id'])) {
+            $where['type_id'] = [MerchantModel::TypeCloudWarehouse, MerchantModel::TypeStore, MerchantModel::TypeSupplyChain, MerchantModel::TypePlatform];
+        }
         return app('json')->success($this->repository->getList($where, $page, $limit, $this->userInfo));
     }
 
@@ -169,8 +173,13 @@ class Merchant extends BaseController
             if ($sys_bases_status && empty($data['mer_certificate']))
                 return app('json')->fail('店铺资质不可为空');
 
+            $merCertificate = merchantConfig($id, 'mer_certificate');
+            if (!is_array($merCertificate)) {
+                $merCertificate = explode( ',', $merCertificate);
+            }
+            $merCertificate[0] = $data['mer_certificate'];
             app()->make(ConfigValueRepository::class)->setFormData([
-                'mer_certificate' => $data['mer_certificate']
+                'mer_certificate' => $merCertificate
             ], $id);
             unset($data['mer_certificate']);
 
@@ -222,6 +231,8 @@ class Merchant extends BaseController
         }
 
         $data = Db::name('merchant')->where('mer_id',$id)->find();
+        $data['mer_certificate'] = merchantConfig($id, 'mer_certificate');
+        $data['mer_certificate'] = $data['mer_certificate'][0] ?? '';
         // $append = ['merchantCategory', 'merchantType', 'mer_certificate'];
         // if ($merchant['is_margin'] == -10)
         //     $append[] = 'refundMarginOrder';
@@ -250,22 +261,37 @@ class Merchant extends BaseController
             'extract_minimum_line' => $extract_minimum_line,//提现最低额度
             'extract_minimum_num' => $extract_minimum_num,//提现最低次数
             'extract_money' => $_extract,//可提现金额
-            'financial_bank_name' => $merchant->financial_bank->name,//银行卡信息
-            'financial_bank_bank' => $merchant->financial_bank->bank,//银行卡信息
-            'financial_bank_code' => $merchant->financial_bank->bank_code,//银行卡信息
-
+            'financial_bank_name' => $merchant->financial_bank->name ?? '',//银行卡信息
+            'financial_bank_bank' => $merchant->financial_bank->bank ?? '',//银行卡信息
+            'financial_bank_code' => $merchant->financial_bank->bank_code ?? '',//银行卡信息
+            'financial_bank_branch' => $merchant->financial_bank->bank_branch ?? '',//开户行
             'financial_type' => $merchant->financial_type,//提现方式
         ];
         return app('json')->success($data);
     }
+
+    /**
+     * 提交提现申请
+     * @param $merId
+     * @return mixed
+     * @throws \FormBuilder\exception\FormBuilderException
+     */
     public function createApply($merId)
     {
-        $data = $this->request->param(['extract_money','financial_type']);
+        $data = $this->request->param(['extract_money','financial_type', 'financial_bank_name', 'financial_bank_bank', 'financial_bank_code', 'financial_bank_branch']);
         $merchant = app()->make(MerchantRepository::class)->search(['mer_id' => $merId])->field('reg_admin_id,uid,mer_id,mer_name,mer_money,financial_bank,financial_wechat,financial_alipay,financial_type')->find();
         if ($this->userInfo['uid'] != $merchant->uid){
             return app('json')->fail('你不是管理员无法进行提现操作');
         }
+        $bankInfo = [
+            'name' => $data['financial_bank_name'],
+            'bank' => $data['financial_bank_bank'],
+            'bank_code' => $data['financial_bank_code'],
+            'bank_branch' => $data['financial_bank_branch'],
+        ];
+        $merchant->update(['financial_bank' => json_encode($bankInfo, JSON_UNESCAPED_UNICODE)], ['mer_id' => $merId]);
         $data['mer_admin_id'] = $merchant['reg_admin_id'];
+        unset($data['financial_bank_name'], $data['financial_bank_bank'], $data['financial_bank_code'], $data['financial_bank_branch']);
         app()->make(FinancialRepository::class)->saveApply($merId,$data);
         return app('json')->success('申请成功');
     }

app/controller/api/store/merchant/MerchantIntention.php

@@ -123,7 +123,9 @@ class MerchantIntention extends BaseController
         app()->make(MerchantIntentionValidate::class)->check($data);
         $check = app()->make(SmsService::class)->checkSmsCode($data['phone'], $data['code'], 'intention');
         $data['mer_type_id'] = (int)$data['mer_type_id'];
-        if (!$check) throw new ValidateException('验证码不正确');
+        if (!env('APP_DEBUG')) {
+            if (!$check) throw new ValidateException('验证码不正确');
+        }
         if (!app()->make(MerchantCategoryRepository::class)->get($data['merchant_category_id'])) throw new ValidateException('商户分类不存在');
         if ($data['mer_type_id'] && !app()->make(MerchantTypeRepository::class)->exists($data['mer_type_id']))
             throw new ValidateException('店铺类型不存在');
@@ -145,7 +147,10 @@ class MerchantIntention extends BaseController
 
     public function typeLst()
     {
-        $lst = app()->make(MerchantTypeRepository::class)->getSelect();
+        /** @var MerchantTypeRepository $repo */
+        $repo = app()->make(MerchantTypeRepository::class);
+        $repo->userApply = true;
+        $lst = $repo->getSelect(false);
         return app('json')->success($lst);
     }
 }

app/controller/api/store/order/StoreCart.php

@@ -12,6 +12,7 @@
 
 namespace app\controller\api\store\order;
 
+use app\common\dao\store\order\StoreCartDao;
 use app\common\repositories\store\order\StoreOrderRepository;
 use app\common\repositories\store\product\ProductAssistRepository;
 use app\common\repositories\store\product\ProductAssistSetRepository;
@@ -23,12 +24,14 @@ use app\common\repositories\store\product\StoreDiscountProductRepository;
 use app\common\repositories\store\product\StoreDiscountRepository;
 use app\common\repositories\store\StoreSeckillActiveRepository;
 use app\common\repositories\user\UserRepository;
+use Fastknife\Utils\AesUtils;
 use MongoDB\BSON\MaxKey;
 use think\App;
 use crmeb\basic\BaseController;
 use app\validate\api\StoreCartValidate as validate;
 use app\common\repositories\store\order\StoreCartRepository as repository;
 use think\exception\ValidateException;
+use think\facade\Log;
 
 class StoreCart extends BaseController
 {
@@ -67,6 +70,18 @@ class StoreCart extends BaseController
     public function create(validate $validate)
     {
         $data = $this->checkParams($validate);
+        if (!empty($data['referer'])) {
+            if (strrpos($data['referer'], '==') === false) {
+                $data['referer'] .= '==';
+            }
+            try {
+                $decrypt = AesUtils::decrypt($data['referer'], env('app_key'));
+                $decryptArray = explode('|', $decrypt);
+            } catch (\Exception $e) {
+                Log::info('decrypt fail');
+            }
+        }
+        $entryMerId = $decryptArray[0] ?? '';
         if(!in_array($data['product_type'],[0,1,2,3,4,98])) return app('json')->fail('商品类型错误');
         if ($data['cart_num'] <= 0) return app('json')->fail('购买数量有误');
         $user = $this->request->userInfo();
@@ -109,11 +124,19 @@ class StoreCart extends BaseController
             //更新购物车
             $cart_id = $cart['cart_id'];
             $cart_num = ['cart_num' => ($cart['cart_num'] + $data['cart_num'])];
+            if ($entryMerId && $entryMerId != $result['product']['mer_id']) {
+                $cart_num['source_id'] = $entryMerId;
+                $cart_num['source'] = StoreCartDao::SOURCE_STORE_CLOUD;
+            }
             $storeCart = $this->repository->update($cart_id,$cart_num);
         } else {
             //添加购物车
             $data['uid'] = $this->request->uid();
             $data['mer_id'] = $result['product']['mer_id'];
+            if ($entryMerId && $entryMerId != $result['product']['mer_id']) {
+                $data['source_id'] = $entryMerId;
+                $data['source'] = StoreCartDao::SOURCE_STORE_CLOUD;
+            }
             $cart = $storeCart = $this->repository->create($data);
         }
         event('user.cart', compact('user','storeCart'));
@@ -229,7 +252,7 @@ class StoreCart extends BaseController
      */
     public function checkParams(validate $validate)
     {
-        $data = $this->request->params(['product_id','product_attr_unique','cart_num','is_new',['product_type',0],['group_buying_id',0],['spread_id',0]]);
+        $data = $this->request->params(['product_id','product_attr_unique','cart_num','is_new',['product_type',0],['group_buying_id',0],['spread_id',0], 'referer']);
         $validate->check($data);
         if ($data['spread_id']) {
             if ($data['spread_id'] !== $this->request->userInfo()->uid){

app/controller/api/store/order/StoreMicropayOrder.php

@@ -113,15 +113,11 @@ class StoreMicropayOrder extends BaseController
         $addressId=Db::name('user_address')->where('uid',$uid)->find();
         $merchant=Db::name('merchant')->where('mer_id',$mer_id)->find();
         if (!$addressId){
-            $merchant_address=Db::name('merchant_address')->where('mer_id',$mer_id)->find();
-            if (!$merchant_address){
-                return app('json')->fail('商户地址不存在');
-            }
-            if ($merchant_address['area_id']==0||$merchant_address['street_id']==0||$merchant_address['village_id']==0){
+            if ($merchant['area_id']==0||$merchant['street_id']==0||$merchant['village_id']==0){
                 return app('json')->fail('商户地址不完整');
             }
-            $area_name=Db::name('geo_area')->where('area_code',$merchant_address['area_id'])->value('area_name');
-            $street_name=Db::name('geo_street')->where('street_code',$merchant_address['street_id'])->value('street_name');
+            $area_name=Db::name('geo_area')->where('area_code',$merchant['area_id'])->value('area_name');
+            $street_name=Db::name('geo_street')->where('street_code',$merchant['street_id'])->value('street_name');
             $district_id=Db::name('city_area')->where('name',$area_name)->value('id');
             $street_id=Db::name('city_area')->where('name',$street_name)->value('id');
             $data=[

app/controller/api/store/order/StoreOrder.php

@@ -188,6 +188,7 @@ class StoreOrder extends BaseController
      */
     public function groupOrderDetail($id, StoreGroupOrderRepository $groupOrderRepository)
     {
+        $groupOrderRepository->getAll = true;
         $groupOrder = $groupOrderRepository->detail($this->request->uid(), (int)$id);
         if (!$groupOrder)
             return app('json')->fail('订单不存在');

app/controller/api/store/product/CloudWarehouse.php

@@ -0,0 +1,80 @@
+<?php
+
+namespace app\controller\api\store\product;
+
+use app\common\dao\system\merchant\MerchantDao;
+use app\common\model\system\merchant\Merchant;
+use app\common\repositories\store\product\SpuRepository;
+use think\App;
+use crmeb\basic\BaseController;
+
+class CloudWarehouse extends BaseController
+{
+
+    /**
+     * @var SpuRepository
+     */
+    protected $repository;
+    /**
+     * @var MerchantDao
+     */
+    protected $merchantDao;
+    /**
+     * @var SpuRepository
+     */
+    protected $spuRepository;
+
+    /**
+     * StoreProduct constructor.
+     * @param App $app
+     * @param SpuRepository $repository
+     * @param MerchantDao $merchantDao
+     */
+    public function __construct(App $app, SpuRepository $repository, MerchantDao $merchantDao, SpuRepository $spuRepository)
+    {
+        parent::__construct($app);
+        $this->repository = $repository;
+        $this->merchantDao = $merchantDao;
+        $this->spuRepository = $spuRepository;
+        $this->spuRepository->userInfo = $this->request->isLogin() ? $this->request->userInfo() : null;
+    }
+
+    /**
+     * 指定类型的云仓商品列表
+     * @return mixed
+     */
+    public function index()
+    {
+        $params = $this->request->params(['category_id', 'street_code', 'order', ['product_type', 0], 'keyword']);
+        $search = [
+            'street_id' => $params['street_code'],
+            'type_id' => Merchant::TypeStore,
+            'category_id' => $params['category_id'],
+            'status' => 1,
+            'is_del' => 0,
+            'mer_state' => 1,
+        ];
+        $merchantIds = $this->merchantDao->search($search)->column('mer_id');
+        [$page, $limit] = $this->getPage();
+        if (empty($merchantIds)) {
+            return app('json')->success(['count' => 0, 'list' => []]);
+        }
+        $entryWhere = [
+            'street_id' => $params['street_code'],
+            'type_id' => Merchant::TypeCloudWarehouse,
+            'category_id' => $params['category_id'],
+            'status' => 1,
+            'is_del' => 0,
+            'mer_state' => 1,
+        ];
+        $where['entry_mer_id'] = $this->merchantDao->search($entryWhere)->value('mer_id');
+        $where['keyword'] = $params['keyword'];
+        $where['mer_ids'] = $merchantIds;
+        $where['product_type'] = $params['product_type'];
+        $where['is_gift_bag'] = 0;
+        $where['order'] = $params['order'] ?: 'sort';
+        $products = $this->spuRepository->getApiCloudSearch($where, $page, $limit, false);
+        return app('json')->success($products);
+    }
+
+}

app/controller/api/store/product/StoreMicro.php

@@ -1,5 +1,7 @@
 <?php
 namespace app\controller\api\store\product;
+use app\common\dao\system\merchant\MerchantDao;
+use app\common\model\system\merchant\Merchant;
 use app\common\repositories\store\product\ProductRepository;
 use think\facade\Db;
 use crmeb\basic\BaseController;
@@ -8,11 +10,17 @@ class StoreMicro extends BaseController
 {
     function seach_bar_code($mer_id,$code='',$name=''){
         $category_id=Db::name('merchant')->where('mer_id',$mer_id)->value('category_id');
-        $mer_id=Db::name('merchant')->where('category_id',$category_id)->where('type_id',13)->value('mer_id');
+        $platformMerId = app()->make(MerchantDao::class)->getValidMerchant(['category_id' => $category_id, 'type_id' => Merchant::TypePlatform], 'mer_id')->value('mer_id');
+        $productWhere = ['is_show' => 1, 'status' => 1, 'mer_status' => 1, 'is_del' => 0];
         if($code!=''){
-            $find=Db::name('store_product')->where('mer_id',$mer_id)->where('bar_code',$code)->select();
+            if (strlen($code) != 13) {
+                return app('json')->success('条形码长度不正确');
+            }
+            $product_id_arr=Db::name('store_product_attr_value')->where('mer_id',$platformMerId)->where('bar_code',$code)->column('product_id');
+            $product_id_arr=implode(',',$product_id_arr);
+            $find=Db::name('store_product')->where('product_id',$product_id_arr)->where($productWhere)->select();
         }else{
-            $find=Db::name('store_product')->where('mer_id',$mer_id)->where('store_name','like','%'.$name.'%')->select();
+            $find=Db::name('store_product')->where('mer_id',$platformMerId)->where('store_name','like','%'.$name.'%')->where($productWhere)->select();
         }
         if (count($find)==0){
             if($code!=''){
@@ -49,10 +57,13 @@ class StoreMicro extends BaseController
             if($find['product_type']!=0){
                 return app('json')->fail('该商品不是普通商品');
             }
+            $exist = Db::name('store_product')->where('old_product_id', $product_id)->where('mer_id', $mer_id)->find();
+            if($exist){
+                return app('json')->fail('已经导入过该商品了');
+            }
             $find['attrValue']=Db::name('store_product_attr_value')->where('product_id',$find['product_id'])->field('image,price,cost,ot_price,svip_price,stock,bar_code,weight,volume')->select();
             $find['content']=Db::name('store_product_content')->where('product_id',$find['product_id'])->value('content');
             $find['is_show']=0;
-            $find['mer_status']=1;
             $find['mer_id']=$mer_id;
             $find['temp_id']="";
             $find['give_coupon_ids']=[];
@@ -68,8 +79,11 @@ class StoreMicro extends BaseController
             $find['is_used']=1;
             $find['status']=1;
             $find['mer_status']=1;
+            $find['old_product_id']=$product_id;
+            $find['slider_image']=explode(',',$find['slider_image']);
             unset($find['product_id'],$find['create_time']);
         }
+        /** @var ProductRepository $make */
         $make = app()->make(ProductRepository::class);
         $a=$make->create($find,0);
         if($a){

app/controller/api/store/product/StoreProduct.php

@@ -13,6 +13,7 @@
 
 namespace app\controller\api\store\product;
 
+use app\common\model\store\product\Product;
 use app\common\repositories\store\PriceRuleRepository;
 use app\common\repositories\store\product\SpuRepository;
 use app\common\repositories\store\StoreCategoryRepository;
@@ -167,6 +168,7 @@ class StoreProduct extends BaseController
     public function preview()
     {
         $param = $this->request->params(['key','id',['product_type',0]]);
+        $param['product_type'] = Product::getInstance()->where('product_id', $param['id'])->value('product_type');
         $data = [];
         if($param['key']){
             $data = Cache::get($param['key']);

app/controller/api/store/product/StoreSpu.php

@@ -10,6 +10,7 @@
 // +----------------------------------------------------------------------
 namespace app\controller\api\store\product;
 
+use app\common\model\system\merchant\Merchant;
 use app\common\repositories\store\product\ProductRepository;
 use app\common\repositories\store\StoreCategoryRepository;
 use app\common\repositories\system\merchant\MerchantRepository;
@@ -61,6 +62,8 @@ class StoreSpu extends BaseController
         $where['is_gift_bag'] = 0;
         $where['product_type'] = 0;
         $where['order'] = $where['order'] ?: 'star';
+        $where['mer_ids'] = Merchant::getInstance()->where('type_id', Merchant::TypeStore)
+            ->where(['status' => 1, 'mer_state' => 1, 'is_del' => 0])->column('mer_id');
         if ($where['is_trader'] != 1) unset($where['is_trader']);
         $data = $this->repository->getApiSearch($where, $page, $limit, $this->userInfo);
         return app('json')->success($data);
@@ -89,25 +92,31 @@ class StoreSpu extends BaseController
 
     /**
      * TODO 镇云仓库商户的商品搜索列表
-     * @param $id
+     * @param int $id
      * @return mixed
      * @author Qinii
      * @day 12/24/20
      */
-    public function cloudMerProductLst($id)
+    public function cloudMerProductLst(int $id)
     {
         [$page, $limit] = $this->getPage();
         $where = $this->request->params([
             'keyword', 'cate_id', 'order', 'price_on', 'price_off', 'brand_id', 'pid', 'mer_cate_id', ['product_type', 0], 'action', 'common'
         ]);
         if ($where['action']) unset($where['product_type']);
-//        $category_id=Db::name('merchant')->where('mer_id',$id)->value('category_id');->where('category_id',$category_id)
-        $mer_id=Db::name('merchant')->where('mer_state',1)->where('status',1)->where('type_id',11)->value('mer_id');
-        if (!$mer_id){
+        $currentMerchant = Db::name('merchant')->where('mer_id',$id)->field('category_id,street_id')->find();
+        $mer_id = Db::name('merchant')
+            ->where('street_id',$currentMerchant['street_id'])
+            ->where('mer_state',1)
+            ->where('status',1)
+            ->where('category_id',$currentMerchant['category_id'])
+            ->where('type_id',Merchant::TypeCloudWarehouse)
+            ->value('mer_id');
+        if (!$mer_id) {
             return app('json')->success(['count'=>0,'list'=>[]]);
-
         }
         $where['mer_id'] = $mer_id;
+        $where['entry_mer_id'] = $id;
         $where['is_gift_bag'] = 0;
         $where['order'] = $where['order'] ? $where['order'] : 'sort';
         $data = $this->repository->getApiCloudSearch($where, $page, $limit);
@@ -148,6 +157,8 @@ class StoreSpu extends BaseController
         }
         $where['product_type'] = 0;
         $where['is_stock'] = 1;
+        $where['mer_ids'] = Merchant::getInstance()->where('type_id', Merchant::TypeStore)
+            ->where(['status' => 1, 'mer_state' => 1, 'is_del' => 0])->column('mer_id');
         $data = $this->repository->getApiSearch($where, $page, $limit, $this->userInfo);
         return app('json')->success($data);
     }

app/controller/merchant/store/product/Product.php

@@ -12,6 +12,7 @@
 
 namespace app\controller\merchant\store\product;
 
+use app\common\model\system\merchant\Merchant;
 use app\common\repositories\store\order\StoreCartRepository;
 use app\common\repositories\store\product\ProductAttrValueRepository;
 use app\common\repositories\store\product\SpuRepository;
@@ -90,6 +91,7 @@ class Product extends BaseController
         }else{
             $product_type=0;//普通商品
         }
+        $data['update_time'] = date('Y-m-d H:i:s');
         $this->repository->create($data,$product_type);
         return app('json')->success('添加成功');
     }
@@ -115,7 +117,9 @@ class Product extends BaseController
         }
         $data['mer_status'] = ($this->request->merchant()->is_del || !$this->request->merchant()->mer_state || !$this->request->merchant()->status) ? 0 : 1;
         $data['mer_id'] = $this->request->merId();
-        $this->repository->edit($id, $data, $this->request->merId(), 0);
+        $data['update_time'] = date('Y-m-d H:i:s');
+        $productType = $this->request->merchant()->type_id == Merchant::TypeSupplyChain ? 98 : 0;
+        $this->repository->edit($id, $data, $this->request->merId(), $productType);
         return app('json')->success('编辑成功');
     }
 

app/event.php

@@ -62,9 +62,11 @@ return [
         'pay_success_micro_pay' => [\crmeb\listens\pay\OrderMicroPaySuccessListen::class],
         'pay_success_presell' => [\crmeb\listens\pay\PresellPaySuccessListen::class],
         'pay_success_meal' => [\crmeb\listens\pay\MealSuccessListen::class],
-        'community_address'=>[\app\listener\CommunityAddress::class],
-//        'order.paySuccess'=>[\app\listener\OrderPaySuccess::class],
+//        'community_address'=>[\app\listener\CommunityAddress::class],
+        'order.paySuccessOrder'=>[\app\listener\paySuccessOrder::class],
         'product.create'=>[\app\listener\ProductCreate::class],
+        'product.sell'=>[\app\listener\CloudProduct::class], //商品上下架
+        'refund.after'=>[\app\listener\AfterRefund::class],
     ],
 
     'subscribe' => [],

app/listener/AfterRefund.php

@@ -0,0 +1,87 @@
+<?php
+
+declare (strict_types=1);
+
+namespace app\listener;
+
+use app\common\dao\system\merchant\MerchantDao;
+use app\common\model\system\merchant\FinancialRecord;
+use app\common\model\system\serve\ServeOrder;
+use app\common\repositories\system\merchant\FinancialRecordRepository;
+use app\common\repositories\system\merchant\MerchantRepository;
+use think\facade\Log;
+
+/**
+ * 订单退款之后，退佣金
+ */
+class AfterRefund
+{
+
+    public $refundOrder;
+
+    public function handle($event)
+    {
+        Log::info('refundCommissionStart');
+        $this->refundOrder = $event['res'];
+        if ($this->refundOrder['refund_price'] != $this->refundOrder->order['total_price']) {
+            Log::info('refundCommissionEnd, not full refund');
+            return true;
+        }
+        $financialRecords = FinancialRecord::getInstance()->where('order_id', $this->refundOrder['order_id'])->select();
+        Log::info('refundCommissionCount:' . count($financialRecords));
+        foreach ($financialRecords as $financialRecord) {
+            if (in_array($financialRecord['financial_type'], ['commission_to_cloud_warehouse', 'commission_to_entry_merchant', 'commission_to_service_team', 'commission_to_village', 'commission_to_town', ])) {
+                //佣金类型的退还佣金
+                $this->subMoney($financialRecord);
+                $this->saveFinanceRecord($financialRecord);
+            }
+            if ($financialRecord['financial_type'] == 'auto_margin') {
+                Log::info("refundMargin, mer_id: {$financialRecord['mer_id']}, money: {$financialRecord['number']}");
+                //佣金类型的扣除保证金
+                ServeOrder::getInstance()->where('store_order_id', $financialRecord['order_id'])->update(['is_del' => 1]);
+                $merchant = app()->make(MerchantDao::class)->get($financialRecord['mer_id']);
+                $merchant->paid_margin = max(bcsub($merchant['paid_margin'], $financialRecord['number'], 2), 0);
+                $merchant->ot_margin = $merchant->paid_margin;
+                if ($merchant->paid_margin <= 0) {
+                    $merchant->is_margin = MerchantRepository::NeedMargin;
+                }
+                $merchant->save();
+                $this->addMoney($financialRecord);
+                $this->saveFinanceRecord($financialRecord);
+            }
+        }
+        Log::info('refundCommissionEnd');
+    }
+
+    public function subMoney($financialRecord)
+    {
+        Log::info("refundCommission, mer_id: {$financialRecord['mer_id']}, money: {$financialRecord['number']}");
+        /** @var MerchantRepository $merchantRepository */
+        $merchantRepository = app()->make(MerchantRepository::class);
+        $merchantRepository->subLockMoney($financialRecord['mer_id'], 'order', $this->refundOrder['order_id'], (float)$financialRecord['number']);
+    }
+
+    public function addMoney($financialRecord)
+    {
+        Log::info("refundCommission, mer_id: {$financialRecord['mer_id']}, money: {$financialRecord['number']}");
+        /** @var MerchantRepository $merchantRepository */
+        $merchantRepository = app()->make(MerchantRepository::class);
+        $merchantRepository->addMoney($financialRecord['mer_id'], (float)$financialRecord['number']);
+    }
+
+    public function saveFinanceRecord($financialRecord)
+    {
+        /** @var FinancialRecordRepository $financialRecordRepository */
+        $financialRecordRepository = app()->make(FinancialRecordRepository::class);
+        $financialRecordRepository->dec([
+            'order_id' => $this->refundOrder->refund_order_id,
+            'order_sn' => $this->refundOrder->refund_order_sn,
+            'user_info' => $this->refundOrder->user->nickname,
+            'user_id' => $this->refundOrder->uid,
+            'type' => 1,
+            'financial_type' => $financialRecord['financial_type'] . '_refund',
+            'number' => $financialRecord['number'],
+        ], $financialRecord['mer_id']);
+    }
+
+}

app/listener/CloudProduct.php

@@ -0,0 +1,62 @@
+<?php
+
+declare (strict_types=1);
+
+namespace app\listener;
+
+use app\common\dao\store\product\CloudProductDao;
+use app\common\model\store\product\Product;
+use app\common\model\system\merchant\Merchant;
+use crmeb\services\RedisCacheService;
+use app\common\model\store\product\CloudProduct as CloudProductModel;
+
+class CloudProduct
+{
+
+    public function handle($event)
+    {
+        $productIds = $event['product_id'];
+        $products = Product::withTrashed()->whereIn('product_id', $productIds)->field('product_id,mer_id,status,is_del,is_show,mer_status,is_used')->select();
+        /** @var CloudProductDao $repo */
+        $repo = app()->make(CloudProductDao::class);
+        /** @var RedisCacheService $RedisCacheService */
+        $RedisCacheService = app()->make(RedisCacheService::class);
+        $clearCache = [];
+        foreach ($products as $product) {
+            $categoryId = Merchant::getDB()->where('mer_id', $product['mer_id'])->where('type_id', Merchant::TypeStore)->value('category_id');
+            if (!$categoryId) {
+                continue;
+            }
+            $cloudMerchant = Merchant::getDB()->where(['type_id' => Merchant::TypeCloudWarehouse, 'category_id' => $categoryId, 'status' => 1, 'mer_state' => 1])->value('mer_id');
+            $status = $product->isEnable() ? 1 : 0;
+            $exist = $repo->get($product['product_id']);
+            if (!$exist) {
+                $values = [
+                    'mer_id' => $cloudMerchant,
+                    'source_mer_id' => $product['mer_id'],
+                    'product_id' => $product['product_id'],
+                    'status' => $status,
+                    'create_time' => date('Y-m-d H:i:s'),
+                ];
+                $repo->create($values);
+            } else {
+                $repo->update((int)$product['product_id'], ['status' => $status]);
+            }
+
+            $cacheKey = sprintf(CloudProductModel::CacheKey, $cloudMerchant);
+            $exist = $RedisCacheService->SISMEMBER($cacheKey, $product['product_id']);
+            if ($status == 1 && !$exist) {
+                $RedisCacheService->SADD($cacheKey, $product['product_id']);
+                $clearCache[] = $cloudMerchant;
+            } elseif ($status == 0) {
+                $RedisCacheService->SREM($cacheKey, $product['product_id']);
+                $clearCache[] = $cloudMerchant;
+            }
+        }
+        foreach ($clearCache as $item) {
+            $takenKey = sprintf(CloudProductModel::TakenKey, $item);
+            $RedisCacheService->del($takenKey);
+        }
+    }
+
+}

app/listener/ProductCreate.php

@@ -3,110 +3,46 @@ declare (strict_types=1);
 
 namespace app\listener;
 
-use crmeb\services\RedisCacheService;
+use app\common\model\system\merchant\Merchant;
+use app\common\repositories\store\product\ProductRepository;
 use think\facade\Db;
-use think\facade\Log;
 
 class ProductCreate
 {
 
     public function handle($event)
     {
-        $merchant=Db::name('merchant')->where('status',1)->where('mer_state',1)->where('mer_id',$event['product']['mer_id'])->find();
-        if ($merchant['type_id']==11){
-            $this->CloudMerchanSpu($merchant,$event);
-        }
-        if ($merchant['type_id']==13 ||$merchant['type_id']==11){
+        $product = $event['product'];
+        $data = $event['data'];
+        $contentType = $event['conType'];
+        $merchant = Db::name('merchant')->where('status', 1)->where('is_del', 0)->where('mer_id', $product['mer_id'])->find();
+        if (empty($merchant)) {
             return false;
         }
-        $product_find=Db::name('store_product')->where('product_id',$event['product']['product_id'])->where('mer_id',$event['product']['mer_id'])->find();
+        if ($merchant['type_id'] == Merchant::TypePlatform || $merchant['type_id'] == Merchant::TypeCloudWarehouse) {
+            return false;
+        }
+
         //市级云仓
-        $cityMerchantId = Db::name('merchant')->where('status',1)->where('mer_state',1)->where('category_id',$merchant['category_id'])->where('type_id',13)->value('mer_id');
-        if ($cityMerchantId) {
-            $is_product=0;
-            if ($product_find['bar_code']!='' &&in_array($product_find['product_type'],[0,98]) &&$product_find['spec_type']==0){
-                $find=Db::name('store_product')->where('bar_code',$product_find['bar_code'])->where('mer_id',$cityMerchantId)->find();
-                if (!$find){
-                    $is_product=1;
-                }
-            }else{
-                $find=Db::name('store_product')->where('store_name',$product_find['store_name'])->where('mer_id',$cityMerchantId)->find();
-                if (!$find){
-                    $is_product=1;
-                }
+        $cityMerchant = Db::name('merchant')->where('status', 1)->where('mer_state', 1)->where('category_id', $merchant['category_id'])->where('type_id', Merchant::TypePlatform)->find();
+        if ($cityMerchant) {
+            $where = ['mer_id' => $cityMerchant['mer_id'], 'is_del' => 0];
+            if ($product['bar_code'] != '' && in_array($product['product_type'], [0, 98]) && $product['spec_type'] == 0) {
+                $where['bar_code'] = $product['bar_code'];
+            } else {
+                $where['store_name'] = $product['store_name'];
             }
-            if ($is_product==1){
-                $this->AddProduct($cityMerchantId,$product_find,$event);
+            $exist = Db::name('store_product')->where($where)->find();
+            if (!$exist) {
+                $data['mer_id'] = $cityMerchant['mer_id'];
+                $data['status'] = $cityMerchant['is_audit'] ? 0 : 1;
+                $data['mer_status'] = ($cityMerchant['is_del'] || !$cityMerchant['mer_state'] || !$cityMerchant['status']) ? 0 : 1;
+                $data['rate'] = 3;
+                $productType = $cityMerchant['type_id'] == Merchant::TypeSupplyChain ? 98 : 0;
+                $data['update_time'] = date('Y-m-d H:i:s');
+                app()->make(ProductRepository::class)->create($data, $productType, $contentType);
             }
         }
-        //镇街云仓
-        $is_product=0;
-        if ($merchant['type_id']==10){
-            $townMerchantId = Db::name('merchant')->where('status',1)->where('mer_state',1)->where('category_id',$merchant['category_id'])->where('type_id',11)->value('mer_id');
-            if ($townMerchantId){
-                if ($product_find['bar_code']!='' &&in_array($product_find['product_type'],[0,98]) &&$product_find['spec_type']==0){
-                    $find=Db::name('store_product')->where('bar_code',$product_find['bar_code'])->where('mer_id',$townMerchantId)->find();
-                    if (!$find){
-                        $is_product=1;
-                    }
-                }else{
-                    $find=Db::name('store_product')->where('store_name',$product_find['store_name'])->where('mer_id',$townMerchantId)->find();
-                    if (!$find){
-                        $is_product=1;
-                    }
-                }
-                if ($is_product==1){
-                    $this->AddProduct($townMerchantId,$product_find,$event);
-                }
-            }
-
-        }
     }
 
-    public function CloudMerchanSpu($data,$event){
-        $RedisCacheService = app()->make(RedisCacheService::class);
-        $exists=$RedisCacheService->exists('CloudMerchanSpu'.$data['mer_id']);
-        if ($exists){
-            $RedisCacheService->SADD ('CloudMerchanSpu'.$data['mer_id'], $event['product']['product_id']);
-        }else{
-            $Spu_arr=Db::name('store_spu')->where('mer_id',$data['mer_id'])->where('status',1)->column('product_id');
-            foreach ($Spu_arr as $k=>$v){
-                $RedisCacheService->SADD ('CloudMerchanSpu'.$data['mer_id'], $v);
-            }
-        }
-    }
-    public function AddProduct($mer_id,$product_find,$event){
-        $datas=[
-            'mer_id'=>$mer_id,
-            'status'=>1,
-            'brand_id'=>0,
-            'is_show'=>0,
-            'store_name'=>$product_find['store_name'],
-            'store_info'=>$product_find['store_info'],
-            'keyword'=>$product_find['keyword'],
-            'bar_code'=>$product_find['bar_code'],
-            'cate_id'=>$product_find['cate_id'],
-            'unit_name'=>$product_find['unit_name'],
-            'price'=>$product_find['price'],
-            'stock'=>$product_find['stock'],
-            'cost'=>$product_find['cost'],
-            'ot_price'=>$product_find['ot_price'],
-            'spec_type'=>$product_find['spec_type'],
-            'create_time'=>date('Y-m-d H:i:s'),
-            'image'=>$product_find['image'],
-            'slider_image'=>$product_find['slider_image'],
-        ];
-        $product_id=Db::name('store_product')->insertGetId($datas);
-        $content=Db::name('store_product_content')->where('product_id',$event['product']['product_id'])->find();
-        Db::name('store_product_content')->insert(['product_id'=>$product_id,'content'=>$content['content'],'type'=>$content['type']]);
-        $spu_arr=Db::name('store_spu')->where('mer_id',$product_find['mer_id'])->where('product_id',$event['product']['product_id'])->select()->toArray();
-        foreach ($spu_arr as $k=>$v){
-            $spu_arr[$k]['product_id']=$product_id;
-            $spu_arr[$k]['mer_id']=$mer_id;
-            $spu_arr[$k]['product_type']=0;
-            $spu_arr[$k]['create_time']=date('Y-m-d H:i:s');
-            unset($spu_arr[$k]['spu_id']);
-        }
-        Db::name('store_spu')->insertAll($spu_arr);
-    }
 }

app/listener/paySuccessOrder.php

@@ -0,0 +1,183 @@
+<?php
+declare (strict_types=1);
+
+namespace app\listener;
+
+use app\common\dao\store\order\StoreCartDao;
+use app\common\dao\system\merchant\MerchantDao;
+use app\common\model\system\merchant\Merchant;
+use app\common\repositories\system\merchant\FinancialRecordRepository;
+use app\common\repositories\system\merchant\MerchantRepository;
+use crmeb\utils\DingTalk;
+use think\facade\Db;
+use think\facade\Log;
+
+class paySuccessOrder
+{
+
+    public $totalAmount;
+    public $event;
+    public $finance = [];
+    public $streetId;
+    public $financeSn;
+    public $index = 1;
+    public $remain;
+
+    public function handle($event)
+    {
+        $this->event = $event;
+        $this->finance = [];
+        $this->index = 1;
+        Db::startTrans();
+        try {
+            $financialRecordRepository = app()->make(FinancialRecordRepository::class);
+            $this->financeSn = $financialRecordRepository->getSn();
+            $merchant = Merchant::find($event['order']['mer_id']);
+
+            if (!$merchant || $merchant['street_id'] == 0) {
+                throw new \Exception('商户地址不存在', 200);
+            }
+            $this->streetId = $merchant['street_id'];
+
+            $commission_rate = ($event['order']['commission_rate'] / 100);
+            //该笔订单平台总手续费
+            $realPrice = bcsub((string)$event['order']['total_price'], (string)$event['order']['extension_one'], 2);
+            $realPrice = bcsub($realPrice, (string)$event['order']['extension_two'], 2);
+            $this->totalAmount = bcmul($realPrice, (string)$commission_rate, 2);
+            $this->remain = $this->totalAmount;
+
+            //镇团队佣金
+            $this->calculate(Merchant::TypeTownServer, 'commission_to_town_rate');
+            //村团队佣金
+            $this->calculate(Merchant::TypeVillageServer, 'commission_to_village_rate');
+            //小组服务团队佣金
+            $this->calculate(Merchant::TypeTeamServer, 'commission_to_service_team_rate');
+
+            //订单购物详情表是否有云仓数据
+            $orderProduct = Db::name('store_order_product')
+                ->where('order_id', $event['order']['order_id'])
+                ->where('is_refund', 0)
+                ->whereIn('source', [StoreCartDao::SOURCE_STORE_CLOUD, StoreCartDao::SOURCE_CLOUD])
+                ->group('source_id')
+                ->column('source,source_id,sum(product_price) total,extension_one,extension_two');
+            foreach ($orderProduct as $item) {
+                $realTotal = bcsub((string)$item['total'], (string)$item['extension_one'], 2);
+                $realTotal = bcsub($realTotal, (string)$item['extension_two'], 2);
+                $this->totalAmount = bcmul($realTotal, (string)$commission_rate, 2);
+                if ($this->totalAmount <= 0) {
+                    continue;
+                }
+
+                //入口商户佣金
+                $entryMerId = $item['source_id'];
+                $entryMerchant = app()->make(MerchantDao::class)->get($entryMerId);
+                if ($entryMerchant['type_id'] == Merchant::TypeStore) {
+                    $merchantRate = systemConfig('commission_to_merchant_rate');
+                    $merchantAmount = bcmul($this->totalAmount, (string)($merchantRate / 100), 2);
+                    if ($merchantAmount > 0) {
+                        $this->remain = bcsub($this->remain, $merchantAmount, 2);
+                        $this->finance[] = [
+                            'order_id' => $this->event['order']['order_id'],
+                            'order_sn' => $this->event['order']['order_sn'],
+                            'user_info' => $this->event['order']->user->nickname,
+                            'user_id' => $this->event['order']['uid'],
+                            'financial_type' => 'commission_to_entry_merchant',
+                            'financial_pm' => 1,
+                            'type' => 1,
+                            'number' => $merchantAmount,
+                            'mer_id' => $entryMerId,
+                            'financial_record_sn' => $this->financeSn . $this->index
+                        ];
+                        $this->index++;
+                        /** @var MerchantRepository $merchantRepo */
+                        $merchantRepo = app()->make(MerchantRepository::class);
+                        $merchantRepo->merId = $entryMerId;
+                        $merchantRepo->forceMargin = true;
+                        [$merchantAmount, $this->finance, $increase] = $merchantRepo->autoMargin($merchantAmount, $event['order'], $this->finance, $this->financeSn, $this->index);
+                        if ($increase) {
+                            $this->index++;
+                        }
+                        if ($merchantAmount > 0) {
+                            app()->make(MerchantRepository::class)->addLockMoney($entryMerId, 'order', $event['order']['order_id'], (float)$merchantAmount);
+                        }
+                    }
+                }
+
+                //云仓佣金
+                $this->calculate(Merchant::TypeCloudWarehouse, 'commission_to_cloud_rate');
+            }
+
+            if ($this->remain > 0) {
+                //平台佣金
+                $this->finance[] = [
+                    'order_id' => $this->event['order']['order_id'],
+                    'order_sn' => $this->event['order']['order_sn'],
+                    'user_info' => $this->event['order']->user->nickname,
+                    'user_id' => $this->event['order']['uid'],
+                    'financial_type' => 'commission_to_platform',
+                    'financial_pm' => 1,
+                    'type' => 1,
+                    'number' => $this->remain,
+                    'mer_id' => 0,
+                    'financial_record_sn' => $this->financeSn . $this->index
+                ];
+            }
+
+            if (!$financialRecordRepository->insertAll($this->finance)) {
+                throw new \Exception('财务流水保存出错');
+            }
+            Db::commit();
+        } catch (\Exception $e) {
+            if ($e->getCode() == 200) {
+                Db::commit();
+            } else {
+                Db::rollback();
+            }
+            Log::error('订单分润出错', ['code' => $e->getCode(), 'message' => $e->getMessage(), 'trace' => $e->getTraceAsString()]);
+            DingTalk::exception($e, '订单分润出错');
+        }
+    }
+
+    public function calculate($type, $field)
+    {
+        $merId = Db::name('merchant')->where('type_id', $type)
+            ->where('street_id', $this->streetId)
+            ->where('status', 1)
+            ->where('mer_state', 1)
+            ->value('mer_id');
+        $rate = systemConfig($field);
+        $typeName = Merchant::TypeMap[$type];
+        if (empty($merId) || $rate <= 0) {
+            Log::info("订单分佣：没有 $typeName 或比例为0");
+            return false;
+        }
+        $financialTypeMap = [
+            'commission_to_town_rate' => 'town',
+            'commission_to_village_rate' => 'village',
+            'commission_to_service_team_rate' => 'service_team',
+            'commission_to_cloud_rate' => 'cloud_warehouse',
+        ];
+        $amount = bcmul($this->totalAmount, (string)($rate / 100), 2);
+        if ($amount <= 0) {
+            Log::info("订单分佣：$typeName 佣金为0");
+            return false;
+        }
+        $this->remain = bcsub($this->remain, $amount, 2);
+        $this->finance[] = [
+            'order_id' => $this->event['order']['order_id'],
+            'order_sn' => $this->event['order']['order_sn'],
+            'user_info' => $this->event['order']->user->nickname,
+            'user_id' => $this->event['order']['uid'],
+            'financial_type' => 'commission_to_' . $financialTypeMap[$field],
+            'financial_pm' => 1,
+            'type' => 1,
+            'number' => $amount,
+            'mer_id' => $merId,
+            'financial_record_sn' => $this->financeSn . $this->index
+        ];
+        $this->index++;
+        app()->make(MerchantRepository::class)->addLockMoney($merId, 'order', $this->event['order']['order_id'], (float)$amount);
+        return true;
+    }
+
+}

app/validate/admin/MerchantValidate.php

@@ -50,7 +50,9 @@ class MerchantValidate extends Validate
         'is_bro_goods|直播商品状态' => 'require|in:0,1',
         'is_bro_room|直播间状态' => 'require|in:0,1',
         'is_trader|自营状态' => 'require|in:0,1',
-        'commission_rate|提成比例' => '>=:0'
+        'commission_rate|提成比例' => '>=:0',
+        'auto_margin_rate|自动扣除保证金比例' => '>=:0',
+        'paid_margin|已支付的保证金' => '>=:0',
     ];
 
     /**

cert_crmeb.key

@@ -1 +1 @@
-COWDsrWL/cgzxUeJghO6eXRCc6RlQeR+xvgK43b4gxdareBkRRlfnUMBP2AqmF1xmUGMLnAl9e+udwsBVWooya8VGPz94dT0YY7mDIjFlsoKR3zhXMxg7ARVux22aR9xCKaLGX6/zM/gqSTDtyz+9rVRlakzSrvEE9/EFgVrOZlAbwSAsK0YiVafiBoaIt4gj64CyWjfhlJDJjheCZjsX+y+YrLtZskprX2ongF8C8mkyJ0g02cPcUvEiocLbbHUXj/ijNgiLU3NYLE5z+mVoxD3ek7q9hWVspplG6Mebl56u2HoJzgBrG0EX9E6ejV1Tcbo959qTEh9PgKC5LFhuA==,
+pGW7pPFlXo9Ex7ZPdlu06BP64TfCI5znDxf7qrBZ2WZxeytwHv3wPtru8i/QOJr/EZtiuPj4JnllFeArvZiqFL/IjYm0OFZjQn4+8dktMn47eD3B7Bwcig8pqc4AHA75G7jj7F94mW965k7lzmufaTLIMmX0BFY5yi2iWILA56pPh92ORC2Z/juM2zr3gWhbv9RGAuOftiBauIZ833GinLSRsBAu41dLydmZSGiL+49UZC50+oz2OEC3WQdluTLyMonpmJ2essaeDufq17/Ng7+ydBEbN2Dx3kdaLLnEgYbGNo74+R5/bCMTFksJX/Y9omD7qycRvaE2WYmZY3IDzw==,ZC9992742

ceshi.dev

@@ -0,0 +1 @@
+12xsdfasdasasdasd

crmeb/jobs/AutoMarginJob.php

@@ -0,0 +1,69 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+// +----------------------------------------------------------------------
+// | Author: CRMEB Team <admin@crmeb.com>
+// +----------------------------------------------------------------------
+
+
+namespace crmeb\jobs;
+
+
+use app\common\dao\system\serve\ServeOrderDao;
+use app\common\repositories\store\order\StoreOrderRepository;
+use app\common\repositories\system\merchant\MerchantRepository;
+use app\common\repositories\system\serve\ServeOrderRepository;
+use crmeb\interfaces\JobInterface;
+use think\facade\Log;
+
+class AutoMarginJob implements JobInterface
+{
+
+    public function fire($job, $data)
+    {
+        Log::info('utoMarginStart：' . var_export($data, 1));
+        try {
+            $merchant = app()->make(MerchantRepository::class)->get($data['merId']);
+            $orderInfo = [
+                'type_id' => $merchant['type_id'],
+                'is_margin' => $merchant['is_margin'],
+                'margin' => $data['margin'],
+            ];
+            $values = [
+                'status' => 1,
+                'is_del' => 0,
+                'mer_id' => $merchant['mer_id'],
+                'type' => ServeOrderRepository::TYPE_MARGIN,
+                'meal_id'=> $merchant['type_id'],
+                'pay_type' => ServeOrderRepository::PAY_TYPE_BALANCE,
+                'order_info' => json_encode($orderInfo,JSON_UNESCAPED_UNICODE),
+                'pay_price' => $data['margin'],
+                'store_order_id' => $data['orderId'],
+            ];
+            $values['order_sn'] = app()->make(StoreOrderRepository::class)->getNewOrderId('cs');
+            $values['pay_time'] = date('y_m-d H:i:s', time());
+            if (!app()->make(ServeOrderDao::class)->create($values)) {
+                throw new \Exception('serve_order 保存出错');
+            }
+            $merchant->paid_margin = bcadd($data['margin'], $merchant->paid_margin, 2);
+            $merchant->ot_margin = $merchant->paid_margin;
+            $merchant->is_margin = MerchantRepository::PaidMargin;
+            $merchant->save();
+            $job->delete();
+        } catch (\Exception $exception) {
+            Log::info('更新商户保证金出错：' . var_export($exception, 1));
+        } finally {
+            Log::info('autoMarginEnd：' . var_export($data, 1));
+        }
+    }
+
+    public function failed($data)
+    {
+        // TODO: Implement failed() method.
+    }
+}

crmeb/services/ExcelService.php

@@ -49,25 +49,25 @@ class ExcelService
      * @author Qinii
      * @day 3/17/21
      */
-    public function export($id, $path, $header, $title, $export = [], $filename = '',$end = [],$suffix = 'xlsx')
+    public function export($id, $path, $header, $title, $export = [], $filename = '', $end = [], $suffix = 'xlsx')
     {
-        try{
+        try {
             $_path = SpreadsheetExcelService::instance()
                 ->createOrActive($id)
-                ->setExcelHeader($header,count($title['mark']) + 2)
+                ->setExcelHeader($header, count($title['mark']) + 2)
                 ->setExcelTile($title)
                 ->setExcelContent($export)
                 ->setExcelEnd($end)
                 ->excelSave($filename, $suffix, $path);
 
-            app()->make(ExcelRepository::class)->update($id,[
-                'name' => $filename.'.'.$suffix,
+            app()->make(ExcelRepository::class)->update($id, [
+                'name' => $filename . '.' . $suffix,
                 'status' => 1,
-                'path' => '/'.$_path
+                'path' => '/' . $_path
             ]);
-        }catch (Exception $exception){
-            app()->make(ExcelRepository::class)->update($id,[
-                'name' => $filename.'.'.$suffix,
+        } catch (Exception $exception) {
+            app()->make(ExcelRepository::class)->update($id, [
+                'name' => $filename . '.' . $suffix,
                 'status' => 2,
                 'message' => $exception->getMessage()
             ]);
@@ -109,7 +109,7 @@ class ExcelService
         }
         $filename = '搜索记录_' . date('YmdHis');
         $foot = [];
-        return compact('count','header','title','export','foot','filename');
+        return compact('count', 'header', 'title', 'export', 'foot', 'filename');
     }
 
     /**
@@ -119,7 +119,7 @@ class ExcelService
      * @author Qinii
      * @day 2020-08-10
      */
-    public function order(array $where, int $page, int $limit  )
+    public function order(array $where, int $page, int $limit)
     {
         $paytype = [0 => '余额', 1 => '微信', 2 => '小程序', 3 => 'H5', 4 => '支付宝', 5 => '支付宝扫码', 6 => '微信扫码',];
         $make = app()->make(StoreOrderRepository::class);
@@ -128,7 +128,9 @@ class ExcelService
         unset($where['status']);
         $query = $make->search($where, $del)->where($make->getOrderType($status))->with([
             'orderProduct',
-            'merchant' => function ($query) {return $query->field('mer_id,mer_name');},
+            'merchant' => function ($query) {
+                return $query->field('mer_id,mer_name');
+            },
             'user',
             'spread',
         ])->order('order_id ASC');
@@ -141,37 +143,37 @@ class ExcelService
                 $product[] = [
                     $value['cart_info']['product']['store_name'],
                     $value['cart_info']['productAttr']['sku'] ?: '无',
-                    $value['product_num'].' '. $value['unit_name'],
+                    $value['product_num'] . ' ' . $value['unit_name'],
                     $value['cart_info']['productAttr']['price']
                 ];
             }
             $one = [
-                 $item['merchant']['mer_name'],
-                 $item['order_sn'],
-                 $item['order_type'] ? '核销订单':'普通订单',
-                 $item['spread']['nickname'] ?? '无',
-                 $item['user']['nickname'] ?? $item['uid'],
-                 $product,
-                 $item['coupon_price'] ,
-                 $item['pay_postage'],
-                 $value['product_price'],
-                 $item['refund_price'],
-                 $item['real_name'],
-                 $item['user_phone'],
-                 $item['user_address'] ?: '',
-                 $item['delivery_id'] ?: '',
-                 $item['create_time'],
-                 $paytype[$item['pay_type']],
-                 $item['paid'] ? '已支付':'未支付',
-                 $item['remark'] ?: '',
+                $item['merchant']['mer_name'],
+                $item['order_sn'],
+                $item['order_type'] ? '核销订单' : '普通订单',
+                $item['spread']['nickname'] ?? '无',
+                $item['user']['nickname'] ?? $item['uid'],
+                $product,
+                $item['coupon_price'],
+                $item['pay_postage'],
+                $value['product_price'],
+                $item['refund_price'],
+                $item['real_name'],
+                $item['user_phone'],
+                $item['user_address'] ?: '',
+                $item['delivery_id'] ?: '',
+                $item['create_time'],
+                $paytype[$item['pay_type']],
+                $item['paid'] ? '已支付' : '未支付',
+                $item['remark'] ?: '',
             ];
             $export[] = $one;
         }
-        $header = ['商户名称','订单编号','订单类型','推广人','用户信息', '商品名称','商品规格','商品数量','商品价格','优惠','实付邮费(元)','实付金额(元)','已退款金额(元)', '收货人','收货人电话','收货地址','物流/电话','下单时间','支付方式','支付状态','商家备注'];
-        $filename = '订单列表_'.date('YmdHis');
-        $title = ['订单列表','导出时间：'.date('Y-m-d H:i:s',time())];
+        $header = ['商户名称', '订单编号', '订单类型', '推广人', '用户信息', '商品名称', '商品规格', '商品数量', '商品价格', '优惠', '实付邮费(元)', '实付金额(元)', '已退款金额(元)', '收货人', '收货人电话', '收货地址', '物流/电话', '下单时间', '支付方式', '支付状态', '商家备注'];
+        $filename = '订单列表_' . date('YmdHis');
+        $title = ['订单列表', '导出时间：' . date('Y-m-d H:i:s', time())];
         $foot = '';
-        return compact('count','header','title','export','foot','filename');
+        return compact('count', 'header', 'title', 'export', 'foot', 'filename');
     }
 
     /**
@@ -181,7 +183,7 @@ class ExcelService
      * @author Qinii
      * @day 2020-08-10
      */
-    public function financial(array $where,int $page,int $limit)
+    public function financial(array $where, int $page, int $limit)
     {
         $_key = [
             'mer_accoubts' => '财务对账',
@@ -204,22 +206,22 @@ class ExcelService
             'refundOrder'
         ]);
 
-        $header = ['商户名称','交易流水单号','类型','总订单号','订单号/退款单号','用户名','用户ID','交易类型','收入/支出','金额','创建时间'];
+        $header = ['商户名称', '交易流水单号', '类型', '总订单号', '订单号/退款单号', '用户名', '用户ID', '交易类型', '收入/支出', '金额', '创建时间'];
         $title = [
             '流水列表',
-            '生成时间:' . date('Y-m-d H:i:s',time())
+            '生成时间:' . date('Y-m-d H:i:s', time())
         ];
         $export = [];
         $count = $query->count();
-        $list = $query->page($page,$limit)->select();
+        $list = $query->page($page, $limit)->select();
         foreach ($list as $v) {
-            $wx = (substr($v['order_sn'],0,2) === 'wx');
+            $wx = (substr($v['order_sn'], 0, 2) === 'wx');
             $export[] = [
                 $v['merchant']['mer_name'],
                 $v['financial_record_sn'],
                 $wx ? '订单' : '退款单',
-                $wx ? $v['orderInfo']['groupOrder']['group_order_sn'] : '' ,
-                $wx ? $v['order_sn'] : $v['refundOrder']['refund_order_sn'] ,
+                $wx ? $v['orderInfo']['groupOrder']['group_order_sn'] : '',
+                $wx ? $v['order_sn'] : $v['refundOrder']['refund_order_sn'],
                 $v['user_info'],
                 $v['user_id'],
                 $_key[$v['financial_type']],
@@ -229,9 +231,9 @@ class ExcelService
             ];
         }
 
-        $filename = '流水列表_'.date('YmdHis');
-        $foot =[];
-        return compact('count','header','title','export','foot','filename');
+        $filename = '流水列表_' . date('YmdHis');
+        $foot = [];
+        return compact('count', 'header', 'title', 'export', 'foot', 'filename');
     }
 
     /**
@@ -241,31 +243,31 @@ class ExcelService
      * @author Qinii
      * @day 3/13/21
      */
-    public function delivery(array $where,int $page, int $limit)
+    public function delivery(array $where, int $page, int $limit)
     {
         $make = app()->make(StoreOrderRepository::class);
         $where['order_type'] = 0;
         $query = $make->search($where)->with(['orderProduct'])->order('order_id ASC');
-        $header =    ['订单编号','物流公司','物流编码','物流单号', '发货地址','用户信息','手机号','商品信息','支付时间'];
+        $header = ['订单编号', '物流公司', '物流编码', '物流单号', '发货地址', '用户信息', '手机号', '商品信息', '支付时间'];
         $title = [
             '批量发货单',
-            '生成时间:' . date('Y-m-d H:i:s',time()),
+            '生成时间:' . date('Y-m-d H:i:s', time()),
         ];
-        $filename = '批量发货单_'.date('YmdHis');
+        $filename = '批量发货单_' . date('YmdHis');
         $export = [];
         $count = $query->count();
-        $data = $query->page($page,$limit)->select();
-        foreach ($data as  $item){
+        $data = $query->page($page, $limit)->select();
+        foreach ($data as $item) {
             $product = '';
-            foreach ($item['orderProduct'] as $value){
-                $product = $product.$value['cart_info']['product']['store_name'].'【'. $value['cart_info']['productAttr']['sku'] .'】【' . $value['product_num'].'】'.PHP_EOL;
+            foreach ($item['orderProduct'] as $value) {
+                $product = $product . $value['cart_info']['product']['store_name'] . '【' . $value['cart_info']['productAttr']['sku'] . '】【' . $value['product_num'] . '】' . PHP_EOL;
             }
             $export[] = [
                 $item['order_sn'] ?? '',
                 '',
-                $item['delivery_name']??"",
-                $item['delivery_id']??"",
-                $item['user_address']??"",
+                $item['delivery_name'] ?? "",
+                $item['delivery_id'] ?? "",
+                $item['user_address'] ?? "",
                 $item['real_name'] ?? '',
                 $item['user_phone'] ?? '',
                 $product,
@@ -274,7 +276,7 @@ class ExcelService
         }
 
         $foot = [];
-        return compact('count','header','title','export','foot','filename');
+        return compact('count', 'header', 'title', 'export', 'foot', 'filename');
     }
 
     /**
@@ -284,20 +286,20 @@ class ExcelService
      * @author Qinii
      * @day 3/17/21
      */
-    public function importDelivery(array $where,int $page,int $limit)
+    public function importDelivery(array $where, int $page, int $limit)
     {
         $make = app()->make(StoreImportDeliveryRepository::class);
         $query = $make->getSearch($where)->order('create_time ASC');
         $title = [
             '发货记录',
-            '生成时间:' . date('Y-m-d H:i:s',time())
+            '生成时间:' . date('Y-m-d H:i:s', time())
         ];
-        $header = ['订单编号','物流公司','物流单号', '发货状态','备注'];
-        $filename = '发货单记录_'.date('YmdHis');
+        $header = ['订单编号', '物流公司', '物流单号', '发货状态', '备注'];
+        $filename = '发货单记录_' . date('YmdHis');
         $export = [];
         $count = $query->count();
-        $data = $query->page($page,$limit)->select();
-        foreach ($data as $item){
+        $data = $query->page($page, $limit)->select();
+        foreach ($data as $item) {
             $export[] = [
                 $item['order_sn'],
                 $item['delivery_name'],
@@ -307,7 +309,7 @@ class ExcelService
             ];
         }
         $foot = [];
-        return compact('count','header','title','export','foot','filename');
+        return compact('count', 'header', 'title', 'export', 'foot', 'filename');
     }
 
     /**
@@ -317,7 +319,7 @@ class ExcelService
      * @author Qinii
      * @day 3/25/21
      */
-    public function exportFinancial(array $where,int  $page, int $limit)
+    public function exportFinancial(array $where, int $page, int $limit, $merchant = [])
     {
         /*
            order 收入 公共 新订单
@@ -335,87 +337,118 @@ class ExcelService
            presell_true 支出 平台 商户入账
         */
         $financialType = [
-            'order'         => '订单支付',
-            'presell'       => '预售订单（尾款）',
+            'order' => '订单支付',
+            'presell' => '预售订单（尾款）',
             'brokerage_one' => '一级佣金',
             'brokerage_two' => '二级佣金',
-            'order_charge'  => '手续费',
-            'order_true'    => '商户入账',
-            'refund_order'  => '退款',
+            'order_charge' => '手续费',
+            'order_true' => '商户入账',
+            'refund_order' => '退款',
             'refund_charge' => '返还手续费',
-            'refund_true'   => '商户返还入账',
-            'presell_charge'=> '预售订单（手续费）',
-            'presell_true'  => '商户入账',
+            'refund_true' => '商户返还入账',
+            'presell_charge' => '预售订单（手续费）',
+            'presell_true' => '商户入账',
             'refund_brokerage_one' => '返还一级佣金',
             'refund_brokerage_two' => '返还二级佣金',
-            'mer_presell'   => '预售订单（总额）',
-            'order_presell'   => '预售订单（定金）',
+            'mer_presell' => '预售订单（总额）',
+            'order_presell' => '预售订单（定金）',
             'refund_platform_coupon' => '退回优惠券补贴',
             'order_platform_coupon' => '优惠券补贴',
+            'auto_margin' => '保证金',
+            'commission_to_service_team' => '订单平台佣金',
+            'commission_to_platform' => '订单剩余平台手续费',
+            'commission_to_village' => '订单平台佣金',
+            'commission_to_town' => '订单平台佣金',
+            'commission_to_service_team_refund' => '退回平台佣金',
+            'commission_to_platform_refund' => '退回剩余平台手续费',
+            'commission_to_village_refund' => '退回平台佣金',
+            'commission_to_town_refund' => '退回平台佣金',
+            'auto_margin_refund' => '退回保证金',
+            'commission_to_entry_merchant' => '订单平台佣金',
+            'commission_to_cloud_warehouse' => '订单平台佣金',
+            'commission_to_entry_merchant_refund' => '退回平台佣金',
+            'commission_to_cloud_warehouse_refund' => '退回平台佣金',
         ];
-        $sys_pm_1 = ['order','presell','order_charge','order_presell','presell_charge','refund_brokerage_one','refund_brokerage_two'];
-        $mer_pm_1 = ['order','presell','refund_charge','refund_brokerage_one','refund_brokerage_two','mer_presell','order_platform_coupon'];
-        $date_ = $where['date'];unset($where['date']);
+        $sys_pm_1 = ['order', 'presell', 'order_charge', 'order_presell', 'presell_charge', 'refund_brokerage_one', 'refund_brokerage_two', 'commission_to_platform'];
+        $mer_pm_1 = ['order', 'presell', 'refund_brokerage_one', 'refund_brokerage_two', 'mer_presell',
+            'order_platform_coupon', 'commission_to_cloud_warehouse', 'commission_to_entry_merchant', 'commission_to_town', 'commission_to_village', 'commission_to_service_team'];
+        $date_ = $where['date'];
+        unset($where['date']);
         $make = app()->make(FinancialRecordRepository::class);
 
-        $query = $make->search($where)->with(['orderInfo','refundOrder','merchant.merchantCategory']);
+        $query = $make->search($where)->with(['orderInfo', 'refundOrder', 'merchant.merchantCategory']);
 
-        if($where['type'] == 1){
+        if ($where['type'] == 1) {
             $title_ = '日账单';
-            $start_date = $date_.' 00:00:00';
-            $end_date = $date_.' 23:59:59';
-            $query->whereDay('create_time',$date_);
-        }else{
+            $start_date = $date_ . ' 00:00:00';
+            $end_date = $date_ . ' 23:59:59';
+            $query->whereDay('create_time', $date_);
+        } else {
             $title_ = '月账单';
             $start_date = (date('Y-m-01', strtotime($date_)));
             $end_date = date('Y-m-d', strtotime("$start_date +1 month -1 day"));
-            $query->whereMonth('create_time',$date_);
+            $query->whereMonth('create_time', $date_);
         }
 
 
+        $income = $make->countIncome($where['type'], $where, $date_, $merchant);
+        $expend = $make->countExpend($where['type'], $where, $date_, $merchant);
 
-        $income = $make->countIncome($where['type'],$where,$date_);
-        $expend = $make->countExpend($where['type'],$where,$date_);
-        $refund = $make->countRefund($where['type'],$where,$date_);
-        $charge = bcsub($income['number'],$expend['number'],2);
-        $filename = $title_.'('.$date_.')'.time();
+//        $refund = $make->countRefund($where['type'],$where,$date_);
+        $charge = bcsub($income['number'], $expend['number'], 2);
+        $filename = $title_ . '(' . $date_ . ')' . time();
         $export = [];
         $limit = 20;
         $count = $query->count();
         $i = 1;
         $order_make = app()->make(StoreOrderRepository::class);
         //平台
-        if(!$where['is_mer']){
-            $header = ['商户类别','商户分类','商户名称','总订单号','订单编号','交易流水号','交易时间', '对方信息','交易类型','收支金额','备注'];
+        if (!$where['is_mer']) {
+            $header = ['商户类别', '商户分类', '商户名称', '总订单号', '订单编号', '交易流水号', '交易时间', '对方信息', '交易类型', '收支金额', '备注'];
             $list = $query->page($page, $limit)->order('create_time DESC')->select();
-            foreach ($list as $value) {
+            foreach ($list as $k => $value) {
                 $order = $order_make->get($value['order_id']);
-                $export[] = [
-                    $value['merchant']['is_trader'] ? '自营' : '非自营',
-                    $value['merchant']['merchantCategory']['category_name'] ?? '平台',
-                    $value['merchant']['mer_name'] ?? '平台',
-                    $order['groupOrder']['group_order_sn'] ?? '无数据',
-                    $value['order_sn'],
-                    $value['financial_record_sn'],
-                    $value['create_time'],
-                    $value['user_info'],
-                    $financialType[$value['financial_type']],
-                    (in_array($value['financial_type'], $sys_pm_1) ? '+' : '-') . $value['number'],
-                    ''
-                ];
+                if ($value['merchant']) {
+                    $export[$k] = [
+                        $value['merchant']['is_trader'] ? '自营' : '非自营',
+                        $value['merchant']['merchantCategory']['category_name'] ?? '平台',
+                        $value['merchant']['mer_name'] ?? '平台',
+                    ];
+                }else{
+                    $export[$k] = [
+                        '平台',
+                        '平台',
+                        '平台',
+                    ];
+                }
+                $export[$k][] = ['groupOrder']['group_order_sn'] ?? '无数据';
+                $export[$k][] = $value['order_sn'];
+                $export[$k][] = $value['financial_record_sn'];
+                $export[$k][] = $value['create_time'];
+                $export[$k][] = $value['user_info'];
+                $export[$k][] = $financialType[$value['financial_type']];
+                $export[$k][] = (in_array($value['financial_type'], $sys_pm_1) ? '+' : '-') . $value['number'];
+                $export[$k][] = '';
             }
             $foot = [
-                '合计：平台应入账手续费 '.$charge,
-                '收入合计： '.'订单支付'.$income['count'].'笔,'.'实际支付金额共:'.$income['number'].'元;',
-                '支出合计： '.'佣金支出'.$expend['count_brokerage'].'笔,支出金额：'.$expend['number_brokerage'].'元；商户入账支出'.$expend['count_order'].'笔，支出金额：'.$expend['number_order'].'元；退款手续费'.$expend['count_charge'].'笔，支出金额'.$expend['number_charge'].'元；合计支出'.$expend['number'],
+                '合计：平台应入账手续费 ' . $charge,
+                '收入合计： ' . '订单支付' . $income['count'] . '笔,' . '实际支付金额共:' . $income['number'] . '元;',
+                '支出合计： ' . '佣金支出' . $expend['count_brokerage'] . '笔,支出金额：' . $expend['number_brokerage'] . '元；商户入账支出' . $expend['count_order'] . '笔，支出金额：' . $expend['number_order'] . '元；退款手续费' . $expend['count_charge'] . '笔，支出金额' . $expend['number_charge'] . '元；合计支出' . $expend['number'],
             ];
-         //商户
-        }else{
-            $header = ['序号','总订单号','子订单编号','交易流水号','交易时间', '对方信息','交易类型','收支金额','备注'];
+            //商户
+        } else {
+            $header = ['序号', '总订单号', '子订单编号', '交易流水号', '交易时间', '对方信息', '交易类型', '收支金额', '备注'];
             $mer_name = '';
             $list = $query->page($page, $limit)->order('create_time DESC')->select();
             foreach ($list as $key => $value) {
                 $order = $order_make->get($value['order_id']);
+                if ($value['financial_type']=='refund_true'){
+                    $find_number=Db::name('financial_record')->where('order_sn',$value['order_sn'])
+                        ->where('financial_type','auto_margin_refund')->value('number');
+                    if ($find_number && $find_number>0){
+                        $value['number']-=$find_number;
+                    }
+                }
                 $export[] = [
                     $i,
                     $order['groupOrder']['group_order_sn'] ?? '无数据',
@@ -430,27 +463,26 @@ class ExcelService
                 $i++;
                 $mer_name = $mer_name ? $mer_name : ($value['merchant']['mer_name'] ?? '');
             }
-
             $count_brokeage = $expend['count_brokerage'] + $expend['count_refund_brokerage'];
-            $number_brokeage = bcsub($expend['number_brokerage'],$expend['number_refund_brokerage'],2);
-            $count_charge = $expend['count_charge']+$expend['count_order_charge'];
-            $number_charge = bcsub($expend['number_order_charge'],$expend['number_charge'],2);
+            $number_brokeage = bcsub($expend['number_brokerage'], $expend['number_refund_brokerage'], 2);
+            $count_charge = $expend['count_charge'] + $expend['count_order_charge'];
+            $number_charge = bcsub($expend['number_order_charge'], $expend['number_charge'], 2);
             $foot = [
-                '合计：商户应入金额 '.$charge,
-                '收入合计： '.'订单支付'.$income['count'].'笔,'.'实际支付金额共:'.$income['number'].'元;',
-                '支出合计： '.'佣金支出'.$count_brokeage.'笔,支出金额：'.$number_brokeage.'元；退款'.$expend['count_refund'].'笔，支出金额:'.$expend['number_refund'].'元；平台手续费'.$count_charge.'笔，支出金额：'.$number_charge.'元；合计支出金额：'.$expend['number'].'元；',
+                '合计：商户应入金额 ' . $charge,
+                '收入合计： ' . '订单支付' . $income['count'] . '笔,' . '实际支付金额共:' . $income['number'] . '元;',
+                '支出合计： ' . '佣金支出' . $count_brokeage . '笔,支出金额：' . $number_brokeage . '元；退款' . $expend['count_refund'] . '笔，支出金额:' . $expend['number_refund'] . '元；平台手续费' . $count_charge . '笔，支出金额：' . $number_charge . '元；合计支出金额：' . $expend['number'] . '元；',
                 //'商户应入金额 '.$charge,
             ];
-            $mer_name = '商户名称:'.$mer_name;
+            $mer_name = '商户名称:' . $mer_name;
         }
 
         $title = [
             $title_,
             $mer_name ?? '平台',
-            '结算账期：【' .$start_date.'】至【'.$end_date.'】',
-            '生成时间:' . date('Y-m-d H:i:s',time())
+            '结算账期：【' . $start_date . '】至【' . $end_date . '】',
+            '生成时间:' . date('Y-m-d H:i:s', time())
         ];
-        return compact('count','header','title','export','foot','filename');
+        return compact('count', 'header', 'title', 'export', 'foot', 'filename');
     }
 
     /**
@@ -460,7 +492,7 @@ class ExcelService
      * @author Qinii
      * @day 6/10/21
      */
-    public function refundOrder(array $where,int $page, int $limit)
+    public function refundOrder(array $where, int $page, int $limit)
     {
         $query = app()->make(StoreRefundOrderRepository::class)->search($where)
             ->where('is_system_del', 0)->with([
@@ -478,24 +510,24 @@ class ExcelService
 
         $title = [
             '退款订单',
-            '生成时间:' . date('Y-m-d H:i:s',time())
+            '生成时间:' . date('Y-m-d H:i:s', time())
         ];
-        $header = ['商户名称','退款单号','申请时间','最新更新时间', '退款金额','退货件量','退货商品信息','退款类型','订单状态','拒绝理由','退货人','退货地址','相关订单号','退货物流公司','退货物流单号','备注'];
-        $filename = '退款订单'.time();
+        $header = ['商户名称', '退款单号', '申请时间', '最新更新时间', '退款金额', '退货件量', '退货商品信息', '退款类型', '订单状态', '拒绝理由', '退货人', '退货地址', '相关订单号', '退货物流公司', '退货物流单号', '备注'];
+        $filename = '退款订单' . time();
 
         $status = [
             0 => '待审核',
             1 => '待退货',
             2 => '待收货',
             3 => '已退款',
-            -1=> '审核未通过',
+            -1 => '审核未通过',
         ];
-        $count= $query->count();
-        $data = $query->page($page,$limit)->select()->toArray();
-        foreach ($data as $datum){
+        $count = $query->count();
+        $data = $query->page($page, $limit)->select()->toArray();
+        foreach ($data as $datum) {
             $product = '';
-            foreach ($datum['refundProduct'] as $value){
-                $product .= '【'.$value['product']['cart_info']['product']['product_id'].'】'.$value['product']['cart_info']['product']['store_name'].'*'.$value['refund_num'].$value['product']['cart_info']['product']['unit_name'].PHP_EOL;
+            foreach ($datum['refundProduct'] as $value) {
+                $product .= '【' . $value['product']['cart_info']['product']['product_id'] . '】' . $value['product']['cart_info']['product']['store_name'] . '*' . $value['refund_num'] . $value['product']['cart_info']['product']['unit_name'] . PHP_EOL;
             }
             $export[] = [
                 $datum['merchant']['mer_name'],
@@ -505,7 +537,7 @@ class ExcelService
                 $datum['refund_price'],
                 $datum['refund_num'],
                 $product,
-                ($datum['refund_type'] == 1 ) ? '仅退款' : '退款退货',
+                ($datum['refund_type'] == 1) ? '仅退款' : '退款退货',
                 $status[$datum['status']],
                 $datum['fail_message'],
                 $datum['order']['real_name'],
@@ -518,7 +550,7 @@ class ExcelService
         }
 
         $foot = '';
-        return compact('count','header','title','export','foot','filename');
+        return compact('count', 'header', 'title', 'export', 'foot', 'filename');
     }
 
     /**
@@ -528,18 +560,18 @@ class ExcelService
      * @author Qinii
      * @day 6/10/21
      */
-    public function integralLog($where,int $page, int $limit)
+    public function integralLog($where, int $page, int $limit)
     {
         $title = [
             '积分日志',
-            '生成时间:' . date('Y-m-d H:i:s',time())
+            '生成时间:' . date('Y-m-d H:i:s', time())
         ];
-        $header = ['用户ID','用户昵称','积分标题','变动积分', '当前积分余额','备注','时间'];
-        $filename = '积分日志'.time();
+        $header = ['用户ID', '用户昵称', '积分标题', '变动积分', '当前积分余额', '备注', '时间'];
+        $filename = '积分日志' . time();
         $export = [];
         $query = app()->make(UserBillRepository::class)->searchJoin($where)->order('a.create_time DESC');
         $count = $query->count();
-        $list = $query->page($page,$limit)->select();
+        $list = $query->page($page, $limit)->select();
         foreach ($list as $item) {
             $export[] = [
                 $item['uid'],
@@ -552,17 +584,17 @@ class ExcelService
             ];
         }
         $foot = '';
-        return compact('count','header','title','export','foot','filename');
+        return compact('count', 'header', 'title', 'export', 'foot', 'filename');
     }
 
-    public function intention($where,int $page, int $limit)
+    public function intention($where, int $page, int $limit)
     {
         $title = [
             '申请列表',
-            '生成时间:' . date('Y-m-d H:i:s',time())
+            '生成时间:' . date('Y-m-d H:i:s', time())
         ];
-        $header = ['商户姓名','联系方式','备注','店铺名称','店铺分类','时间'];
-        $filename = '申请列表'.time();
+        $header = ['商户姓名', '联系方式', '备注', '店铺名称', '店铺分类', '时间'];
+        $filename = '申请列表' . time();
         $export = [];
         $query = app()->make(MerchantIntentionRepository::class)->search($where)->with(['merchantCategory', 'merchantType'])->order('a.create_time DESC');
         $count = $query->count();
@@ -578,7 +610,7 @@ class ExcelService
             ];
         }
         $foot = '';
-        return compact('count','header','title','export','foot','filename');
+        return compact('count', 'header', 'title', 'export', 'foot', 'filename');
     }
 
     /**
@@ -592,29 +624,29 @@ class ExcelService
     {
         $title = [
             '转账记录',
-            '生成时间:' . date('Y-m-d H:i:s',time())
+            '生成时间:' . date('Y-m-d H:i:s', time())
         ];
-        $header = ['商户名称','申请时间','转账金额','到账状态','审核状态','拒绝理由','商户余额','转账信息'];
-        $filename = '转账记录_'.time();
+        $header = ['商户名称', '申请时间', '转账金额', '到账状态', '审核状态', '拒绝理由', '商户余额', '转账信息'];
+        $filename = '转账记录_' . time();
         $export = [];
         $query = app()->make(FinancialRepository::class)->search($where)->with('merchant');
         $count = $query->count();
         $list = $query->page($page, $limit)->select();
         foreach ($list as $item) {
             if ($item->financial_type == 1) {
-                $acount = '姓名：'.$item->financial_account->name.PHP_EOL;
-                $acount .= '银行名称：'.$item->financial_account->bank.PHP_EOL;
-                $acount .= '银行卡号：'.$item->financial_account->bank_code;
+                $acount = '姓名：' . $item->financial_account->name . PHP_EOL;
+                $acount .= '银行名称：' . $item->financial_account->bank . PHP_EOL;
+                $acount .= '银行卡号：' . $item->financial_account->bank_code;
             }
             if ($item->financial_type == 2) {
-                $acount = '姓名：'.$item->financial_account->name.PHP_EOL;
-                $acount .= '微信号：'.$item->financial_account->wechat.PHP_EOL;
-                $acount .= '收款二维码地址：'.$item->financial_account->wechat_code;
+                $acount = '姓名：' . $item->financial_account->name . PHP_EOL;
+                $acount .= '微信号：' . $item->financial_account->wechat . PHP_EOL;
+                $acount .= '收款二维码地址：' . $item->financial_account->wechat_code;
             }
             if ($item->financial_type == 3) {
-                $acount = '姓名：'.$item->financial_account->name.PHP_EOL;
-                $acount .= '支付宝号：'.$item->financial_account->alipay.PHP_EOL;
-                $acount .= '收款二维码地址：'.$item->financial_account->alipay_code;
+                $acount = '姓名：' . $item->financial_account->name . PHP_EOL;
+                $acount .= '支付宝号：' . $item->financial_account->alipay . PHP_EOL;
+                $acount .= '收款二维码地址：' . $item->financial_account->alipay_code;
             }
             $export[] = [
                 $item->merchant->mer_name,
@@ -628,7 +660,7 @@ class ExcelService
             ];
         }
         $foot = '';
-        return compact('count','header','title','export','foot','filename');
+        return compact('count', 'header', 'title', 'export', 'foot', 'filename');
     }
 
     /**
@@ -642,7 +674,7 @@ class ExcelService
     {
         $title = [
             '提现申请',
-            '生成时间:' . date('Y-m-d H:i:s',time())
+            '生成时间:' . date('Y-m-d H:i:s', time())
         ];
         $type = [
             '银行卡',
@@ -650,8 +682,8 @@ class ExcelService
             '支付宝',
             '微信零钱',
         ];
-        $header = ['用户名','用户UID','提现金额','余额','审核状态','拒绝理由','提现方式','转账信息'];
-        $filename = '提现申请_'.time();
+        $header = ['用户名', '用户UID', '提现金额', '余额', '审核状态', '拒绝理由', '提现方式', '转账信息'];
+        $filename = '提现申请_' . time();
         $path = 'extract';
         $export = [];
         $query = app()->make(UserExtractRepository::class)->search($where)->order('create_time DESC');
@@ -660,16 +692,16 @@ class ExcelService
         foreach ($list as $item) {
             $acount = '';
             if ($item->extract_type == 0) {
-                $acount .= '银行地址：'.$item->bank_address.PHP_EOL;
-                $acount .= '银行卡号：'.$item->bank_code;
+                $acount .= '银行地址：' . $item->bank_address . PHP_EOL;
+                $acount .= '银行卡号：' . $item->bank_code;
             }
             if ($item->extract_type == 2) {
-                $acount .= '微信号：'.$item->wechat.PHP_EOL;
-                $acount .= '收款二维码地址：'.$item->extract_pic;
+                $acount .= '微信号：' . $item->wechat . PHP_EOL;
+                $acount .= '收款二维码地址：' . $item->extract_pic;
             }
             if ($item->extract_type == 1) {
-                $acount .= '支付宝号：'.$item->alipay.PHP_EOL;
-                $acount .= '收款二维码地址：'.$item->extract_pic;
+                $acount .= '支付宝号：' . $item->alipay . PHP_EOL;
+                $acount .= '收款二维码地址：' . $item->extract_pic;
             }
             $export[] = [
                 $item->real_name,
@@ -683,7 +715,7 @@ class ExcelService
             ];
         }
         $foot = '';
-        return compact('count','header','title','export','foot','filename');
+        return compact('count', 'header', 'title', 'export', 'foot', 'filename');
     }
 
     /**
@@ -697,18 +729,18 @@ class ExcelService
     {
         $title = [
             '分账明细',
-            '生成时间:' . date('Y-m-d H:i:s',time())
+            '生成时间:' . date('Y-m-d H:i:s', time())
         ];
-        $header = ['订单编号','商户名称','订单类型','状态','分账时间','订单金额'];
-        $filename = '分账明细_'.time();
+        $header = ['订单编号', '商户名称', '订单类型', '状态', '分账时间', '订单金额'];
+        $filename = '分账明细_' . time();
         $export = [];
-        $query = app()->make(StoreOrderProfitsharingRepository::class)->search($where)->with('order','merchant')->order('create_time DESC');
+        $query = app()->make(StoreOrderProfitsharingRepository::class)->search($where)->with('order', 'merchant')->order('create_time DESC');
         $count = $query->count();
         $list = $query->page($page, $limit)->select();
         foreach ($list as $item) {
-           $info = '分账金额：'. $item->profitsharing_price.PHP_EOL;
-           if(isset($item->profitsharing_price) && $item->profitsharing_price > 0) $info .= '退款金额：'. $item->profitsharing_refund.PHP_EOL;
-           $info .= '分账给商户金额：'. $item->profitsharing_mer_price;
+            $info = '分账金额：' . $item->profitsharing_price . PHP_EOL;
+            if (isset($item->profitsharing_price) && $item->profitsharing_price > 0) $info .= '退款金额：' . $item->profitsharing_refund . PHP_EOL;
+            $info .= '分账给商户金额：' . $item->profitsharing_mer_price;
             $export[] = [
                 $item->order->order_sn ?? '',
                 $item->merchant->mer_name,
@@ -719,7 +751,7 @@ class ExcelService
             ];
         }
         $foot = '';
-        return compact('count','header','title','export','foot','filename');
+        return compact('count', 'header', 'title', 'export', 'foot', 'filename');
     }
 
     /**
@@ -733,10 +765,10 @@ class ExcelService
     {
         $title = [
             '资金记录',
-            '生成时间:' . date('Y-m-d H:i:s',time())
+            '生成时间:' . date('Y-m-d H:i:s', time())
         ];
-        $header = ['用户ID','昵称','金额','明细类型','备注','时间'];
-        $filename = '资金记录_'.time();
+        $header = ['用户ID', '昵称', '金额', '明细类型', '备注', '时间'];
+        $filename = '资金记录_' . time();
         $export = [];
         $query = app()->make(UserBillRepository::class)
             ->searchJoin($where)->order('a.create_time DESC');
@@ -745,7 +777,7 @@ class ExcelService
         foreach ($list as $item) {
             $export[] = [
                 $item->uid,
-                $item->user->nickname??'',
+                $item->user->nickname ?? '',
                 $item->number,
                 $item->title,
                 $item->mark,
@@ -754,6 +786,6 @@ class ExcelService
         }
         $export = array_reverse($export);
         $foot = '';
-        return compact('count','header','title','export','foot','filename');
+        return compact('count', 'header', 'title', 'export', 'foot', 'filename');
     }
 }

crmeb/services/payTool/PayTool.php

@@ -0,0 +1,50 @@
+<?php
+
+namespace crmeb\services\payTool;
+
+abstract class PayTool
+{
+
+    public $config;
+    public $error = ['success' => false];
+    const Scrcu = 'scrcu';
+
+    const ClassMap = [
+        self::Scrcu => Scrcu::class,
+    ];
+
+    /**
+     * @param $name
+     * @param $params
+     * @return mixed|Scrcu
+     * @throws \Exception
+     */
+    public static function instance($name, $params = [])
+    {
+        $class = self::ClassMap[$name];
+        if (class_exists($class)) {
+            return new $class($params);
+        }
+        throw new \Exception('支付方式未开通', 500);
+    }
+
+    public function getError()
+    {
+        return $this->error;
+    }
+
+    public abstract function pay($order);
+
+    public abstract function query($orderNo);
+
+    public abstract function callback($request = null);
+
+    public abstract function success();
+
+    public abstract function refund($order);
+
+    public abstract function refundQuery($refundOrder);
+
+    public abstract function transfer($withdraw);
+
+}

crmeb/services/payTool/Scrcu.php

@@ -0,0 +1,202 @@
+<?php
+
+namespace crmeb\services\payTool;
+
+use crmeb\utils\DingTalk;
+
+class Scrcu extends PayTool
+{
+
+    public $domain;
+    public $onlinePayApi = 'onlinepay/OPC321560202000200000500';
+    public $queryApi = 'onlinepay/OPC321560202000200000000';
+    public $refundApi = 'onlinepay/OPC321560202000200000400';
+    public $closeApi = 'onlinepay/OPC321560102000200000100';
+    public $gateway = 'http://127.0.0.1:23552/sdk/doApi';
+    public $callbackUrl = '';
+    public $callbackApi = '';
+    public $commonHeader = [];
+    public $requestHeader;
+    public $requestBody;
+    public $merId = '129765100270890';
+    public $order;
+
+    public function __construct()
+    {
+        $this->commonHeader = [
+            'Content-Type' => 'application/json',
+            'Accept' => '*/*',
+            'Host' => '127.0.0.1:23552',
+            'Connection' => 'keep-alive'
+        ];
+        $this->domain = env('APP_DEBUG', false) ? 'https://open-test.scrcu.com:9051/open-gate/' : 'https://open.scrcu.com/open-gate/';
+        $this->requestHeader = [
+            'appId' => '000000000010012',
+            'appSecret' => '8c76d098-ce22-4df8-a01d-ea6f5502e5ec',
+            'openEPubK' => '3A743B476533D137EAA130F266501CAAE6D0870B1CAF0934D1CA5566F90B763F5B11C4A57B402C102C956ADF0DFDA3BD91F2843C648EAF159A9B08C0C8ACF541',
+            'appDPriK' => '7D0B1F1BAFAE24436AD322EF35A6784B264700B9402C33F9CA2C6BB7FE325AF9',
+            'openVPubK' => '7EAFB55A843DCBB33E07E4E59D3AF14216768CC0C8055985633AC753E29F9A5C07586CDBC9806CD31F66B17B12B07193B3C471C3A707C07E793D42B676AF80B1',
+            'appSPriK' => 'E8E0A7F49E2EC0E0C45352BDD4D8579FAC73A258FEDFF919B334DA2103EB32B7',
+            'httpDomainName' => $this->domain,
+            'version' => '1.0.0',
+        ];
+        $this->requestBody = [
+            'charset' => 'UTF-8',
+            'version' => 'V5.0.0',
+        ];
+    }
+
+    public function format($order)
+    {
+        try {
+            $firstGoods = $order->orderList[0]->orderProduct[0];
+            $order['goodsInfo'] = [
+                'goodsSubject' => $firstGoods->product->store_name,
+                'goodsPrice' => $firstGoods->product_price,
+                'goodsUnit' => $firstGoods->product->unit_name,
+                'goodsNum' => $firstGoods->product_num,
+                'goodsTotalAmt' => $firstGoods->total_price,
+                'goodsSpec' => $firstGoods->product_sku,
+            ];
+            $order['subject'] = $firstGoods->product->store_name . " 等{$order['total_num']}件商品";
+            return $order;
+        } catch (\Exception $e) {
+            throw new \Exception('商品信息错误');
+        }
+    }
+
+    /**
+     * 发起支付请求
+     * @param $order
+     * @return string
+     * @throws \Exception
+     */
+    public function pay($order)
+    {
+        $body['header'] = array_merge($this->requestHeader, ['apiUrl' => $this->onlinePayApi]);
+        $body['body'] = array_merge($this->requestBody, [
+            'orderType' => '01', //订单类型，固定值：01=使用我行支付的实物消费订单
+            'orderNumber' => $order['group_order_sn'],
+            'orderCurrency' => '01', //交易币种，01-人民币
+            'subject' => $order['subject'],
+            'channel' => '02', //"接入渠道:01:PC 02:手机"
+            'orderSendTime' => date('YmdHis'),
+            'orderAmt' => bcmul($order['total_price'], 100),
+            'payAmt' => bcmul($order['pay_price'], 100),
+            'backEndUrl' => $this->callbackApi,
+            'frontEndUrl' => $this->callbackUrl,
+            'merId' => $this->merId,
+            "orderDetailList" => [
+                "orderAmt" => bcmul($order['total_price'], 100),
+                "payAmt" => bcmul($order['pay_price'], 100),
+                "payType" => "",
+                "merLst" => [
+                    [
+                        "subOrderAmt" => bcmul($order['total_price'], 100),
+                        "orderNumber" => $order['group_order_sn'],
+                        "merId" => $this->merId,
+                        "subPayAmt" => bcmul($order['pay_price'], 100),
+                        "autoSettleFlag" => "1", //自动结算标记,1=自动结算，0=不自动结算，可以不传
+                        "goodsInfo" => $order['goodsInfo'],
+                    ],
+                ],
+            ]
+        ]);
+        return $this->request($body);
+    }
+
+    /**
+     * 查询
+     * @param $order
+     * @return string
+     * @throws \Exception
+     */
+    public function query($order)
+    {
+        $body['header'] = array_merge($this->requestHeader, ['apiUrl' => $this->queryApi]);
+        $body['body'] = array_merge($this->requestBody, [
+            'orderNumber' => $order['group_order_sn'],
+            'merId' => $this->merId,
+            'tranType' => '04',
+        ]);
+        return $this->request($body);
+    }
+
+    /**
+     * 退款
+     * @param $order
+     * @return string
+     * @throws \Exception
+     */
+    public function refund($order)
+    {
+        $body['header'] = array_merge($this->requestHeader, ['apiUrl' => $this->refundApi]);
+        $body['body'] = array_merge($this->requestBody, [
+            'orderNumber' => $order['group_order_sn'],
+            'merNo' => $this->merId,
+            'channel' => '02',
+            'oriSubOrderNumber' => 'f7jugi1d8pca8b5555d8d363075392',
+            'merId' => $this->merId,
+            'orderSendTime' => date('YmdHis'),
+            'orderAmt' => bcmul($order['pay_price'], 100),
+            'oriOrderNumber' => 'f7jugi1d8pca8b5555d8d363075392',
+            'backEndUrl' => $this->callbackApi,
+        ]);
+        return $this->request($body);
+    }
+
+    /**
+     * 关闭订单
+     * @param $order
+     * @return string
+     * @throws \Exception
+     */
+    public function close($order)
+    {
+        $body['header'] = array_merge($this->requestHeader, ['apiUrl' => $this->closeApi]);
+        $body['body'] = array_merge($this->requestBody, [
+            'orderNumber' => $order['group_order_sn'],
+            'merId' => $this->merId,
+        ]);
+        return $this->request($body);
+    }
+
+    /**
+     * 发起请求
+     * @param $body
+     * @return string
+     * @throws \Exception
+     */
+    public function request($body)
+    {
+        $body = json_encode($body, JSON_UNESCAPED_UNICODE);
+        $client = new \GuzzleHttp\Client();
+        try {
+            $result = $client->post($this->gateway, [
+                'headers' => $this->commonHeader,
+                'body' => $body
+            ]);
+        } catch (\Exception $e) {
+            DingTalk::exception($e, $e->getMessage());
+            throw new \Exception('请求出错');
+        }
+        return json_decode($result->getBody()->getContents(), true);
+    }
+
+    public function success()
+    {
+    }
+
+    public function callback($request = null)
+    {
+    }
+
+    public function refundQuery($refundOrder)
+    {
+    }
+
+    public function transfer($withdraw)
+    {
+    }
+
+}

crmeb/utils/Curl.php

@@ -0,0 +1,330 @@
+<?php
+
+namespace crmeb\utils;
+
+class Curl
+{
+    // Default options from config.php
+    public $options = array();
+
+    // request specific options - valid only for single request
+    public $request_options = array();
+
+
+    private $header;
+    private $headerMap;
+    private $error;
+    private $status;
+    private $info;
+
+    // default config
+    private $config = array(
+        CURLOPT_RETURNTRANSFER => true,
+        CURLOPT_FOLLOWLOCATION => true,
+        CURLOPT_HEADER         => false,
+        CURLOPT_VERBOSE        => true,
+        CURLOPT_AUTOREFERER    => true,
+        CURLOPT_CONNECTTIMEOUT => 30,
+        CURLOPT_TIMEOUT        => 30,
+        CURLOPT_SSL_VERIFYPEER => false,
+        CURLOPT_SSL_VERIFYHOST => false,
+        CURLOPT_USERAGENT => 'Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)'
+    );
+
+    public static function mergeArray()
+    {
+        $args = func_get_args();
+        $res = array_shift($args);
+        while (!empty($args)) {
+            $next = array_shift($args);
+            foreach ($next as $k => $v) {
+                if (is_array($v) && isset($res[$k]) && is_array($res[$k])) {
+                    $res[$k] = self::mergeArray($res[$k], $v);
+                } elseif (is_numeric($k)) {
+                    isset($res[$k]) ? $res[] = $v : $res[$k] = $v;
+                } else {
+                    $res[$k] = $v;
+                }
+            }
+        }
+        return $res;
+    }
+
+    public function getOptions()
+    {
+        $options = self::mergeArray($this->request_options, $this->options, $this->config);
+        return $options;
+    }
+
+    public function setOption($key, $value, $default = false)
+    {
+        if ($default) {
+            $this->options[$key] = $value;
+        } else {
+            $this->request_options[$key] = $value;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Clears Options
+     * This will clear only the request specific options. Default options cannot be cleared.
+     */
+
+    public function resetOptions()
+    {
+        $this->request_options = array();
+        return $this;
+    }
+
+    /**
+     * Resets the Option to Default option
+     * @param $key
+     * @return $this
+     */
+    public function resetOption($key)
+    {
+        if (isset($this->request_options[$key])) {
+            unset($this->request_options[$key]);
+        }
+        return $this;
+    }
+
+    public function setOptions($options, $default = false)
+    {
+        if ($default) {
+            $this->options = $options + $this->request_options;
+        } else {
+            $this->request_options = $options + $this->request_options;
+        }
+
+        return $this;
+    }
+
+    public function buildUrl($url, $data = array())
+    {
+        $parsed = parse_url($url);
+
+        isset($parsed['query']) ? parse_str($parsed['query'], $parsed['query']) : $parsed['query'] = array();
+
+        $params = isset($parsed['query']) ? $data + $parsed['query'] : $data;
+        $parsed['query'] = ($params) ? '?' . http_build_query($params) : '';
+        if (!isset($parsed['path'])) {
+            $parsed['path']='/';
+        }
+
+        $parsed['port'] = isset($parsed['port'])?':'.$parsed['port']:'';
+        return $parsed['scheme'].'://'.$parsed['host'].$parsed['port'].$parsed['path'].$parsed['query'];
+    }
+
+    public function exec($url, $options, $debug = false)
+    {
+        $this->error = null;
+        $this->header = null;
+        $this->headerMap = null;
+        $this->info = null;
+        $this->status = null;
+
+        $ch = curl_init($url);
+        curl_setopt_array($ch, $options);
+
+        $output = curl_exec($ch);
+
+        $this->status = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+
+        if (!$output) {
+            $this->error = curl_error($ch);
+            $this->info = curl_getinfo($ch);
+        } elseif ($debug) {
+            $this->info = curl_getinfo($ch);
+        }
+
+        if (@$options[CURLOPT_HEADER] == true) {
+            list($header, $output) = $this->processHeader($output, curl_getinfo($ch, CURLINFO_HEADER_SIZE));
+            $this->header = $header;
+        }
+        curl_close($ch);
+
+        return $output;
+    }
+
+    public function processHeader($response, $header_size)
+    {
+        return array(substr($response, 0, $header_size), substr($response, $header_size));
+    }
+
+    public function get($url, $params = array(), $debug = false)
+    {
+        $exec_url = $this->buildUrl($url, $params);
+        $options = $this->getOptions();
+        return $this->exec($exec_url, $options, $debug);
+    }
+
+    public function post($url, $data, $params = array(), $debug = false, $flag = false)
+    {
+        $url = $this->buildUrl($url, $params);
+//        if ($flag) {
+//            $this->setOption(CURLOPT_HTTPHEADER, Yii::app()->params['host']);
+//        }
+        $options = $this->getOptions();
+        $options[CURLOPT_POST] = true;
+        $options[CURLOPT_POSTFIELDS] = $data;
+
+        return $this->exec($url, $options, $debug);
+    }
+
+    public function postJson($url, $data, $params = array(), $debug = false, $flag = false)
+    {
+        $url = $this->buildUrl($url, $params);
+//        if ($flag) {
+//            $this->setOption(CURLOPT_HTTPHEADER, Yii::app()->params['host']);
+//        }
+        $options = $this->getOptions();
+        $options[CURLOPT_POST] = true;
+        $options[CURLOPT_POSTFIELDS] = $data;
+        $options[CURLOPT_HEADER] = 0;
+        $options[CURLOPT_HTTPHEADER] =
+            array('Content-Type: application/json; charset=utf-8', 'Content-Length:' . strlen($data));
+
+        return $this->exec($url, $options, $debug);
+    }
+
+    public function put($url, $data = null, $params = array(), $debug = false)
+    {
+        $url = $this->buildUrl($url, $params);
+
+        $f = fopen('php://temp', 'rw+');
+        fwrite($f, $data);
+        rewind($f);
+
+        $options =  $this->getOptions();
+        $options[CURLOPT_PUT] = true;
+        $options[CURLOPT_INFILE] = $f;
+        $options[CURLOPT_INFILESIZE] = strlen($data);
+
+        return $this->exec($url, $options, $debug);
+    }
+
+    public function patch($url, $data = array(), $params = array(), $debug = false)
+    {
+        $url = $this->buildUrl($url, $params);
+
+        $options = $this->getOptions();
+        $options[CURLOPT_CUSTOMREQUEST] = 'PATCH';
+        $options[CURLOPT_POSTFIELDS] = $data;
+
+        return $this->exec($url, $options, $debug);
+    }
+
+    public function delete($url, $params = array(), $debug = false)
+    {
+        $url = $this->buildUrl($url, $params);
+
+        $options = $this->getOptions();
+        $options[CURLOPT_CUSTOMREQUEST] = 'DELETE';
+
+        return $this->exec($url, $options, $debug);
+    }
+
+    /**
+     * Gets header of the last curl call if header was enabled
+     */
+    public function getHeaders()
+    {
+        if (!$this->header) {
+            return array();
+        }
+
+        if (!$this->headerMap) {
+            $headers = explode("\r\n", trim($this->header));
+            $output = array();
+            $output['http_status'] = array_shift($headers);
+
+            foreach ($headers as $line) {
+                $params = explode(':', $line, 2);
+
+                if (!isset($params[1])) {
+                    $output['http_status'] = $params[0];
+                } else {
+                    $output[trim($params[0])] = trim($params[1]);
+                }
+            }
+
+            $this->headerMap = $output;
+        }
+        return $this->headerMap;
+    }
+
+    public function addHeader($header = array())
+    {
+        $h = isset($this->request_options[CURLOPT_HTTPHEADER]) ? $this->request_options[CURLOPT_HTTPHEADER] : array();
+        foreach ($header as $k => $v) {
+            $h[] = $k . ': ' . $v;
+        }
+
+        $this->setHeaders($h);
+        return $this;
+    }
+
+    public function getHeader($key)
+    {
+        $headers = array_change_key_case($this->getHeaders(), CASE_LOWER);
+        $key = strtolower($key);
+
+        return @$headers[$key];
+    }
+
+    public function setHeaders($header = array(), $default = false)
+    {
+        if ($this->isAssoc($header)) {
+            $out = array();
+            foreach ($header as $k => $v) {
+                $out[] = $k .': '.$v;
+            }
+            $header = $out;
+        }
+
+        $this->setOption(CURLOPT_HTTPHEADER, $header, $default);
+        return $this;
+    }
+
+    private function isAssoc($arr)
+    {
+        return array_keys($arr) !== range(0, count($arr) - 1);
+    }
+
+    public function getError()
+    {
+        return $this->error;
+    }
+
+    public function getInfo()
+    {
+        return $this->info;
+    }
+
+    public function getStatus()
+    {
+        return $this->status;
+    }
+
+    public function init()
+    {
+        return;
+    }
+
+    public function download($fileUrl, $path)
+    {
+        $localFileName = $path . DIRECTORY_SEPARATOR . md5($fileUrl);
+        $ch = curl_init($fileUrl);
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+        $result = curl_exec($ch);
+        curl_close($ch);
+        $fp = fopen($localFileName, 'a');
+        fwrite($fp, $result);
+        fclose($fp);
+
+        return $localFileName;
+    }
+}

crmeb/utils/DingTalk.php

@@ -0,0 +1,78 @@
+<?php
+
+namespace crmeb\utils;
+
+class DingTalk
+{
+
+    public static $url = 'https://oapi.dingtalk.com/robot/send?access_token=%s';
+
+    /**
+     * @param $url
+     * @param $text
+     * @param $at array
+     * @return mixed
+     */
+    public static function send($text, $url = null, array $at = [])
+    {
+        $tokenArray = [
+            'production' => '64f863c5f4415e715c8b9c925b6d58837553335e42059b6fba579f0a301287e9',
+            'test' => 'f3d3bb7cf3c46073c6f657c021113d74fabd59742d33af5d8601ec8c38f18310',
+        ];
+        $env = env('APP_ENV', 'test');
+//        if ($env == 'test') {
+//            return true;
+//        }
+        $token = $tokenArray[$env];
+        if(empty($url)){
+            $url = self::$url;
+        }
+        $url = sprintf($url, $token);
+        $data = array (
+            'msgtype' => 'text',
+            'text' => [
+                'content' => $text
+            ],
+            'at' => [
+                'atMobiles' => 'all' == $at ? [] : $at,
+                'isAtAll' => 'all' == $at,
+            ],
+        );
+        $data_string = json_encode($data);
+        $curl = new Curl();
+        $result = $curl->postJson($url, $data_string);
+        if ($result) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * 发送钉钉异常告警
+     * @param \Throwable $exception
+     * @param $msg
+     * @param null $request
+     * @return bool|mixed
+     */
+    public static function exception(\Throwable $exception, $msg, $request = null)
+    {
+        $message = [
+            "业务异常: {$msg}",
+            'code：' . $exception->getCode(),
+            'message：' . $exception->getMessage(),
+            'file：' . $exception->getFile(),
+            'line：' . $exception->getLine(),
+        ];
+        if ($request !== null) {
+            $message[] = 'method：' . $request->method();
+            $message[] = 'route：' . $request->rule()->getRule();
+            $message[] = 'params：' . json_encode($request->rule()->getVars());
+        }
+        if (is_callable([$exception, 'errors'])) {
+            $message[] = 'errors:' . json_encode($exception->errors(), JSON_UNESCAPED_UNICODE);
+        }
+        $message = implode(PHP_EOL, $message);
+        return self::send($message);
+    }
+
+}

public/mer/css/chunk-0fa0e81e.3f2a189e.css

@@ -0,0 +1 @@
+.selWidth[data-v-6f36b31e]{width:300px}.el-dropdown-link[data-v-6f36b31e]{cursor:pointer;color:#409eff;font-size:12px}.el-icon-arrow-down[data-v-6f36b31e]{font-size:12px}.tabBox_tit[data-v-6f36b31e]{width:60%;font-size:12px!important;margin:0 2px 0 10px;letter-spacing:1px;padding:5px 0;-webkit-box-sizing:border-box;box-sizing:border-box}.el-menu-item[data-v-6f36b31e]{font-weight:700;color:#333}[data-v-6f36b31e] .el-dialog__header{text-align:left}.el-col[data-v-6f36b31e]{position:relative}.el-col .el-divider--vertical[data-v-6f36b31e]{position:absolute;height:100%;right:0;top:0;margin:0}.grid-content[data-v-6f36b31e]{padding:0 15px;display:block}.grid-content .color_gray[data-v-6f36b31e],.grid-content .color_red[data-v-6f36b31e],.grid-content .title[data-v-6f36b31e]{display:block;line-height:20px}.grid-content .color_red[data-v-6f36b31e]{color:red;font-weight:700}.grid-content .color_gray[data-v-6f36b31e]{color:#333;font-weight:700}.grid-content .count[data-v-6f36b31e]{font-size:12px}.grid-content .list[data-v-6f36b31e]{margin-top:20px}.grid-content .list .item[data-v-6f36b31e]{overflow:hidden;margin-bottom:10px}.grid-content .list .cost[data-v-6f36b31e],.grid-content .list .name[data-v-6f36b31e]{line-height:20px}.grid-content .list .cost[data-v-6f36b31e]{text-align:right}.grid-content .list .cost span[data-v-6f36b31e]{display:block}.grid-content .list .cost_count[data-v-6f36b31e],.grid-content .list .name[data-v-6f36b31e]{font-size:12px}.grid-content .list .cost_count[data-v-6f36b31e]{margin-top:10px}.grid-content .list .cost_num[data-v-6f36b31e]{font-weight:700;color:#333}

public/mer/js/chunk-00584afe.898df037.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-00584afe"],{"94ad":function(t,e,a){"use strict";a("f851")},e15a:function(t,e,a){"use strict";a.r(e);var i=function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",{staticClass:"divBox"},[a("el-card",{staticClass:"box-card"},[a("div",{staticClass:"clearfix",attrs:{slot:"header"},slot:"header"},[a("div",{staticClass:"container"},[a("el-form",{attrs:{inline:""}},[a("el-form-item",{staticClass:"mr10",attrs:{label:"搜索:"}},[a("el-input",{staticClass:"selWidth",attrs:{placeholder:"请输入物流公司名称或者编码"},on:{input:function(e){return t.getList(1)}},model:{value:t.tableFrom.keyword,callback:function(e){t.$set(t.tableFrom,"keyword",e)},expression:"tableFrom.keyword"}}),t._v(" "),a("el-button",{attrs:{type:"primary"},on:{click:function(e){return t.getList(1)}}},[t._v("搜索")])],1)],1)],1)]),t._v(" "),a("el-table",{directives:[{name:"loading",rawName:"v-loading",value:t.listLoading,expression:"listLoading"}],staticStyle:{width:"100%"},attrs:{data:t.tableData.data,size:"mini"}},[a("el-table-column",{attrs:{prop:"id",label:"ID","min-width":"150"}}),t._v(" "),a("el-table-column",{attrs:{prop:"name",label:"物流公司名称","min-width":"200"}}),t._v(" "),a("el-table-column",{attrs:{prop:"code",label:"编码","min-width":"200"}}),t._v(" "),a("el-table-column",{attrs:{label:"操作","min-width":"80",fixed:"right"},scopedSlots:t._u([{key:"default",fn:function(e){return[1==e.row.partner_id||1==e.row.partner_key||1==e.row.net_name?a("el-button",{attrs:{type:"text",size:"small"},on:{click:function(a){return t.handleEdit(e.row.id)}}},[t._v("月结账号编辑")]):t._e()]}}])})],1),t._v(" "),a("div",{staticClass:"block"},[a("el-pagination",{attrs:{"page-sizes":[20,40,60,80],"page-size":t.tableFrom.limit,"current-page":t.tableFrom.page,layout:"total, sizes, prev, pager, next, jumper",total:t.tableData.total},on:{"size-change":t.handleSizeChange,"current-change":t.pageChange}})],1)],1)],1)},n=[],l=a("8593"),s={name:"ExpressFreight",data:function(){return{tableData:{data:[],total:0},listLoading:!0,tableFrom:{page:1,limit:20,date:"",keyword:""},tabClickIndex:""}},mounted:function(){this.getList(1)},methods:{handleEdit:function(t){var e=this;this.$modalForm(Object(l["a"])(t)).then((function(){return e.getList("")}))},getList:function(t){var e=this;this.listLoading=!0,this.tableFrom.page=t||this.tableFrom.page,Object(l["p"])(this.tableFrom).then((function(t){e.tableData.data=t.data.list,e.tableData.total=t.data.count,e.listLoading=!1})).catch((function(t){e.listLoading=!1,e.$message.error(t.message)}))},pageChange:function(t){this.tableFrom.page=t,this.getList("")},handleSizeChange:function(t){this.tableFrom.limit=t,this.getList("")}}},o=s,r=(a("94ad"),a("2877")),c=Object(r["a"])(o,i,n,!1,null,"66122ae6",null);e["default"]=c.exports},f851:function(t,e,a){}}]);

public/mer/js/chunk-03944393.ff24af19.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-03944393"],{"26f0":function(t,e,i){"use strict";i("78e5")},"283f":function(t,e,i){"use strict";i.r(e);var l=function(){var t=this,e=t.$createElement,i=t._self._c||e;return i("div",{staticClass:"divBox"},[i("div",{staticClass:"header clearfix"},[i("div",{staticClass:"filter-container"},[i("div",{staticClass:"demo-input-suffix acea-row"},[i("span",{staticClass:"seachTiele"},[t._v("商品搜索：")]),t._v(" "),i("el-input",{staticClass:"selWidth",attrs:{placeholder:"请输入商品名称，关键字，产品编号",size:"small"},model:{value:t.tableFrom.keyword,callback:function(e){t.$set(t.tableFrom,"keyword",e)},expression:"tableFrom.keyword"}},[i("el-button",{staticClass:"el-button-solt",attrs:{slot:"append",icon:"el-icon-search",size:"small"},on:{click:function(e){return t.getList()}},slot:"append"})],1)],1)])]),t._v(" "),i("el-table",{directives:[{name:"loading",rawName:"v-loading",value:t.listLoading,expression:"listLoading"}],ref:"multipleSelection",staticStyle:{width:"100%"},attrs:{data:t.tableData.data,size:"mini","highlight-current-row":"","row-key":function(t){return t.id}},on:{"selection-change":t.handleSelectionChange}},[i("el-table-column",{attrs:{type:"selection",width:"55"}}),t._v(" "),i("el-table-column",{attrs:{prop:"broadcast_goods_id",label:"ID","min-width":"50"}}),t._v(" "),i("el-table-column",{attrs:{label:"商品图","min-width":"80"},scopedSlots:t._u([{key:"default",fn:function(t){return[i("div",{staticClass:"demo-image__preview"},[i("el-image",{staticStyle:{width:"36px",height:"36px"},attrs:{src:t.row.cover_img,"preview-src-list":[t.row.cover_img]}})],1)]}}])}),t._v(" "),i("el-table-column",{attrs:{prop:"name",label:"商品名称","min-width":"200"}})],1),t._v(" "),i("div",{staticClass:"block mb20"},[i("el-pagination",{attrs:{"page-sizes":[20,40,60,80],"page-size":t.tableFrom.limit,"current-page":t.tableFrom.page,layout:"total, sizes, prev, pager, next, jumper",total:t.tableData.total},on:{"size-change":t.handleSizeChange,"current-change":t.pageChange}})],1)],1)},a=[],n=(i("ac6a"),i("b7be")),o=i("83d6"),s={name:"GoodList",data:function(){return{templateRadio:0,merCateList:[],roterPre:o["roterPre"],listLoading:!0,tableData:{data:[],total:0},tableFrom:{page:1,limit:20,status_tag:1,keyword:"",mer_valid:1},multipleSelectionAll:window.form_create_helper.get(this.$route.query.field)||[],multipleSelection:[],checked:[],broadcast_room_id:""}},mounted:function(){this.getList();var t=[];this.multipleSelectionAll=t,form_create_helper.onOk(this.unloadHandler)},methods:{unloadHandler:function(){this.multipleSelectionAll.length>0?this.$route.query.field&&(form_create_helper.set(this.$route.query.field,this.multipleSelectionAll.map((function(t){return{id:t.product_id,src:t.cover_img}}))),console.log(this.multipleSelectionAll),localStorage.setItem("broadcastPro",JSON.stringify(this.multipleSelectionAll))):this.$message.warning("请先选择商品")},handleSelectionChange:function(t){var e=this;this.multipleSelection=t,this.multipleSelectionAll=t,setTimeout((function(){e.changePageCoreRecordData()}),50)},setSelectRow:function(){if(this.multipleSelectionAll&&!(this.multipleSelectionAll.length<=0)){var t=this.idKey,e=[];this.multipleSelectionAll.forEach((function(i){e.push(i[t])})),this.$refs.table.clearSelection();for(var i=0;i<this.tableData.data.length;i++)e.indexOf(this.tableData.data[i][t])>=0&&this.$refs.table.toggleRowSelection(this.tableData.data[i],!0)}},changePageCoreRecordData:function(){var t=this.idKey,e=this;if(this.multipleSelectionAll.length<=0)this.multipleSelectionAll=this.multipleSelection;else{var i=[];this.multipleSelectionAll.forEach((function(e){i.push(e[t])}));var l=[];this.multipleSelection.forEach((function(a){l.push(a[t]),i.indexOf(a[t])<0&&e.multipleSelectionAll.push(a)}));var a=[];this.tableData.data.forEach((function(e){l.indexOf(e[t])<0&&a.push(e[t])})),a.forEach((function(l){if(i.indexOf(l)>=0)for(var a=0;a<e.multipleSelectionAll.length;a++)if(e.multipleSelectionAll[a][t]==l){e.multipleSelectionAll.splice(a,1);break}}))}},getList:function(){var t=this;this.listLoading=!0,Object(n["j"])(this.tableFrom).then((function(e){t.tableData.data=[],t.tableData.data=e.data.list,t.tableData.total=e.data.count,t.$nextTick((function(){this.setSelectRow()})),t.listLoading=!1})).catch((function(e){t.listLoading=!1,t.$message.error(e.message)}))},pageChange:function(t){this.changePageCoreRecordData(),this.tableFrom.page=t,this.getList()},handleSizeChange:function(t){this.changePageCoreRecordData(),this.tableFrom.limit=t,this.getList()}}},r=s,c=(i("26f0"),i("2877")),h=Object(c["a"])(r,l,a,!1,null,"35e2eac8",null);e["default"]=h.exports},"78e5":function(t,e,i){}}]);

public/mer/js/chunk-0d2c1415.5b747251.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-0d2c1415","chunk-2d0da983"],{4553:function(e,t,i){"use strict";i.r(t);var o=function(){var e=this,t=e.$createElement,i=e._self._c||t;return i("div",[i("div",{staticClass:"mt20 ml20"},[i("el-input",{staticStyle:{width:"300px"},attrs:{placeholder:"请输入视频链接"},model:{value:e.videoLink,callback:function(t){e.videoLink=t},expression:"videoLink"}}),e._v(" "),i("input",{ref:"refid",staticStyle:{display:"none"},attrs:{type:"file"},on:{change:e.zh_uploadFile_change}}),e._v(" "),i("el-button",{staticClass:"ml10",attrs:{type:"primary",icon:"ios-cloud-upload-outline"},on:{click:e.zh_uploadFile}},[e._v(e._s(e.videoLink?"确认添加":"上传视频"))]),e._v(" "),e.upload.videoIng?i("el-progress",{staticStyle:{"margin-top":"20px"},attrs:{"stroke-width":20,percentage:e.progress,"text-inside":!0}}):e._e(),e._v(" "),e.formValidate.video_link?i("div",{staticClass:"iview-video-style"},[i("video",{staticStyle:{width:"100%",height:"100%!important","border-radius":"10px"},attrs:{src:e.formValidate.video_link,controls:"controls"}},[e._v("\n        您的浏览器不支持 video 标签。\n      ")]),e._v(" "),i("div",{staticClass:"mark"}),e._v(" "),i("i",{staticClass:"iconv el-icon-delete",on:{click:e.delVideo}})]):e._e()],1),e._v(" "),i("div",{staticClass:"mt50 ml20"},[i("el-button",{attrs:{type:"primary"},on:{click:e.uploads}},[e._v("确认")])],1)])},a=[],n=(i("7f7f"),i("c4c8")),s=(i("6bef"),{name:"Vide11o",props:{isDiy:{type:Boolean,default:!1}},data:function(){return{upload:{videoIng:!1},progress:20,videoLink:"",formValidate:{video_link:""}}},methods:{delVideo:function(){var e=this;e.$set(e.formValidate,"video_link","")},zh_uploadFile:function(){this.videoLink?this.formValidate.video_link=this.videoLink:this.$refs.refid.click()},zh_uploadFile_change:function(e){var t=this,i=e.target.files[0].name.substr(e.target.files[0].name.indexOf("."));if(".mp4"!==i)return t.$message.error("只能上传MP4文件");Object(n["db"])().then((function(i){t.$videoCloud.videoUpload({type:i.data.type,evfile:e,res:i,uploading:function(e,i){t.upload.videoIng=e,console.log(e,i)}}).then((function(e){t.formValidate.video_link=e.url||e.data.src,t.$message.success("视频上传成功"),t.progress=100,t.upload.videoIng=!1})).catch((function(e){t.$message.error(e)}))}))},uploads:function(){this.formValidate.video_link||this.videoLink?!this.videoLink||this.formValidate.video_link?this.isDiy?this.$emit("getVideo",this.formValidate.video_link):nowEditor&&(nowEditor.dialog.close(!0),nowEditor.editor.setContent("<video src='"+this.formValidate.video_link+"' controls='controls'></video>",!0)):this.$message.error("请点击确认添加按钮！"):this.$message.error("您还没有上传视频！")}}}),r=s,d=(i("8307"),i("2877")),l=Object(d["a"])(r,o,a,!1,null,"732b6bbd",null);t["default"]=l.exports},"6bef":function(e,t,i){"use strict";i.r(t);i("28a5"),i("a481");(function(){if(window.frameElement&&window.frameElement.id){var e=window.parent,t=e.$EDITORUI[window.frameElement.id.replace(/_iframe$/,"")],i=t.editor,o=e.UE,a=o.dom.domUtils,n=o.utils,s=(o.browser,o.ajax,function(e){return document.getElementById(e)});window.nowEditor={editor:i,dialog:t},n.loadFile(document,{href:i.options.themePath+i.options.theme+"/dialogbase.css?cache="+Math.random(),tag:"link",type:"text/css",rel:"stylesheet"});var r=i.getLang(t.className.split("-")[2]);r&&a.on(window,"load",(function(){var e=i.options.langPath+i.options.lang+"/images/";for(var t in r["static"]){var o=s(t);if(o){var d=o.tagName,l=r["static"][t];switch(l.src&&(l=n.extend({},l,!1),l.src=e+l.src),l.style&&(l=n.extend({},l,!1),l.style=l.style.replace(/url\s*\(/g,"url("+e)),d.toLowerCase()){case"var":o.parentNode.replaceChild(document.createTextNode(l),o);break;case"select":for(var c,u=o.options,v=0;c=u[v];)c.innerHTML=l.options[v++];for(var p in l)"options"!=p&&o.setAttribute(p,l[p]);break;default:a.setAttributes(o,l)}}}}))}})()},8307:function(e,t,i){"use strict";i("f5ee")},f5ee:function(e,t,i){}}]);

public/mer/js/chunk-1df22872.51627dcd.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-1df22872"],{"0bd9":function(t,e,a){},"7b74":function(t,e,a){"use strict";a.r(e);var i=function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",{staticClass:"divBox"},[a("el-card",{staticClass:"box-card"},[a("div",{staticClass:"clearfix",attrs:{slot:"header"},slot:"header"},[a("div",{staticClass:"container"},[a("el-form",{attrs:{size:"small","label-width":"84px"}},[a("el-form-item",{staticClass:"width100",attrs:{label:"模板名称："}},[a("el-input",{staticClass:"selWidth",attrs:{placeholder:"请输入模板名称",size:"small"},nativeOn:{keyup:function(e){return!e.type.indexOf("key")&&t._k(e.keyCode,"enter",13,e.key,"Enter")?null:t.getList(e)}},model:{value:t.tableFrom.name,callback:function(e){t.$set(t.tableFrom,"name",e)},expression:"tableFrom.name"}},[a("el-button",{staticClass:"el-button-solt",attrs:{slot:"append",icon:"el-icon-search",size:"small"},on:{click:t.getList},slot:"append"})],1)],1)],1)],1),t._v(" "),a("el-button",{attrs:{size:"small",type:"primary"},on:{click:t.add}},[t._v("添加运费模板")])],1),t._v(" "),a("el-table",{directives:[{name:"loading",rawName:"v-loading",value:t.listLoading,expression:"listLoading"}],staticStyle:{width:"100%"},attrs:{data:t.tableData.data,size:"samll","highlight-current-row":""}},[a("el-table-column",{attrs:{prop:"shipping_template_id",label:"ID","min-width":"60"}}),t._v(" "),a("el-table-column",{attrs:{prop:"name",label:"模板名称","min-width":"150"}}),t._v(" "),a("el-table-column",{attrs:{label:"计费方式","min-width":"100"},scopedSlots:t._u([{key:"default",fn:function(e){var i=e.row;return[a("span",[t._v(t._s(t._f("typeFilter")(i.type)))])]}}])}),t._v(" "),a("el-table-column",{attrs:{label:"指定包邮","min-width":"100"},scopedSlots:t._u([{key:"default",fn:function(e){var i=e.row;return[a("span",[t._v(t._s(t._f("statusFilter")(i.appoint)))])]}}])}),t._v(" "),a("el-table-column",{attrs:{label:"指定区域不配送","min-width":"150"},scopedSlots:t._u([{key:"default",fn:function(e){var i=e.row;return[a("span",[t._v(t._s(t._f("statusFilter")(i.undelivery)))])]}}])}),t._v(" "),a("el-table-column",{attrs:{prop:"sort",label:"排序","min-width":"100"}}),t._v(" "),a("el-table-column",{attrs:{prop:"create_time",label:"创建时间","min-width":"150"}}),t._v(" "),a("el-table-column",{attrs:{label:"操作","min-width":"100",fixed:"right"},scopedSlots:t._u([{key:"default",fn:function(e){return[a("el-button",{attrs:{type:"text",size:"small"},on:{click:function(a){return t.onEdit(e.row.shipping_template_id)}}},[t._v("编辑")]),t._v(" "),a("el-button",{attrs:{type:"text",size:"small"},on:{click:function(a){return t.handleDelete(e.row.shipping_template_id,e.$index)}}},[t._v("删除")])]}}])})],1),t._v(" "),a("div",{staticClass:"block"},[a("el-pagination",{attrs:{"page-sizes":[20,40,60,80],"page-size":t.tableFrom.limit,"current-page":t.tableFrom.page,layout:"total, sizes, prev, pager, next, jumper",total:t.tableData.total},on:{"size-change":t.handleSizeChange,"current-change":t.pageChange}})],1)],1)],1)},l=[],n=a("8a9d"),s={name:"ShippingTemplates",filters:{statusFilter:function(t){var e={1:"自定义",2:"开启",0:"关闭"};return e[t]},typeFilter:function(t){var e={0:"按件数",1:"按重量",2:"按体积"};return e[t]}},data:function(){return{dialogVisible:!1,tableFrom:{page:1,limit:20,name:""},tableData:{data:[],total:0},listLoading:!0,componentKey:0}},mounted:function(){this.getList()},methods:{add:function(){var t=this;this.$modalTemplates(0,(function(){t.getList()}))},getList:function(){var t=this;this.listLoading=!0,Object(n["e"])(this.tableFrom).then((function(e){t.tableData.data=e.data.list,t.tableData.total=e.data.count,t.listLoading=!1})).catch((function(e){t.listLoading=!1,t.$message.error(e.message)}))},pageChange:function(t){this.tableFrom.page=t,this.getList()},handleSizeChange:function(t){this.tableFrom.limit=t,this.getList()},onEdit:function(t){var e=this;this.$modalTemplates(t,(function(){e.getList()}),this.componentKey+=1)},handleDelete:function(t,e){var a=this;this.$modalSure().then((function(){Object(n["c"])(t).then((function(t){var i=t.message;a.$message.success(i),a.tableData.data.splice(e,1)})).catch((function(t){var e=t.message;a.$message.error(e)}))}))}}},o=s,r=(a("8ad1"),a("2877")),c=Object(r["a"])(o,i,l,!1,null,"21e688d4",null);e["default"]=c.exports},"8ad1":function(t,e,a){"use strict";a("0bd9")}}]);

public/mer/js/chunk-2d0aba79.86e506e3.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0aba79"],{"15cb":function(t,e,a){"use strict";a.r(e);var n=function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",{staticClass:"divBox"},[a("el-card",{staticClass:"box-card"},[a("div",{staticClass:"clearfix",attrs:{slot:"header"},slot:"header"},[a("el-button",{attrs:{size:"small",type:"primary"},on:{click:t.onAdd}},[t._v("添加用户标签")])],1),t._v(" "),a("el-table",{directives:[{name:"loading",rawName:"v-loading",value:t.listLoading,expression:"listLoading"}],staticStyle:{width:"100%"},attrs:{data:t.tableData.data,size:"small","highlight-current-row":""}},[a("el-table-column",{attrs:{label:"ID","min-width":"60"},scopedSlots:t._u([{key:"default",fn:function(e){var n=e.row;return[a("span",{domProps:{textContent:t._s(-1!==t.$route.path.indexOf("group")?n.group_id:n.label_id)}})]}}])}),t._v(" "),a("el-table-column",{attrs:{label:-1!==t.$route.path.indexOf("group")?"分组名称":"标签名称","min-width":"180"},scopedSlots:t._u([{key:"default",fn:function(e){var n=e.row;return[a("span",{domProps:{textContent:t._s(-1!==t.$route.path.indexOf("group")?n.group_name:n.label_name)}})]}}])}),t._v(" "),a("el-table-column",{attrs:{prop:"create_time",label:"创建时间","min-width":"150"}}),t._v(" "),a("el-table-column",{attrs:{label:"操作","min-width":"100",fixed:"right",align:"center"},scopedSlots:t._u([{key:"default",fn:function(e){return[a("el-button",{attrs:{type:"text",size:"small"},on:{click:function(a){t.onEdit(-1!==t.$route.path.indexOf("group")?e.row.group_id:e.row.label_id)}}},[t._v("编辑")]),t._v(" "),a("el-button",{attrs:{type:"text",size:"small"},on:{click:function(a){t.handleDelete(-1!==t.$route.path.indexOf("group")?e.row.group_id:e.row.label_id,e.$index)}}},[t._v("删除")])]}}])})],1),t._v(" "),a("div",{staticClass:"block"},[a("el-pagination",{attrs:{"page-sizes":[20,40,60,80],"page-size":t.tableFrom.limit,"current-page":t.tableFrom.page,layout:"total, sizes, prev, pager, next, jumper",total:t.tableData.total},on:{"size-change":t.handleSizeChange,"current-change":t.pageChange}})],1)],1)],1)},i=[],o=a("c24f"),l={name:"UserGroup",data:function(){return{tableFrom:{page:1,limit:20},tableData:{data:[],total:0},listLoading:!0}},mounted:function(){this.getList()},methods:{getList:function(){var t=this;this.listLoading=!0,Object(o["p"])(this.tableFrom).then((function(e){t.tableData.data=e.data.list,t.tableData.total=e.data.count,t.listLoading=!1})).catch((function(e){t.listLoading=!1,t.$message.error(e.message)}))},pageChange:function(t){this.tableFrom.page=t,this.getList()},handleSizeChange:function(t){this.tableFrom.limit=t,this.getList()},onAdd:function(){var t=this;this.$modalForm(Object(o["o"])()).then((function(){return t.getList()}))},onEdit:function(t){var e=this;this.$modalForm(Object(o["n"])(t)).then((function(){return e.getList()}))},handleDelete:function(t,e){var a=this;this.$modalSure("删除该标签").then((function(){Object(o["m"])(t).then((function(t){var n=t.message;a.$message.success(n),a.tableData.data.splice(e,1)})).catch((function(t){var e=t.message;a.$message.error(e)}))}))}}},s=l,r=a("2877"),c=Object(r["a"])(s,n,i,!1,null,"d05d8040",null);e["default"]=c.exports}}]);

public/mer/js/chunk-2d0aed35.1bbefe4d.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0aed35"],{"0c5a":function(e,n,t){"use strict";t.r(n);var u=function(){var e=this,n=e.$createElement,t=e._self._c||n;return t("router-view")},c=[],r=t("2877"),a={},l=Object(r["a"])(a,u,c,!1,null,null,null);n["default"]=l.exports}}]);

public/mer/js/chunk-2d0b1e40.303ffef9.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0b1e40"],{"227a":function(e,t,a){"use strict";a.r(t);var n=function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",{staticClass:"divBox"},[a("el-card",{staticClass:"box-card"},[a("upload-from")],1)],1)},o=[],c=a("b5b8"),s={name:"Picture",components:{uploadFrom:c["default"]},data:function(){return{}},methods:{}},r=s,u=a("2877"),d=Object(u["a"])(r,n,o,!1,null,"2e674e22",null);t["default"]=d.exports}}]);

public/mer/js/chunk-2d0ba554.5a041a10.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0ba554"],{3782:function(e,n,t){"use strict";t.r(n);var u=function(){var e=this,n=e.$createElement,t=e._self._c||n;return t("router-view")},r=[],c=t("2877"),l={},a=Object(c["a"])(l,u,r,!1,null,null,null);n["default"]=a.exports}}]);

public/mer/js/chunk-2d0c212a.5c403140.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0c212a"],{"496e":function(t,e,a){"use strict";a.r(e);var n=function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",{staticClass:"divBox"},[a("el-card",{staticClass:"box-card"},[a("div",{staticClass:"clearfix",attrs:{slot:"header"},slot:"header"},[a("el-button",{attrs:{size:"small",type:"primary"},on:{click:t.add}},[t._v("添加商品规格")])],1),t._v(" "),a("el-table",{directives:[{name:"loading",rawName:"v-loading",value:t.listLoading,expression:"listLoading"}],staticStyle:{width:"100%"},attrs:{data:t.tableData.data,size:"small","highlight-current-row":""}},[a("el-table-column",{attrs:{prop:"attr_template_id",label:"ID","min-width":"60"}}),t._v(" "),a("el-table-column",{attrs:{prop:"template_name",label:"规格名称","min-width":"150"}}),t._v(" "),a("el-table-column",{attrs:{label:"商品规格","min-width":"150"},scopedSlots:t._u([{key:"default",fn:function(e){return t._l(e.row.template_value,(function(e,n){return a("span",{key:n,staticClass:"mr10",domProps:{textContent:t._s(e.value)}})}))}}])}),t._v(" "),a("el-table-column",{attrs:{label:"商品属性","min-width":"300"},scopedSlots:t._u([{key:"default",fn:function(e){return t._l(e.row.template_value,(function(e,n){return a("div",{key:n,domProps:{textContent:t._s(e.detail.join(","))}})}))}}])}),t._v(" "),a("el-table-column",{attrs:{label:"操作","min-width":"100",fixed:"right"},scopedSlots:t._u([{key:"default",fn:function(e){return[a("el-button",{attrs:{type:"text",size:"small"},on:{click:function(a){return t.onEdit(e.row)}}},[t._v("编辑")]),t._v(" "),a("el-button",{attrs:{type:"text",size:"small"},on:{click:function(a){return t.handleDelete(e.row.attr_template_id,e.$index)}}},[t._v("删除\n          ")])]}}])})],1),t._v(" "),a("div",{staticClass:"block"},[a("el-pagination",{attrs:{"page-sizes":[20,40,60,80],"page-size":t.tableFrom.limit,"current-page":t.tableFrom.page,layout:"total, sizes, prev, pager, next, jumper",total:t.tableData.total},on:{"size-change":t.handleSizeChange,"current-change":t.pageChange}})],1)],1)],1)},i=[],l=a("c4c8"),s={name:"ProductAttr",data:function(){return{formDynamic:{template_name:"",template_value:[]},tableFrom:{page:1,limit:20},tableData:{data:[],total:0},listLoading:!0}},mounted:function(){this.getList()},methods:{add:function(){var t=this;t.formDynamic={template_name:"",template_value:[]},this.$modalAttr(Object.assign({},t.formDynamic),(function(){t.getList()}))},getList:function(){var t=this;this.listLoading=!0,Object(l["Mb"])(this.tableFrom).then((function(e){t.tableData.data=e.data.list,t.tableData.total=e.data.count,t.listLoading=!1})).catch((function(e){t.listLoading=!1,t.$message.error(e.message)}))},pageChange:function(t){this.tableFrom.page=t,this.getList()},handleSizeChange:function(t){this.tableFrom.limit=t,this.getList()},handleDelete:function(t,e){var a=this;this.$modalSure().then((function(){Object(l["k"])(t).then((function(t){var n=t.message;a.$message.success(n),a.tableData.data.splice(e,1)})).catch((function(t){var e=t.message;a.$message.error(e)}))}))},onEdit:function(t){var e=this;this.$modalAttr(JSON.parse(JSON.stringify(t)),(function(){e.getList(),this.formDynamic={template_name:"",template_value:[]}}))}}},o=s,r=a("2877"),c=Object(r["a"])(o,n,i,!1,null,null,null);e["default"]=c.exports}}]);

public/mer/js/chunk-2d0c481a.5f8488b2.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0c481a"],{"3ab8":function(e,n,t){"use strict";t.r(n);var u=function(){var e=this,n=e.$createElement,t=e._self._c||n;return t("router-view")},c=[],r=t("2877"),a={},l=Object(r["a"])(a,u,c,!1,null,null,null);n["default"]=l.exports}}]);

public/mer/js/chunk-2d0c8a44.c672b1f6.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0c8a44"],{"566c":function(t,a,e){"use strict";e.r(a);var n=function(){var t=this,a=t.$createElement,e=t._self._c||a;return e("div",{staticClass:"divBox"},[e("el-card",{staticClass:"box-card"},[t.FormData?e("form-create",{directives:[{name:"loading",rawName:"v-loading",value:t.loading,expression:"loading"}],ref:"fc",staticClass:"formBox",attrs:{option:t.option,rule:t.FormData.rule,"handle-icon":"false"},on:{submit:t.onSubmit}}):t._e()],1)],1)},o=[],s=e("c7eb"),r=(e("96cf"),e("1da1")),i=e("30ba"),c=e.n(i),u=e("b7be"),d=e("0c6d"),l=e("83d6"),f={name:"CreatCoupon",data:function(){return{option:{form:{labelWidth:"150px"},submitBtn:{loading:!1},global:{upload:{props:{onSuccess:function(t,a){200===t.status&&(a.url=t.data.src)}}}}},FormData:null,loading:!1}},components:{formCreate:c.a.$form()},mounted:function(){this.getFrom()},methods:{getFrom:function(){var t=this;this.loading=!0,Object(u["J"])().then(function(){var a=Object(r["a"])(Object(s["a"])().mark((function a(e){return Object(s["a"])().wrap((function(a){while(1)switch(a.prev=a.next){case 0:t.FormData=e.data,t.loading=!1,t.$store.dispatch("settings/setEdit",!0);case 3:case"end":return a.stop()}}),a)})));return function(t){return a.apply(this,arguments)}}()).catch((function(a){t.$message.error(a.message),t.loading=!1}))},onSubmit:function(t){var a=this;this.$refs.fc.$f.btn.loading(!0),d["a"][this.FormData.method.toLowerCase()](this.FormData.api,t).then((function(t){a.$refs.fc.$f.btn.loading(!1),a.$message.success(t.message||"提交成功"),a.$store.dispatch("settings/setEdit",!1),a.$router.push({path:"".concat(l["roterPre"],"/marketing/studio/list")})})).catch((function(t){a.$refs.fc.$f.btn.loading(!1),a.$message.error(t.message||"提交失败")}))}}},m=f,p=e("2877"),h=Object(p["a"])(m,n,o,!1,null,"c1581826",null);a["default"]=h.exports}}]);

public/mer/js/chunk-2d0d095b.21412df0.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0d095b"],{6935:function(a,t,e){"use strict";e.r(t);var n=function(){var a=this,t=a.$createElement,e=a._self._c||t;return e("div",{staticClass:"divBox"},[e("el-card",{staticClass:"box-card"},[a.FormData?e("form-create",{directives:[{name:"loading",rawName:"v-loading",value:a.loading,expression:"loading"}],ref:"fc",staticClass:"formBox",attrs:{option:a.option,rule:a.FormData.rule,"handle-icon":"false"},on:{submit:a.onSubmit}}):a._e()],1)],1)},o=[],r=e("c7eb"),s=(e("96cf"),e("1da1")),i=e("30ba"),c=e.n(i),u=e("b7be"),l=e("0c6d"),d={name:"IntegralConfig",data:function(){return{option:{form:{labelWidth:"150px"},global:{upload:{props:{onSuccess:function(a,t){200===a.status&&(t.url=a.data.src)}}}}},FormData:null,loading:!1}},components:{formCreate:c.a.$form()},mounted:function(){this.getFrom()},methods:{getFrom:function(){var a=this;this.loading=!0,Object(u["R"])("integral").then(function(){var t=Object(s["a"])(Object(r["a"])().mark((function t(e){return Object(r["a"])().wrap((function(t){while(1)switch(t.prev=t.next){case 0:a.FormData=e.data,a.loading=!1;case 2:case"end":return t.stop()}}),t)})));return function(a){return t.apply(this,arguments)}}()).catch((function(t){a.$message.error(t.message),a.loading=!1}))},onSubmit:function(a){var t=this;l["a"][this.FormData.method.toLowerCase()](this.FormData.api,a).then((function(a){t.$message.success(a.message||"提交成功")})).catch((function(a){t.$message.error(a.message||"提交失败")}))}}},m=d,f=e("2877"),p=Object(f["a"])(m,n,o,!1,null,"2c447d1a",null);t["default"]=p.exports}}]);

public/mer/js/chunk-2d0d3300.05afc9fd.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0d3300"],{"5c62":function(t,e,a){"use strict";a.r(e);var i=function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",{staticClass:"divBox"},[a("el-card",{staticClass:"box-card"},[a("div",{staticClass:"clearfix",attrs:{slot:"header"},slot:"header"},[a("el-button",{attrs:{size:"small",type:"primary"},on:{click:t.onAdd}},[t._v("添加专场")])],1),t._v(" "),a("el-table",{directives:[{name:"loading",rawName:"v-loading",value:t.loading,expression:"loading"}],staticStyle:{width:"100%"},attrs:{data:t.tableData.data,size:"small"}},[t._l(t.columns,(function(e,i){return a("el-table-column",{key:i,attrs:{prop:e.key,label:e.title,"min-width":e.minWidth},scopedSlots:t._u([{key:"default",fn:function(i){return[["img","image","pic"].indexOf(e.key)>-1||e.key.indexOf("pic")>-1||e.key.indexOf("img")>-1||e.key.indexOf("image")>-1||e.key.indexOf("banner")>-1?a("div",{staticClass:"demo-image__preview"},[Array.isArray(i.row[e.key])?a("div",t._l(i.row[e.key],(function(t,e){return a("span",{key:e},[a("el-image",{staticStyle:{width:"36px",height:"36px","margin-right":"5px"},attrs:{src:t}})],1)})),0):a("div",[a("el-image",{staticStyle:{width:"36px",height:"36px"},attrs:{src:i.row[e.key]}})],1)]):"type"==e.key?a("span",[t._v("\n            "+t._s(1==i.row[e.key]?"小图":2==i.row[e.key]?"中图":"大图")+"\n          ")]):a("span",[t._v(t._s(i.row[e.key]))])]}}],null,!0)})})),t._v(" "),a("el-table-column",{attrs:{prop:"status",label:"是否显示","min-width":"100"},scopedSlots:t._u([{key:"default",fn:function(e){return[a("el-switch",{attrs:{"active-value":1,"inactive-value":0,"active-text":"显示","inactive-text":"隐藏"},on:{change:function(a){return t.onchangeIsShow(e.row)}},model:{value:e.row.status,callback:function(a){t.$set(e.row,"status",a)},expression:"scope.row.status"}})]}}])}),t._v(" "),a("el-table-column",{attrs:{label:"操作","min-width":"100",fixed:"right"},scopedSlots:t._u([{key:"default",fn:function(e){return[a("el-button",{attrs:{type:"text",size:"small"},on:{click:function(a){return t.onEdit(e.row.group_data_id)}}},[t._v("编辑")]),t._v(" "),a("el-button",{attrs:{type:"text",size:"small"},on:{click:function(a){return t.handleDelete(e.row.group_data_id,e.$index)}}},[t._v("删除")])]}}])})],2),t._v(" "),a("div",{staticClass:"block"},[a("el-pagination",{attrs:{"page-sizes":[20,40,60,80],"page-size":t.tableData.limit,"current-page":t.tableData.page,layout:"total, sizes, prev, pager, next, jumper",total:t.tableData.total},on:{"size-change":t.handleSizeChange,"current-change":t.pageChange}})],1)],1)],1)},n=[],s=(a("7f7f"),a("ac6a"),a("8593")),o={name:"Data",data:function(){return{tableData:{page:1,limit:20,data:[],total:0},loading:!1,groupId:null,groupDetail:null}},computed:{columns:function(){if(!this.groupDetail)return[];var t=[{title:"ID",key:"group_data_id",minWidth:60}];return this.groupDetail.fields.forEach((function(e){t.push({title:e.name,key:e.field,minWidth:80})})),t.push({title:"添加时间",key:"create_time",minWidth:200}),t}},watch:{"$route.params.id":function(t){this.groupId=t},groupId:function(t){this.getGroupDetail(t)}},mounted:function(){this.groupId=this.$route.params.id},methods:{getGroupDetail:function(t){var e=this;Object(s["t"])(t).then((function(t){e.groupDetail=t.data,e.tableData.page=1,e.getList()}))},getList:function(){var t=this;this.loading=!0,Object(s["s"])(this.$route.params.id,this.tableData.page,this.tableData.limit).then((function(e){t.tableData.data=e.data.list,t.tableData.total=e.data.count,t.loading=!1})).catch((function(e){t.loading=!1,t.$message.error(e.message)}))},pageChange:function(t){this.tableData.page=t,this.getList()},handleSizeChange:function(t){this.tableData.limit=t,this.getList()},onAdd:function(){var t=this;this.$modalForm(Object(s["m"])(this.$route.params.id)).then((function(){return t.getList()}))},onEdit:function(t){var e=this;this.$modalForm(Object(s["J"])(this.$route.params.id,t)).then((function(){return e.getList()}))},onchangeIsShow:function(t){var e=this;Object(s["r"])(t.group_data_id,t.status).then((function(t){var a=t.message;e.$message.success(a)})).catch((function(t){var a=t.message;e.$message.error(a)}))},handleDelete:function(t,e){var a=this;this.$modalSure("删除该专场").then((function(){Object(s["o"])(t).then((function(t){var i=t.message;a.$message.success(i),a.tableData.data.splice(e,1)})).catch((function(t){var e=t.message;a.$message.error(e)}))}))}}},r=o,l=a("2877"),c=Object(l["a"])(r,i,n,!1,null,"174ef35a",null);e["default"]=c.exports}}]);

public/mer/js/chunk-2d0e276e.c29634d9.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0e276e"],{"7f8a":function(a,t,e){"use strict";e.r(t);var n=function(){var a=this,t=a.$createElement,e=a._self._c||t;return e("div",{staticClass:"divBox"},[e("el-card",{staticClass:"box-card"},[a.FormData?e("form-create",{directives:[{name:"loading",rawName:"v-loading",value:a.loading,expression:"loading"}],ref:"fc",staticClass:"formBox",attrs:{option:a.option,rule:a.FormData.rule,"handle-icon":"false"},on:{submit:a.onSubmit}}):a._e()],1)],1)},o=[],s=e("c7eb"),r=(e("96cf"),e("1da1")),c=e("30ba"),i=e.n(c),u=e("2801"),l=e("0c6d"),m=(e("83d6"),{name:"payType",data:function(){return{option:{form:{labelWidth:"150px"},global:{upload:{props:{onSuccess:function(a,t){200===a.status&&(t.url=a.data.src)}}}}},FormData:null,loading:!1}},components:{formCreate:i.a.$form()},mounted:function(){this.getFrom()},methods:{getFrom:function(){var a=this;this.loading=!0,Object(u["j"])().then(function(){var t=Object(r["a"])(Object(s["a"])().mark((function t(e){return Object(s["a"])().wrap((function(t){while(1)switch(t.prev=t.next){case 0:a.FormData=e.data,a.loading=!1;case 2:case"end":return t.stop()}}),t)})));return function(a){return t.apply(this,arguments)}}()).catch((function(t){a.$message.error(t.message),a.loading=!1}))},onSubmit:function(a){var t=this;l["a"][this.FormData.method.toLowerCase()](this.FormData.api,a).then((function(a){t.$message.success(a.message||"提交成功")})).catch((function(a){t.$message.error(a.message||"提交失败")}))}}}),d=m,f=e("2877"),p=Object(f["a"])(d,n,o,!1,null,"c11bae1c",null);t["default"]=p.exports}}]);

public/mer/js/chunk-2d0e5b8e.4311eddb.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0e5b8e"],{9661:function(e,n,t){"use strict";t.r(n);var u=function(){var e=this,n=e.$createElement,t=e._self._c||n;return t("router-view")},r=[],c=t("2877"),l={},o=Object(c["a"])(l,u,r,!1,null,null,null);n["default"]=o.exports}}]);

public/mer/js/chunk-2d0e6675.21001b74.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0e6675"],{9932:function(e,n,t){"use strict";t.r(n);var u=function(){var e=this,n=e.$createElement,t=e._self._c||n;return t("router-view")},r=[],c=t("2877"),l={},o=Object(c["a"])(l,u,r,!1,null,null,null);n["default"]=o.exports}}]);

public/mer/js/chunk-2d207706.4b731c6b.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d207706"],{a111:function(t,e,a){"use strict";a.r(e);var i=function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",{staticClass:"divBox"},[a("el-card",{staticClass:"box-card"},[a("div",{staticClass:"clearfix",attrs:{slot:"header"},slot:"header"},[a("el-button",{attrs:{size:"small",type:"primary"},on:{click:t.onAdd}},[t._v("添加数据")])],1),t._v(" "),a("el-table",{directives:[{name:"loading",rawName:"v-loading",value:t.loading,expression:"loading"}],staticStyle:{width:"100%"},attrs:{data:t.tableData.data,size:"small"}},[t._l(t.columns,(function(e,i){return a("el-table-column",{key:i,attrs:{prop:e.key,label:e.title,"min-width":e.minWidth},scopedSlots:t._u([{key:"default",fn:function(i){return[["img","image","pic"].indexOf(e.key)>-1||e.key.indexOf("pic")>-1||e.key.indexOf("img")>-1||e.key.indexOf("image")>-1||e.key.indexOf("banner")>-1?a("div",{staticClass:"demo-image__preview"},[Array.isArray(i.row[e.key])?a("div",t._l(i.row[e.key],(function(t,e){return a("span",{key:e},[a("el-image",{staticStyle:{width:"36px",height:"36px","margin-right":"5px"},attrs:{src:t}})],1)})),0):a("div",[a("el-image",{staticStyle:{width:"36px",height:"36px"},attrs:{src:i.row[e.key]}})],1)]):a("span",[t._v(t._s(i.row[e.key]))])]}}],null,!0)})})),t._v(" "),a("el-table-column",{attrs:{prop:"status",label:"是否显示","min-width":"100"},scopedSlots:t._u([{key:"default",fn:function(e){return[a("el-switch",{attrs:{"active-value":1,"inactive-value":0,"active-text":"显示","inactive-text":"隐藏"},on:{change:function(a){return t.onchangeIsShow(e.row)}},model:{value:e.row.status,callback:function(a){t.$set(e.row,"status",a)},expression:"scope.row.status"}})]}}])}),t._v(" "),a("el-table-column",{attrs:{label:"操作","min-width":"100",fixed:"right"},scopedSlots:t._u([{key:"default",fn:function(e){return[a("el-button",{attrs:{type:"text",size:"small"},on:{click:function(a){return t.onEdit(e.row.group_data_id)}}},[t._v("编辑")]),t._v(" "),a("el-button",{attrs:{type:"text",size:"small"},on:{click:function(a){return t.handleDelete(e.row.group_data_id,e.$index)}}},[t._v("删除")])]}}])})],2),t._v(" "),a("div",{staticClass:"block"},[a("el-pagination",{attrs:{"page-sizes":[20,40,60,80],"page-size":t.tableData.limit,"current-page":t.tableData.page,layout:"total, sizes, prev, pager, next, jumper",total:t.tableData.total},on:{"size-change":t.handleSizeChange,"current-change":t.pageChange}})],1)],1)],1)},n=[],s=(a("7f7f"),a("ac6a"),a("8593")),o={name:"Data",data:function(){return{tableData:{page:1,limit:20,data:[],total:0},loading:!1,groupId:null,groupDetail:null}},computed:{columns:function(){if(!this.groupDetail)return[];var t=[{title:"ID",key:"group_data_id",minWidth:60}];return this.groupDetail.fields.forEach((function(e){t.push({title:e.name,key:e.field,minWidth:80})})),t.push({title:"添加时间",key:"create_time",minWidth:200}),t}},watch:{"$route.params.id":function(t){this.groupId=t},groupId:function(t){this.getGroupDetail(t)}},mounted:function(){this.groupId=this.$route.params.id},methods:{getGroupDetail:function(t){var e=this;Object(s["t"])(t).then((function(t){e.groupDetail=t.data,e.tableData.page=1,e.getList()}))},getList:function(){var t=this;this.loading=!0,Object(s["s"])(this.$route.params.id,this.tableData.page,this.tableData.limit).then((function(e){t.tableData.data=e.data.list,t.tableData.total=e.data.count,t.loading=!1})).catch((function(e){t.loading=!1,t.$message.error(e.message)}))},pageChange:function(t){this.tableData.page=t,this.getList()},handleSizeChange:function(t){this.tableData.limit=t,this.getList()},onAdd:function(){var t=this;this.$modalForm(Object(s["m"])(this.$route.params.id)).then((function(){return t.getList()}))},onEdit:function(t){var e=this;this.$modalForm(Object(s["J"])(this.$route.params.id,t)).then((function(){return e.getList()}))},onchangeIsShow:function(t){},handleDelete:function(t,e){var a=this;this.$modalSure("删除该数据").then((function(){Object(s["o"])(t).then((function(t){var i=t.message;a.$message.success(i),a.tableData.data.splice(e,1)})).catch((function(t){var e=t.message;a.$message.error(e)}))}))}}},l=o,r=a("2877"),u=Object(r["a"])(l,i,n,!1,null,"393d859a",null);e["default"]=u.exports}}]);

public/mer/js/chunk-2d209391.50c64e39.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d209391"],{a7af:function(t,e,a){"use strict";a.r(e);var n=function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",{staticClass:"divBox"},[a("el-card",{staticClass:"box-card"},[a("div",{staticClass:"clearfix",attrs:{slot:"header"},slot:"header"},[a("el-button",{attrs:{size:"small",type:"primary"},on:{click:t.onAdd}},[t._v("添加商品标签")])],1),t._v(" "),a("el-table",{directives:[{name:"loading",rawName:"v-loading",value:t.listLoading,expression:"listLoading"}],staticStyle:{width:"100%"},attrs:{data:t.tableData.data,size:"small"}},[a("el-table-column",{attrs:{prop:"label_name",label:"标签名称","min-width":"60"}}),t._v(" "),a("el-table-column",{attrs:{prop:"info",label:"标签说明","min-width":"150"}}),t._v(" "),a("el-table-column",{attrs:{prop:"sort",label:"排序","min-width":"50"}}),t._v(" "),a("el-table-column",{attrs:{prop:"status",label:"是否显示","min-width":"100"},scopedSlots:t._u([{key:"default",fn:function(e){return[a("el-switch",{attrs:{"active-value":1,"inactive-value":0,"active-text":"显示","inactive-text":"隐藏"},on:{change:function(a){return t.onchangeIsShow(e.row)}},model:{value:e.row.status,callback:function(a){t.$set(e.row,"status",a)},expression:"scope.row.status"}})]}}])}),t._v(" "),a("el-table-column",{attrs:{prop:"create_time",label:"创建时间","min-width":"150"}}),t._v(" "),a("el-table-column",{attrs:{label:"操作","min-width":"100",fixed:"right"},scopedSlots:t._u([{key:"default",fn:function(e){return[a("el-button",{attrs:{type:"text",size:"small"},on:{click:function(a){return t.onEdit(e.row.product_label_id)}}},[t._v("编辑")]),t._v(" "),a("el-button",{attrs:{type:"text",size:"small"},on:{click:function(a){return t.handleDelete(e.row.product_label_id,e.$index)}}},[t._v("删除")])]}}])})],1),t._v(" "),a("div",{staticClass:"block"},[a("el-pagination",{attrs:{"page-sizes":[20,40,60,80],"page-size":t.tableFrom.limit,"current-page":t.tableFrom.page,layout:"total, sizes, prev, pager, next, jumper",total:t.tableData.total},on:{"size-change":t.handleSizeChange,"current-change":t.pageChange}})],1)],1)],1)},i=[],s=a("c4c8"),l={name:"LabelList",data:function(){return{tableFrom:{page:1,limit:20},tableData:{data:[],total:0},listLoading:!0}},mounted:function(){this.getList("")},methods:{add:function(){},getList:function(t){var e=this;this.listLoading=!0,this.tableFrom.page=t||this.tableFrom.page,Object(s["J"])(this.tableFrom).then((function(t){e.tableData.data=t.data.list,e.tableData.total=t.data.count,e.listLoading=!1})).catch((function(t){e.listLoading=!1,e.$message.error(t.message)}))},pageChange:function(t){this.tableFrom.page=t,this.getList("")},handleSizeChange:function(t){this.tableFrom.limit=t,this.getList("")},onAdd:function(){var t=this;this.$modalForm(Object(s["H"])()).then((function(){return t.getList("")}))},onEdit:function(t){var e=this;this.$modalForm(Object(s["L"])(t)).then((function(){return e.getList("")}))},handleDelete:function(t,e){var a=this;this.$modalSure("删除该标签").then((function(){Object(s["I"])(t).then((function(t){var e=t.message;a.$message.success(e),a.getList("")})).catch((function(t){var e=t.message;a.$message.error(e)}))}))},onchangeIsShow:function(t){var e=this;Object(s["K"])(t.product_label_id,t.status).then((function(t){var a=t.message;e.$message.success(a),e.getList("")})).catch((function(t){var a=t.message;e.$message.error(a)}))}}},o=l,r=a("2877"),c=Object(r["a"])(o,n,i,!1,null,null,null);e["default"]=c.exports}}]);

public/mer/js/chunk-2d213182.2ca9be60.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d213182"],{aae1:function(e,n,t){"use strict";t.r(n);var u=function(){var e=this,n=e.$createElement,t=e._self._c||n;return t("router-view")},r=[],a=t("2877"),c={},l=Object(a["a"])(c,u,r,!1,null,null,null);n["default"]=l.exports}}]);

public/mer/js/chunk-2d213ed3.2b57b666.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d213ed3"],{af80:function(e,n,t){"use strict";t.r(n);var u=function(){var e=this,n=e.$createElement,t=e._self._c||n;return t("router-view")},r=[],c=t("2877"),l={},a=Object(c["a"])(l,u,r,!1,null,null,null);n["default"]=a.exports}}]);

public/mer/js/chunk-2d21d8a3.f94570a6.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d21d8a3"],{d276:function(t,a,e){"use strict";e.r(a);var i=function(){var t=this,a=t.$createElement,e=t._self._c||a;return e("div",{staticClass:"divBox"},[e("el-card",{staticClass:"box-card"},[e("div",{staticClass:"clearfix",attrs:{slot:"header"},slot:"header"},[e("el-button",{attrs:{size:"small",type:"primary"},on:{click:t.onAdd}},[t._v("添加组合数据")])],1),t._v(" "),e("el-table",{directives:[{name:"loading",rawName:"v-loading",value:t.loading,expression:"loading"}],staticStyle:{width:"100%"},attrs:{data:t.tableData.data,size:"small"}},[e("el-table-column",{attrs:{prop:"group_id",label:"ID","min-width":"60"}}),t._v(" "),e("el-table-column",{attrs:{prop:"group_name",label:"数据组名称","min-width":"130"}}),t._v(" "),e("el-table-column",{attrs:{prop:"group_key",label:"数据组key","min-width":"130"}}),t._v(" "),e("el-table-column",{attrs:{prop:"group_info",label:"数据组说明","min-width":"130"}}),t._v(" "),e("el-table-column",{attrs:{prop:"create_time",label:"创建时间","min-width":"150"}}),t._v(" "),e("el-table-column",{attrs:{label:"操作","min-width":"100",fixed:"right"},scopedSlots:t._u([{key:"default",fn:function(a){return[e("el-button",{attrs:{type:"text",size:"small"},on:{click:function(e){return t.goList(a.row.group_id,a.$index)}}},[t._v("数据列表")]),t._v(" "),e("el-button",{attrs:{type:"text",size:"small"},on:{click:function(e){return t.onEdit(a.row.group_id)}}},[t._v("编辑")])]}}])})],1),t._v(" "),e("div",{staticClass:"block"},[e("el-pagination",{attrs:{"page-sizes":[20,40,60,80],"page-size":t.tableData.limit,"current-page":t.tableData.page,layout:"total, sizes, prev, pager, next, jumper",total:t.tableData.total},on:{"size-change":t.handleSizeChange,"current-change":t.pageChange}})],1)],1)],1)},n=[],l=e("8593"),o={name:"List",data:function(){return{tableData:{page:1,limit:20,data:[],total:0},loading:!1}},mounted:function(){this.getList()},methods:{getList:function(){var t=this;this.loading=!0,Object(l["u"])(this.tableData.page,this.tableData.limit).then((function(a){t.tableData.data=a.data.list,t.tableData.total=a.data.count,t.loading=!1})).catch((function(a){t.loading=!1,t.$message.error(a.message)}))},pageChange:function(t){this.tableData.page=t,this.getList()},handleSizeChange:function(t){this.tableData.limit=t,this.getList()},onAdd:function(){var t=this;this.$modalForm(Object(l["n"])()).then((function(){return t.getLst()}))},onEdit:function(t){var a=this;this.$modalForm(Object(l["K"])(t)).then((function(){return a.getLst()}))},goList:function(t){this.$router.push("/group/data/".concat(t))}}},s=o,r=e("2877"),c=Object(r["a"])(s,i,n,!1,null,"57d51cbc",null);a["default"]=c.exports}}]);

public/mer/js/chunk-2d229240.228bfdae.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d229240"],{dbd0:function(t,e,a){"use strict";a.r(e);var o=function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",{staticClass:"divBox"},[a("el-card",{staticClass:"box-card"},[t.FormData?a("form-create",{directives:[{name:"loading",rawName:"v-loading",value:t.loading,expression:"loading"}],ref:"fc",staticClass:"formBox",attrs:{option:t.option,rule:t.FormData.rule,"handle-icon":"false",cmovies:t.movies},on:{submit:t.onSubmit}}):t._e()],1)],1)},n=[],s=a("c7eb"),r=(a("96cf"),a("1da1")),i=a("30ba"),c=a.n(i),u=a("b7be"),l=a("0c6d"),m=a("83d6"),d={name:"CreatCoupon",data:function(){return{option:{form:{labelWidth:"150px"},global:{upload:{props:{onSuccess:function(t,e){200===t.status&&(e.url=t.data.src)}}}}},FormData:null,loading:!1,movies:1}},components:{formCreate:c.a.$form()},mounted:function(){this.getFrom()},methods:{getFrom:function(){var t=this;this.loading=!0,sessionStorage.setItem("singleChoice",1),Object(u["K"])().then(function(){var e=Object(r["a"])(Object(s["a"])().mark((function e(a){return Object(s["a"])().wrap((function(e){while(1)switch(e.prev=e.next){case 0:t.FormData=a.data,t.loading=!1;case 2:case"end":return e.stop()}}),e)})));return function(t){return e.apply(this,arguments)}}()).catch((function(e){t.$message.error(e.message),t.loading=!1}))},onSubmit:function(t){var e=this;l["a"][this.FormData.method.toLowerCase()](this.FormData.api,t).then((function(t){e.$message.success(t.message||"提交成功"),e.$router.push({path:"".concat(m["roterPre"],"/marketing/broadcast/list")})})).catch((function(t){e.$message.error(t.message||"提交失败")}))}}},f=d,p=a("2877"),h=Object(p["a"])(f,o,n,!1,null,null,null);e["default"]=h.exports}}]);

public/mer/js/chunk-2d230c26.bf8dc9a7.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d230c26"],{ee3c:function(t,e,a){"use strict";a.r(e);var n=function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",{staticClass:"divBox"},[a("el-card",{staticClass:"box-card"},[t.FormData?a("form-create",{directives:[{name:"loading",rawName:"v-loading",value:t.loading,expression:"loading"}],ref:"fc",staticClass:"formBox",attrs:{option:t.option,rule:t.FormData.rule,"handle-icon":"false"},on:{submit:t.onSubmit}}):t._e()],1)],1)},o=[],r=a("c7eb"),s=(a("96cf"),a("1da1")),c=a("30ba"),i=a.n(c),u=a("b7be"),l=a("0c6d"),m=a("83d6"),d={name:"CreatCoupon",data:function(){return{option:{form:{labelWidth:"150px"},global:{upload:{props:{onSuccess:function(t,e){200===t.status&&(e.url=t.data.src)}}}}},FormData:null,loading:!1}},components:{formCreate:i.a.$form()},mounted:function(){this.getFrom(),sessionStorage.setItem("singleChoice",0)},methods:{getFrom:function(){var t=this;this.loading=!0,this.$route.params.id?Object(u["y"])(this.$route.params.id).then(function(){var e=Object(s["a"])(Object(r["a"])().mark((function e(a){return Object(r["a"])().wrap((function(e){while(1)switch(e.prev=e.next){case 0:t.FormData=a.data,t.loading=!1;case 2:case"end":return e.stop()}}),e)})));return function(t){return e.apply(this,arguments)}}()).catch((function(e){t.$message.error(e.message),t.loading=!1})):Object(u["C"])().then(function(){var e=Object(s["a"])(Object(r["a"])().mark((function e(a){return Object(r["a"])().wrap((function(e){while(1)switch(e.prev=e.next){case 0:t.FormData=a.data,t.loading=!1;case 2:case"end":return e.stop()}}),e)})));return function(t){return e.apply(this,arguments)}}()).catch((function(e){t.$message.error(e.message),t.loading=!1}))},onSubmit:function(t){var e=this;l["a"][this.FormData.method.toLowerCase()](this.FormData.api,t).then((function(t){e.$message.success(t.message||"提交成功"),e.$router.push({path:"".concat(m["roterPre"],"/marketing/coupon/list")})})).catch((function(t){e.$message.error(t.message||"提交失败")}))}}},p=d,f=a("2877"),h=Object(f["a"])(p,n,o,!1,null,"66ea4727",null);e["default"]=h.exports}}]);

public/mer/js/chunk-2f105f7b.de54abc7.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2f105f7b"],{bff0:function(t,e,a){"use strict";a.r(e);var i=function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",{staticClass:"divBox"},[a("el-card",{staticClass:"box-card"},[a("div",{staticClass:"clearfix",attrs:{slot:"header"},slot:"header"},[a("el-form",{attrs:{inline:"",size:"small"}},[a("el-form-item",[a("el-input",{staticClass:"selWidth",attrs:{placeholder:"请输入用户名称"},nativeOn:{keyup:function(e){return!e.type.indexOf("key")&&t._k(e.keyCode,"enter",13,e.key,"Enter")?null:t.getList(1)}},model:{value:t.tableFrom.nickname,callback:function(e){t.$set(t.tableFrom,"nickname",e)},expression:"tableFrom.nickname"}},[a("el-button",{staticClass:"el-button-solt",attrs:{slot:"append",icon:"el-icon-search"},on:{click:function(e){return t.getList(1)}},slot:"append"})],1)],1),t._v(" "),a("el-form-item",[a("span",{staticStyle:{"font-size":"12px",color:"#C0C4CC"}},[t._v("注：将用户添加为客服时,请确保用户先关注本店铺")])])],1)],1),t._v(" "),a("el-table",{directives:[{name:"loading",rawName:"v-loading",value:t.loading,expression:"loading"}],staticStyle:{width:"100%"},attrs:{data:t.tableData.data,size:"small"}},[a("el-table-column",{attrs:{label:"","min-width":"65"},scopedSlots:t._u([{key:"default",fn:function(e){return[a("el-radio",{attrs:{label:e.row.uid},nativeOn:{change:function(a){return t.getTemplateRow(e.$index,e.row)}},model:{value:t.templateRadio,callback:function(e){t.templateRadio=e},expression:"templateRadio"}},[t._v(" ")])]}}])}),t._v(" "),a("el-table-column",{attrs:{prop:"uid",label:"ID","min-width":"60"}}),t._v(" "),a("el-table-column",{attrs:{prop:"nickname",label:"微信用户名称","min-width":"130"}}),t._v(" "),a("el-table-column",{attrs:{label:"客服头像","min-width":"80"},scopedSlots:t._u([{key:"default",fn:function(e){return[a("div",{staticClass:"demo-image__preview"},[a("el-image",{staticClass:"tabImage",attrs:{src:e.row.avatar?e.row.avatar:t.moren,"preview-src-list":[e.row.avatar||t.moren]}})],1)]}}])}),t._v(" "),a("el-table-column",{attrs:{label:"用户类型","min-width":"130"},scopedSlots:t._u([{key:"default",fn:function(e){return[a("span",[t._v(t._s(t._f("statusFilter")(e.row.user_type)))])]}}])})],1),t._v(" "),a("div",{staticClass:"block"},[a("el-pagination",{attrs:{"page-sizes":[20,40,60,80],"page-size":t.tableFrom.limit,"current-page":t.tableFrom.page,layout:"total, sizes, prev, pager, next, jumper",total:t.tableData.total},on:{"size-change":t.handleSizeChange,"current-change":t.pageChange}})],1)],1)],1)},l=[],n=a("8593"),s={name:"UserList",filters:{saxFilter:function(t){var e={0:"未知",1:"男",2:"女"};return e[t]},statusFilter:function(t){var e={wechat:"微信用户",routine:"小程序用户",h5:"H5用户",app:"APP用户",pc:"PC用户"};return e[t]}},data:function(){return{moren:a("cdfe"),templateRadio:0,loading:!1,tableData:{data:[],total:0},tableFrom:{page:1,limit:20,nickname:""}}},mounted:function(){this.getList(1)},methods:{getTemplateRow:function(t,e){form_create_helper.set(this.$route.query.field,{src:e.avatar||this.moren,id:e.uid}),form_create_helper.close(this.$route.query.field)},getList:function(t){var e=this;this.loading=!0,this.tableFrom.page=t||this.tableFrom.page,Object(n["L"])(this.tableFrom).then((function(t){e.tableData.data=t.data.list,e.tableData.total=t.data.count,e.loading=!1})).catch((function(t){e.$message.error(t.message),e.loading=!1}))},pageChange:function(t){this.tableFrom.page=t,this.getList("")},handleSizeChange:function(t){this.tableFrom.limit=t,this.getList("")}}},r=s,o=a("2877"),c=Object(o["a"])(r,i,l,!1,null,"41147e5e",null);e["default"]=c.exports},cdfe:function(t,e,a){t.exports=a.p+"mer/img/f.5aa43cd3.png"}}]);