[更新]同步framework代码

application/store/command/AutoRun.php

@@ -15,6 +15,8 @@
 namespace app\store\command;
 
 use think\console\Command;
+use think\console\Input;
+use think\console\Output;
 use think\Db;
 
 /**
@@ -31,18 +33,34 @@ class AutoRun extends Command
     }
 
     /**
-     * 执行指令
+     * 业务指令执行
-     * @param \think\console\Input $input
+     * @param Input $input
-     * @param \think\console\Output $output
+     * @param Output $output
      * @throws \think\Exception
      * @throws \think\db\exception\DataNotFoundException
      * @throws \think\db\exception\ModelNotFoundException
      * @throws \think\exception\DbException
      * @throws \think\exception\PDOException
      */
-    protected function execute(\think\console\Input $input, \think\console\Output $output)
+    protected function execute(Input $input, Output $output)
+    {
+        // 自动取消30分钟未支付的订单
+        $this->autoCancelOrder();
+        // 清理一天前未支付的订单
+        $this->autoCleanOrder();
+        // 订单自动退款处理
+        // $this->autoRefundOrder();
+        // 提现自动打款处理
+        // $this->autoTransfer();
+    }
+
+    /**
+     * 自动取消30分钟未支付的订单
+     * @throws \think\Exception
+     * @throws \think\exception\PDOException
+     */
+    private function autoCancelOrder()
     {
-        # 自动取消30分钟未支付的订单
         $where = [['create_at', '<', date('Y-m-d H:i:s', strtotime('-30 minutes'))]];
         $count = Db::name('StoreOrder')->where(['pay_state' => '0'])->whereIn('status', ['1', '2'])->where($where)->update([
             'status'       => '0',
@@ -55,7 +73,18 @@ class AutoRun extends Command
         } else {
             $this->output->comment('没有需要自动取消30分钟未支付的订单记录！');
         }
-        # 清理一天前未支付的订单
+    }
+
+    /**
+     * 清理一天前未支付的订单
+     * @throws \think\Exception
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     * @throws \think\exception\PDOException
+     */
+    private function autoCleanOrder()
+    {
         $where = [['create_at', '<', date('Y-m-d H:i:s', strtotime('-1 day'))]];
         $list = Db::name('StoreOrder')->where(['pay_state' => '0'])->where($where)->limit(20)->select();
         if (count($order_nos = array_unique(array_column($list, 'order_no'))) > 0) {
@@ -67,4 +96,80 @@ class AutoRun extends Command
         }
     }
 
+    /**
+     * 订单自动退款操作
+     * @throws \think\Exception
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     * @throws \think\exception\PDOException
+     */
+    private function autoRefundOrder()
+    {
+        // 未完成退款的订单，执行微信退款操作
+        foreach (Db::name('StoreOrder')->where(['refund_state' => '1'])->select() as $order) {
+            try {
+                $this->output->writeln("正在为 {$order['order_no']} 执行退款操作...");
+                $result = \We::WePayRefund(config('wechat.wxpay'))->create([
+                    'transaction_id' => $order['pay_no'],
+                    'out_refund_no'  => $order['refund_no'],
+                    'total_fee'      => $order['price_total'] * 100,
+                    'refund_fee'     => $order['pay_price'] * 100,
+                    'refund_account' => 'REFUND_SOURCE_UNSETTLED_FUNDS',
+                ]);
+                if ($result['return_code'] === 'SUCCESS' && $result['result_code'] === 'SUCCESS') {
+                    Db::name('StoreOrder')->where(['order_no' => $order['order_no']])->update([
+                        'refund_state' => '2', 'refund_desc' => '自动退款成功！',
+                    ]);
+                } else {
+                    Db::name('StoreOrder')->where(['order_no' => $order['order_no']])->update([
+                        'refund_desc' => isset($result['err_code_des']) ? $result['err_code_des'] : '自动退款失败',
+                    ]);
+                }
+            } catch (\Exception $e) {
+                $this->output->writeln("订单 {$order['order_no']} 执行退款失败，{$e->getMessage()}！");
+                Db::name('StoreOrder')->where(['order_no' => $order['order_no']])->update(['refund_desc' => $e->getMessage()]);
+            }
+        }
+        $this->output->writeln('自动检测退款订单执行完成！');
+    }
+
+    /**
+     * 自动企业打款操作
+     * @throws \think\Exception
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     * @throws \think\exception\PDOException
+     */
+    private function autoTransfer()
+    {
+        # 批量企业打款
+        foreach (Db::name('StoreProfitUsed')->where(['status' => '1'])->select() as $vo) {
+            try {
+                $wechat = \We::WePayTransfers(config('wechat.wxpay'));
+                $result = $wechat->create([
+                    'partner_trade_no' => $vo['trs_no'],
+                    'openid'           => $vo['openid'],
+                    'check_name'       => 'NO_CHECK',
+                    'amount'           => $vo['pay_price'] * 100,
+                    'desc'             => '营销活动拥金提现',
+                    'spbill_create_ip' => '127.0.0.1',
+                ]);
+                if ($result['return_code'] === 'SUCCESS' && $result['result_code'] === 'SUCCESS') {
+                    Db::name('StoreProfitUsed')->where(['trs_no' => $vo['trs_no']])->update([
+                        'status' => '2', 'pay_desc' => '拥金提现成功！', 'pay_no' => $result['payment_no'], 'pay_at' => date('Y-m-d H:i:s'),
+                    ]);
+                } else {
+                    Db::name('StoreProfitUsed')->where(['trs_no' => $vo['trs_no']])->update([
+                        'pay_desc' => isset($result['err_code_des']) ? $result['err_code_des'] : '自动打款失败', 'last_at' => date('Y-m-d H:i:s'),
+                    ]);
+                }
+            } catch (\Exception $e) {
+                $this->output->writeln("订单 {$vo['trs_no']} 执行提现失败，{$e->getMessage()}！");
+                Db::name('StoreProfitUsed')->where(['trs_no' => $vo['trs_no']])->update(['pay_desc' => $e->getMessage()]);
+            }
+        }
+    }
+
 }

application/store/controller/Config.php

@@ -18,14 +18,15 @@ use app\store\service\Extend;
 use library\Controller;
 
 /**
- * 微信商城配置
+ * 商城参数配置
  * Class Config
  * @package app\store\controller
  */
 class Config extends Controller
 {
+
     /**
-     * 微信商城配置
+     * 商城参数配置
      * @throws \think\Exception
      * @throws \think\exception\PDOException
      */

application/store/controller/ExpressCompany.php

@@ -22,13 +22,13 @@ use think\Db;
  * Class Express
  * @package app\store\controller
  */
-class Express extends Controller
+class ExpressCompany extends Controller
 {
     /**
      * 指定数据表
      * @var string
      */
-    protected $table = 'StoreExpress';
+    protected $table = 'StoreExpressCompany';
 
     /**
      * 快递公司管理
@@ -41,7 +41,8 @@ class Express extends Controller
     public function index()
     {
         $this->title = '快递公司管理';
-        $this->_query($this->table)->equal('status')->like('express_title,express_code')->dateBetween('create_at')->order('status desc,sort asc,id desc')->page();
+        $query = $this->_query($this->table)->equal('status')->like('express_title,express_code');
+        $query->dateBetween('create_at')->order('status desc,sort asc,id desc')->page();
     }
 
     /**

application/store/controller/ExpressProvince.php

@@ -0,0 +1,92 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | framework
+// +----------------------------------------------------------------------
+// | 版权所有 2014~2018 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
+// +----------------------------------------------------------------------
+// | 官方网站: http://framework.thinkadmin.top
+// +----------------------------------------------------------------------
+// | 开源协议 ( https://mit-license.org )
+// +----------------------------------------------------------------------
+// | github开源项目：https://github.com/zoujingli/framework
+// +----------------------------------------------------------------------
+
+namespace app\store\controller;
+
+use library\Controller;
+
+/**
+ * 配送省份管理
+ * Class Area
+ * @package app\store\controller
+ */
+class ExpressProvince extends Controller
+{
+    /**
+     * 绑定数据表
+     * @var string
+     */
+    protected $table = 'StoreExpressProvince';
+
+    /**
+     * 配送省份管理
+     * @throws \think\Exception
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     * @throws \think\exception\PDOException
+     */
+    public function index()
+    {
+        $this->title = '配送省份管理';
+        $this->_query($this->table)->like('title')->equal('status')->dateBetween('create_at')->order('sort asc,id desc')->page();
+    }
+
+
+    /**
+     * 添加配送省份
+     */
+    public function add()
+    {
+        $this->applyCsrfToken();
+        $this->_form($this->table, 'form');
+    }
+
+    /**
+     * 编辑配送省份
+     */
+    public function edit()
+    {
+        $this->applyCsrfToken();
+        $this->_form($this->table, 'form');
+    }
+
+    /**
+     * 启用配送省份
+     */
+    public function resume()
+    {
+        $this->applyCsrfToken();
+        $this->_save($this->table, ['status' => '1']);
+    }
+
+    /**
+     * 禁用配送省份
+     */
+    public function forbid()
+    {
+        $this->applyCsrfToken();
+        $this->_save($this->table, ['status' => '0']);
+    }
+
+    /**
+     * 删除配送省份
+     */
+    public function del()
+    {
+        $this->applyCsrfToken();
+        $this->_delete($this->table);
+    }
+
+}

application/store/controller/ExpressTemplate.php

@@ -0,0 +1,81 @@
+<?php
+
+namespace app\store\controller;
+
+use library\Controller;
+use library\tools\Data;
+use think\Db;
+
+/**
+ * 邮费模板管理
+ * Class ExpressTemplate
+ * @package app\store\controller
+ */
+class ExpressTemplate extends Controller
+{
+    /**
+     * 指定数据表
+     * @var string
+     */
+    protected $table = 'StoreExpressTemplate';
+
+    /**
+     * 邮费模板管理
+     * @throws \think\Exception
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     * @throws \think\exception\PDOException
+     */
+    public function index()
+    {
+        $this->title = '邮费模板管理';
+    }
+
+    /**
+     * 显示邮费模板
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     */
+    protected function _index_get()
+    {
+        $this->provinces = Db::name('StoreExpressProvince')->where(['status' => '1'])->order('sort asc,id desc')->column('title');
+        $this->list = Db::name($this->table)->where(['is_default' => '0'])->select();
+        foreach ($this->list as &$item) $item['rule'] = explode(',', $item['rule']);
+        $this->default = Db::name($this->table)->where(['is_default' => '1'])->find();
+        $this->fetch();
+    }
+
+    /**
+     * 保存邮费模板
+     * @throws \think\Exception
+     * @throws \think\exception\PDOException
+     */
+    protected function _index_post()
+    {
+        list($list, $idxs, $post) = [[], [], $this->request->post()];
+        foreach (array_keys($post) as $key) if (stripos($key, 'order_reduction_state_') !== false) {
+            $idxs[] = str_replace('order_reduction_state_', '', $key);
+        }
+        foreach (array_unique($idxs) as $index) if (!empty($post["rule_{$index}"])) $list[] = [
+            'rule'                  => join(',', $post["rule_{$index}"]),
+            // 订单满减配置
+            'order_reduction_state' => $post["order_reduction_state_{$index}"],
+            'order_reduction_price' => $post["order_reduction_price_{$index}"],
+            // 首件邮费配置
+            'first_number'          => $post["first_number_{$index}"],
+            'first_price'           => $post["first_price_{$index}"],
+            // 首件邮费配置
+            'next_number'           => $post["next_number_{$index}"],
+            'next_price'            => $post["next_price_{$index}"],
+            // 默认邮费规则
+            'is_default'            => $post["is_default_{$index}"],
+        ];
+        if (empty($list)) $this->error('请配置有效的邮费规则');
+        Db::name($this->table)->where('1=1')->delete();
+        Db::name($this->table)->insertAll($list);
+        $this->success('邮费规则配置成功！');
+    }
+
+}

application/store/controller/Goods.php

@@ -42,7 +42,7 @@ class Goods extends Controller
      */
     public function index()
     {
-        $this->title = '商城商品管理';
+        $this->title = '商品信息管理';
         $this->_query($this->table)->equal('status,cate_id')->like('title')->where(['is_deleted' => '0'])->order('sort asc,id desc')->page();
     }
 
@@ -134,7 +134,7 @@ class Goods extends Controller
         // 生成商品ID
         if (empty($data['id'])) $data['id'] = Data::uniqidNumberCode(10);
         if ($this->request->isGet()) {
-            $fields = 'goods_spec,goods_id,status,price_market market,price_selling selling,number_virtual `virtual`';
+            $fields = 'goods_spec,goods_id,status,price_market market,price_selling selling,number_virtual `virtual`,number_express express';
             $defaultValues = Db::name('StoreGoodsList')->where(['goods_id' => $data['id']])->column($fields);
             $this->defaultValues = json_encode($defaultValues, JSON_UNESCAPED_UNICODE);
             $this->cates = Db::name('StoreGoodsCate')->where(['is_deleted' => '0', 'status' => '1'])->order('sort asc,id desc')->select();
@@ -146,6 +146,7 @@ class Goods extends Controller
                 'price_market'   => $vo[0]['market'],
                 'price_selling'  => $vo[0]['selling'],
                 'number_virtual' => $vo[0]['virtual'],
+                'number_express' => $vo[0]['express'],
                 'status'         => $vo[0]['status'] ? 1 : 0,
             ], 'goods_spec', ['goods_id' => $data['id']]);
         }

application/store/controller/GoodsCate.php

@@ -40,7 +40,8 @@ class GoodsCate extends Controller
     public function index()
     {
         $this->title = '商品分类管理';
-        $this->_query($this->table)->like('title')->equal('status')->order('sort asc,id desc')->page();
+        $where = ['is_deleted' => '0'];
+        $this->_query($this->table)->like('title')->equal('status')->where($where)->order('sort asc,id desc')->page();
     }
 
     /**

application/store/controller/Member.php

@@ -17,7 +17,7 @@ namespace app\store\controller;
 use library\Controller;
 
 /**
- * 商城会员管理
+ * 会员信息管理
  * Class Member
  * @package app\store\controller
  */
@@ -30,7 +30,7 @@ class Member extends Controller
     protected $table = 'StoreMember';
 
     /**
-     * 商城会员管理
+     * 会员信息管理
      * @throws \think\Exception
      * @throws \think\db\exception\DataNotFoundException
      * @throws \think\db\exception\ModelNotFoundException
@@ -39,7 +39,7 @@ class Member extends Controller
      */
     public function index()
     {
-        $this->title = '商城会员管理';
+        $this->title = '会员信息管理';
         $this->_query($this->table)->like('nickname,phone')->equal('vip_level')->dateBetween('create_at')->order('id desc')->page();
     }
 

application/store/controller/Message.php

@@ -17,7 +17,7 @@ namespace app\store\controller;
 use library\Controller;
 
 /**
- * 短信消息管理
+ * 短信发送管理
  * Class Message
  * @package app\store\controller
  */
@@ -30,7 +30,7 @@ class Message extends Controller
     protected $table = 'StoreMemberSmsHistory';
 
     /**
-     * 短信消息管理
+     * 短信发送管理
      * @throws \think\Exception
      * @throws \think\db\exception\DataNotFoundException
      * @throws \think\db\exception\ModelNotFoundException
@@ -39,7 +39,7 @@ class Message extends Controller
      */
     public function index()
     {
-        $this->title = '手机短信记录';
+        $this->title = '短信发送管理';
         $this->_query($this->table)->like('phone,content,result')->dateBetween('create_at')->order('id desc')->page();
     }
 

application/store/controller/Order.php

@@ -18,7 +18,7 @@ use library\Controller;
 use think\Db;
 
 /**
- * 商城订单管理
+ * 订单记录管理
  * Class Order
  * @package app\store\controller
  */
@@ -31,7 +31,7 @@ class Order extends Controller
     protected $table = 'StoreOrder';
 
     /**
-     * 商城订单管理
+     * 订单记录管理
      * @throws \think\Exception
      * @throws \think\db\exception\DataNotFoundException
      * @throws \think\db\exception\ModelNotFoundException
@@ -40,7 +40,7 @@ class Order extends Controller
      */
     public function index()
     {
-        $this->title = '商城订单管理';
+        $this->title = '订单记录管理';
         $this->_query($this->table)->order('id desc')->page();
     }
 

application/store/controller/api/member/Order.php

@@ -70,11 +70,12 @@ class Order extends Member
                 'from_mid'          => $order['from_mid'],
                 'order_no'          => $order['order_no'],
                 // 商品信息字段管理
-                'number'            => $number,
                 'goods_id'          => $goods_id,
                 'goods_spec'        => $goods_spec,
                 'goods_logo'        => $goods['logo'],
                 'goods_title'       => $goods['title'],
+                'number_goods'      => $number,
+                'number_express'    => $spec['number_express'],
                 // 费用字段处理
                 'price_market'      => $spec['price_market'],
                 'price_selling'     => $spec['price_selling'],
@@ -222,7 +223,7 @@ class Order extends Member
             list($vo['goods_count'], $vo['list']) = [0, []];
             foreach ($glist as $goods) if ($vo['order_no'] === $goods['order_no']) {
                 $vo['list'][] = $goods;
-                $vo['goods_count'] += $goods['number'];
+                $vo['goods_count'] += $goods['number_goods'];
             }
         }
         $this->success('获取订单列表成功！', $result);

application/store/service/Express.php

@@ -0,0 +1,71 @@
+<?php
+
+namespace app\store\service;
+
+use think\Db;
+
+/**
+ * 商城邮费服务
+ * Class Express
+ * @package app\store\service
+ */
+class Express
+{
+
+    /**
+     * 订单邮费计算
+     * @param string $province 配送省份
+     * @param string $number 计费数量
+     * @param string $amount 订单金额
+     * @return array
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     */
+    public static function price($province, $number, $amount)
+    {
+        // 读取对应的模板规则
+        $map = [['is_default', 'eq', '0'], ['rule', 'like', "%{$province}%"]];
+        $rule = Db::name('StoreExpressTemplate')->where($map)->find();
+        if (!empty($rule)) return self::buildData($rule, '普通模板', $number, $amount);
+        $rule = Db::name('StoreExpressTemplate')->where(['is_default' => '1'])->find();
+        return self::buildData($rule, '默认模板', $number, $amount);
+    }
+
+    /**
+     * 生成邮费数据
+     * @param array $rule 模板规则
+     * @param string $type 模板类型
+     * @param integer $number 计费件数
+     * @param double $amount 订单金额
+     * @return array
+     */
+    protected static function buildData($rule, $type, $number, $amount)
+    {
+        // 异常规则
+        if (empty($rule)) return [
+            'express_price' => 0.00, 'express_type' => '未知模板', 'express_desc' => '未匹配到邮费模板',
+        ];
+        // 满减免邮
+        if ($rule['order_reduction_state'] && $amount >= $rule['order_reduction_price']) {
+            return [
+                'express_price' => 0.00, 'express_type' => $type,
+                'express_desc'  => "订单总金额满{$rule['order_reduction_price']}元减免全部邮费",
+            ];
+        }
+        // 首重计费
+        if ($number <= $rule['first_number']) return [
+            'express_price' => $rule['first_price'], 'express_type' => $type,
+            'express_desc'  => "首件计费，{$rule['first_number']}件及{$rule['first_number']}以内计费{$rule['first_price']}元",
+        ];
+        // 续重计费
+        list($price1, $price2) = [$rule['first_price'], 0];
+        if ($rule['next_number'] > 0 && $rule['next_price'] > 0) {
+            $price2 = $rule['next_price'] * ceil(($number - $rule['first_number']) / $rule['next_number']);
+        }
+        return [
+            'express_price' => $price1 + $price2, 'express_type' => $type,
+            'express_desc'  => "续件计费，超出{$rule['first_number']}件，首件费用{$rule['first_price']}元 + 续件费用{$price2}元",
+        ];
+    }
+}

application/store/service/Goods.php

@@ -40,7 +40,7 @@ class Goods
         $stockList = Db::name('StoreGoodsStock')->field($fields)->where(['goods_id' => $goodsId])->group('goods_id,goods_spec')->select();
         // 商品销量统计
         $where = [['b.goods_id', 'eq', $goodsId], ['a.status', 'in', ['1', '2', '3', '4', '5']]];
-        $fields = 'b.goods_id,b.goods_spec,ifnull(sum(b.number),0) number_sales';
+        $fields = 'b.goods_id,b.goods_spec,ifnull(sum(b.number_goods),0) number_sales';
         $salesList = Db::table('store_order a')->field($fields)->leftJoin('store_order_list b', 'a.order_no=b.order_no')->where($where)->group('b.goods_id,b.goods_spec')->select();
         // 组装更新数据
         $dataList = [];
@@ -53,9 +53,11 @@ class Goods
         unset($salesList, $stockList);
         // 更新商品规格销量及库存
         foreach ($dataList as $vo) Db::name('StoreGoodsList')->where([
-            'goods_id' => $goodsId, 'goods_spec' => $vo['goods_spec'],
+            'goods_id'   => $goodsId,
+            'goods_spec' => $vo['goods_spec'],
         ])->update([
-            'number_stock' => $vo['number_stock'], 'number_sales' => $vo['number_sales'],
+            'number_stock' => $vo['number_stock'],
+            'number_sales' => $vo['number_sales'],
         ]);
         // 更新商品主体销量及库存
         Db::name('StoreGoods')->where(['id' => $goodsId])->update([

application/store/service/Order.php

@@ -33,7 +33,7 @@ class Order
      */
     public static function update($order_no)
     {
-
+        // @todo 更新订单状态
     }
 
     /**
@@ -48,9 +48,9 @@ class Order
      */
     public static function syncStock($order_no)
     {
-        foreach (array_unique(Db::name('StoreOrderList')->where(['order_no' => $order_no])->column('goods_id')) as $goods_id) {
+        $map = ['order_no' => $order_no];
-            if (!Goods::syncStock($goods_id)) return false;
+        $goodsIds = Db::name('StoreOrderList')->where($map)->column('goods_id');
-        }
+        foreach (array_unique($goodsIds) as $goodsId) if (!Goods::syncStock($goodsId)) return false;
         return true;
     }
 
@@ -61,11 +61,6 @@ class Order
      */
     public static function profit($order_no = '')
     {
-        $where = ['order_no' => $order_no];
+        // @todo 计算订单返佣
-        if (Db::name('StoreProfitRecord')->where($where)->count() > 0) {
-            return false;
-        }
-
-
     }
 }

application/store/view/express_company/index.html

@@ -1,17 +1,17 @@
 {extend name='admin@main'}
 
 {block name="button"}
-{if auth("store/express/add")}
+{if auth("store/express_company/add")}
 <button data-modal='{:url("add")}' data-title="添加快递" class='layui-btn layui-btn-sm layui-btn-primary'>添加快递</button>
 {/if}
-{if auth("store/express/del")}
+{if auth("store/express_company/del")}
 <button data-action='{:url("del")}' data-rule="id#{key}" class='layui-btn layui-btn-sm layui-btn-primary'>删除快递</button>
 {/if}
 {/block}
 
 {block name="content"}
 <table class="layui-table" lay-skin="line">
-    <caption class="margin-bottom-10 text-left">{include file='express/index_search'}</caption>
+    <caption class="margin-bottom-10 text-left">{include file='express_company/index_search'}</caption>
     <!--{notempty name='list'}-->
     <thead>
     <tr>
@@ -46,17 +46,17 @@
         <td class='text-center nowrap'>{$vo.create_at|format_datetime}</td>
         <td class='text-left nowrap'>
 
-            {if auth("store/express/edit")}
+            {if auth("store/express_company/edit")}
             <a data-dbclick data-title="编辑快递" class="layui-btn layui-btn-xs" data-modal='{:url("edit")}?id={$vo.id}'>编 辑</a>
             {/if}
 
-            {if $vo.status eq 1 and auth("store/express/forbid")}
+            {if $vo.status eq 1 and auth("store/express_company/forbid")}
             <a class="layui-btn layui-btn-xs layui-btn-warm" data-action="{:url('forbid')}" data-value="id#{$vo.id};status#0">禁 用</a>
-            {elseif auth("store/express/resume")}
+            {elseif auth("store/express_company/resume")}
             <a class="layui-btn layui-btn-xs layui-btn-warm" data-action="{:url('resume')}" data-value="id#{$vo.id};status#1">启 用</a>
             {/if}
 
-            {if auth("store/express/del")}
+            {if auth("store/express_company/del")}
             <a class="layui-btn layui-btn-xs layui-btn-danger" data-confirm="确定要删除数据吗?" data-action="{:url('del')}" data-value="id#{$vo.id}">删 除</a>
             {/if}
 

application/store/view/express_province/form.html

@@ -0,0 +1,22 @@
+<form class="layui-form layui-card" action="{:request()->url()}" data-auto="true" method="post" autocomplete="off">
+
+    <div class="layui-card-body">
+
+        <div class="layui-form-item">
+            <label class="layui-form-label">省份名称</label>
+            <div class="layui-input-block">
+                <input name="title" value='{$vo.title|default=""}' required placeholder="请输入省份名称" class="layui-input">
+            </div>
+        </div>
+
+    </div>
+
+    <div class="hr-line-dashed"></div>
+
+    <div class="layui-form-item text-center">
+        {notempty name='vo.id'}<input type='hidden' value='{$vo.id}' name='id'>{/notempty}
+        <button class="layui-btn" type='submit'>保存数据</button>
+        <button class="layui-btn layui-btn-danger" type='button' data-confirm="确定要取消编辑吗？" data-close>取消编辑</button>
+    </div>
+
+</form>

application/store/view/express_province/index.html

@@ -0,0 +1,72 @@
+{extend name='admin@main'}
+
+{block name="button"}
+
+<!--{if auth("store/express_province/add")}-->
+<button data-modal='{:url("add")}' data-title="添加省份" class='layui-btn layui-btn-sm layui-btn-primary'>添加省份</button>
+<!--{/if}-->
+
+<!--{if auth("store/express_province/del")}-->
+<button data-action='{:url("del")}' data-csrf="{:systoken('store/express_province/del')}" data-rule="id#{key}" class='layui-btn layui-btn-sm layui-btn-primary'>删除省份</button>
+<!--{/if}-->
+
+{/block}
+
+{block name="content"}
+<table class="layui-table" lay-skin="line">
+    <caption class="margin-bottom-10 text-left">{include file='express_province/index_search'}</caption>
+    {notempty name='list'}
+    <thead>
+    <tr>
+        <th class='list-table-check-td think-checkbox'>
+            <input data-auto-none data-check-target='.list-check-box' type='checkbox'>
+        </th>
+        <th class='list-table-sort-td'>
+            <button type="button" data-reload class="layui-btn layui-btn-xs">刷 新</button>
+        </th>
+        <th>省份名称</th>
+        <th>创建时间</th>
+        <th class="text-center">使用状态</th>
+        <th></th>
+    </tr>
+    </thead>
+    <tbody>
+    {foreach $list as $key=>$vo}
+    <tr data-dbclick>
+        <td class='list-table-check-td think-checkbox'>
+            <input class="list-check-box" value='{$vo.id}' type='checkbox'>
+        </td>
+        <td class='list-table-sort-td padding-left-0 padding-right-0'>
+            <input data-action-blur="{:request()->url()}" data-value="id#{$vo.id};action#sort;sort#{value}" data-loading="false" value="{$vo.sort}" class="list-sort-input">
+        </td>
+        <td class="nowrap">{$vo.title|default='--'}</td>
+        <td class="nowrap">{$vo.create_at|format_datetime}</td>
+        <td class='text-center nowrap'>
+            {eq name='vo.status' value='0'}<span class="layui-badge">已禁用</span>{else}<span class="layui-badge layui-bg-green">使用中</span>{/eq}
+        </td>
+        <td class='text-center nowrap notselect'>
+
+            {if auth("store/express_province/edit")}
+            <a data-dbclick class="layui-btn layui-btn-xs" data-title="编辑区域" data-modal='{:url("store/express_province/edit")}?id={$vo.id}'>编 辑</a>
+            {/if}
+
+            {if $vo.status eq 1 and auth("store/express_province/forbid")}
+            <a class="layui-btn layui-btn-warm layui-btn-xs" data-action="{:url('forbid')}" data-value="id#{$vo.id};status#0" data-csrf="{:systoken('store/express_province/forbid')}">禁 用</a>
+            {elseif auth("store/express_province/resume")}
+            <a class="layui-btn layui-btn-warm layui-btn-xs" data-action="{:url('resume')}" data-value="id#{$vo.id};status#1" data-csrf="{:systoken('store/express_province/resume')}">启 用</a>
+            {/if}
+
+            {if auth("store/express_province/del")}
+            <a class="layui-btn layui-btn-danger layui-btn-xs" data-confirm="确定要删除数据吗?" data-action="{:url('del')}" data-value="id#{$vo.id}" data-csrf="{:systoken('store/express_province/del')}">删 除</a>
+            {/if}
+        </td>
+    </tr>
+
+    {/foreach}
+    </tbody>
+    {/notempty}
+</table>
+
+{empty name='list'}<span class="notdata">没有记录哦</span>{else}{$pagehtml|raw|default=''}{/empty}
+
+{/block}

application/store/view/express_province/index_search.html

@@ -0,0 +1,35 @@
+<fieldset>
+    <legend>条件搜索</legend>
+    <form class="layui-form layui-form-pane form-search" action="{:request()->url()}" onsubmit="return false" method="get" autocomplete="off">
+        <div class="layui-form-item layui-inline">
+            <label class="layui-form-label">省份名称</label>
+            <div class="layui-input-inline">
+                <input name="title" value="{$Think.get.title|default=''}" placeholder="请输入省份名称" class="layui-input">
+            </div>
+        </div>
+        <div class="layui-form-item layui-inline">
+            <label class="layui-form-label">使用状态</label>
+            <div class="layui-input-inline">
+                <select class="layui-select" name="status">
+                    {foreach [''=>'- 全部状态 -','1'=>'使用中的模板','0'=>'已禁用的模板'] as $k=>$v}
+                    <!--{eq name='Think.get.status' value='$k.""'}-->
+                    <option selected value="{$k}">{$v}</option>
+                    <!--{else}-->
+                    <option value="{$k}">{$v}</option>
+                    <!--{/eq}-->
+                    {/foreach}
+                </select>
+            </div>
+        </div>
+        <div class="layui-form-item layui-inline">
+            <label class="layui-form-label">创建时间</label>
+            <div class="layui-input-inline">
+                <input data-date-range name="create_at" value="{$Think.get.create_at|default=''}" placeholder="请选择创建时间" class="layui-input">
+            </div>
+        </div>
+        <div class="layui-form-item layui-inline">
+            <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
+        </div>
+    </form>
+    <script>form.render()</script>
+</fieldset>

application/store/view/express_template/index.html

@@ -0,0 +1,76 @@
+{extend name="admin@main"}
+
+{block name="content"}
+<form onsubmit="return false;" data-auto="true" action="{:request()->url()}" method="post" class='layui-form layui-card' autocomplete="off">
+
+    <div class="layui-card-body" style="padding-left:40px">
+
+        <div data-item-container>
+            {foreach $list as $index=>$item}
+            {assign name='is_default' value='0'}
+            {assign name='index' value='$index+1'}
+            {assign name='group_title' value='邮费规则分组'}
+            {include file='express_template/index_item'}
+            {/foreach}
+        </div>
+
+        <div class="margin-bottom-20"><a onclick="addRuleItem()" class="layui-btn layui-btn-warm">添加邮费规则分组</a></div>
+
+        {assign name='index' value='0'}
+        {assign name='is_default' value='1'}
+        {assign name='group_title' value='默认邮费规则'}
+        {assign name="item" value="$default"}
+        {include file='express_template/index_item'}
+
+        <div class="hr-line-dashed"></div>
+
+        <div class="layui-form-item text-center">
+            <button class="layui-btn" type='submit'>保存数据</button>
+        </div>
+
+    </div>
+
+</form>
+
+<script>
+    form.render();
+    checkRuleItem();
+
+    function delRuleItem(that) {
+        $.msg.confirm('确定要移除这个邮费规则吗？', function (index) {
+            $(that).parent('fieldset').remove(), $.msg.close(index);
+            checkRuleItem();
+        })
+    }
+
+    function addRuleItem() {
+        this.itemIndex = $('[data-item-container] fieldset:last').attr('data-max-index') || 0;
+        this.html = $('#template').html().replace(/\[index\]/gi, parseInt(this.itemIndex) + 1);
+        $('[data-item-container]').append(this.html);
+    }
+
+    function checkRuleItem() {
+        if ($('[data-item-container] fieldset').length < 1) {
+            //  addRuleItem();
+        }
+    }
+
+    (function (opt) {
+        opt.selecter = 'input[type=checkbox][data-province-input]';
+        $('body').off('change', opt.selecter).on('change', opt.selecter, function () {
+            if (this.checked) $(opt.selecter + '[value="' + this.value + '"]').not(this).map(function () {
+                if (this.checked) $(this).trigger('click');
+            });
+        });
+    })({});
+
+</script>
+
+{assign name='is_default' value='0'}
+{assign name='index' value='[index]'}
+{assign name='group_title' value='邮费规则分组'}
+{php}$item=[];{/php}
+<div class="layui-hide" id="template">
+    {include file='express_template/index_item'}
+</div>
+{/block}

application/store/view/express_template/index_item.html

@@ -0,0 +1,81 @@
+<fieldset class="margin-bottom-20 relative" data-max-index="{$index}">
+
+    <legend class="color-green font-s14">
+        {$group_title|default='邮费规则分组'} <span class="color-desc font-s12"> RuleGroup</span>
+    </legend>
+
+    {empty name='is_default'}
+    <a onclick="delRuleItem(this)" class="layui-btn layui-btn-xs layui-btn-danger text-center layui-icon layui-icon-close" data-tips-text="移除规则" style="position:absolute;top:15px;right:5px;padding:0 5px"></a>
+    {/empty}
+
+    <div class="layui-form-item block relative">
+        <span class="color-desc font-s14">订单总金额满足条件时将减免该订单的所有邮费（请谨慎配置）</span>
+        <table>
+            <tr>
+                <td>
+                    <div class="layui-input text-center" style="width:150px">
+                        {php}isset($item['order_reduction_state']) or $item['order_reduction_state']=0;{/php}
+                        {foreach ['0' => '关闭','1' => '开启'] as $k => $v}
+                        <!--{eq name='item.order_reduction_state' value='$k'}-->
+                        <label class="think-radio"><input type="radio" value="{$k}" name="order_reduction_state_{$index}" title="{$v}" checked lay-ignore> {$v}</label>
+                        <!--{else}-->
+                        <label class="think-radio"><input type="radio" value="{$k}" name="order_reduction_state_{$index}" title="{$v}" lay-ignore> {$v}</label>
+                        <!--{/eq}-->
+                        {/foreach}
+                    </div>
+                </td>
+                <td width='20px'></td>
+                <td><label class="text-center nowrap">订单满 <input style="width:130px" class="layui-input inline-block text-center padding-left-0" name="order_reduction_price_{$index}" data-blur-number="2" value="{$item.order_reduction_price|default='0.00'}"> 元免邮费</label></td>
+            </tr>
+        </table>
+        <!--<span class="color-desc block">订单总金额达到这个金额时，将减免该订单的所有邮费，请谨慎配置。</span>-->
+    </div>
+
+    <div class="layui-form-item">
+        {notempty name='is_default'}
+        <input type="hidden" name="is_default_{$index}" value="1">
+        <input type="hidden" name="rule_{$index}[]" value="{$group_title|default='邮费规则分组'}">
+        {else}
+        <input type="hidden" name="is_default_{$index}" value="0">
+        <span class="color-desc font-s14">根据配送目的地的省份进行运费计算邮费（不在规则内的将使用默认邮费规则）</span>
+        <table class="layui-table" lay-skin="line">
+            <tr class="layui-bg-gray">
+                <th class="text-center">
+                    <label class="think-checkbox pull-left margin-top-0 notselect"><input type="checkbox" data-check-target="[data-template-province-{$index}]" lay-ignore> 全选</label>
+                    <span>可配送区域</span>
+                </th>
+            </tr>
+            <tr>
+                <td>
+                    {foreach $provinces as $p}
+                    <label class="think-checkbox layui-elip" style="width:115px">
+                        {if is_numeric($index) and isset($item.rule) and is_array($item.rule) and in_array($p,$item.rule)}
+                        <input data-province-input data-template-province-{$index} checked type="checkbox" name="rule_{$index}[]" value="{$p}" lay-ignore> {$p|default=''}
+                        {else}
+                        <input data-province-input data-template-province-{$index} type="checkbox" name="rule_{$index}[]" value="{$p}" lay-ignore> {$p|default=''}
+                        {/if}
+                    </label>
+                    {/foreach}
+                </td>
+            </tr>
+        </table>
+        {/notempty}
+
+        <table class="layui-table" lay-skin="line">
+            <tr class="layui-bg-gray">
+                <th class="text-center" width="80px">首件（个）</th>
+                <th class="text-center" width="80px">运费（元）</th>
+                <th class="text-center" width="80px">续件（个）</th>
+                <th class="text-center" width="80px">续费（元）</th>
+            </tr>
+            <tr>
+                <td class="text-center"><label><input name="first_number_{$index}" value="{$item.first_number|default='1'}" data-blur-number="0" class="layui-input text-center padding-left-0"></label></td>
+                <td class="text-center"><label><input name="first_price_{$index}" value="{$item.first_price|default='0.00'}" data-blur-number="2" class="layui-input text-center padding-left-0"></label></td>
+                <td class="text-center"><label><input name="next_number_{$index}" value="{$item.next_number|default='1'}" data-blur-number="0" class="layui-input text-center padding-left-0"></label></td>
+                <td class="text-center"><label><input name="next_price_{$index}" value="{$item.next_price|default='0.00'}" data-blur-number="2" class="layui-input text-center padding-left-0"></label></td>
+            </tr>
+        </table>
+    </div>
+
+
+</fieldset>

application/store/view/goods/form.html

@@ -83,15 +83,26 @@
                 <thead>
                 <tr>
                     <th ng-repeat="x in specsTreeNava track by $index" class="nowrap" ng-bind="x"></th>
+                    <th width="10%" class="text-center nowrap">快递数量 <a ng-click="batchSet('express',0)" data-tips-text="批量设置" class="layui-icon">&#xe63c;</a></th>
+                    <th width="10%" class="text-center nowrap">虚拟销量 <a ng-click="batchSet('virtual',0)" data-tips-text="批量设置" class="layui-icon">&#xe63c;</a></th>
                     <th width="10%" class="text-center nowrap">市场价格 <a ng-click="batchSet('market',2)" data-tips-text="批量设置" class="layui-icon">&#xe63c;</a></th>
                     <th width="10%" class="text-center nowrap">销售价格 <a ng-click="batchSet('selling',2)" data-tips-text="批量设置" class="layui-icon">&#xe63c;</a></th>
-                    <th width="10%" class="text-center nowrap">虚拟销量 <a ng-click="batchSet('virtual',0)" data-tips-text="批量设置" class="layui-icon">&#xe63c;</a></th>
                     <th width="10%" class="text-center nowrap">销售状态</th>
                 </tr>
                 </thead>
                 <tbody>
                 <tr ng-repeat="rows in specsTreeData track by $index">
                     <td class="layui-bg-gray" ng-if="td.show" rowspan="{{td.span}}" ng-repeat="td in rows" ng-bind="td.name"></td>
+                    <td class="padding-0">
+                        <label class="padding-0 margin-0">
+                            <input ng-blur="rows[0].express=setValue(rows[0].key,'express',$event.target.value,'(parseFloat(_)||0).toFixed(0)')" class="layui-input border-0 padding-left-0 text-center" ng-model="rows[0].express">
+                        </label>
+                    </td>
+                    <td class="padding-0">
+                        <label class="padding-0 margin-0">
+                            <input ng-blur="rows[0].virtual=setValue(rows[0].key,'virtual',$event.target.value,'(parseInt(_)||0)')" class="layui-input border-0 padding-left-0 text-center" ng-model="rows[0].virtual">
+                        </label>
+                    </td>
                     <td class="padding-0">
                         <label class="padding-0 margin-0">
                             <input ng-blur="rows[0].market=setValue(rows[0].key,'market',$event.target.value,'(parseFloat(_)||0).toFixed(2)')" class="layui-input border-0 padding-left-0 text-center" ng-model="rows[0].market">
@@ -102,11 +113,6 @@
                             <input ng-blur="rows[0].selling=setValue(rows[0].key,'selling',$event.target.value,'(parseFloat(_)||0).toFixed(2)')" class="layui-input border-0 padding-left-0 text-center" ng-model="rows[0].selling">
                         </label>
                     </td>
-                    <td class="padding-0">
-                        <label class="padding-0 margin-0">
-                            <input ng-blur="rows[0].virtual=setValue(rows[0].key,'virtual',$event.target.value,'(parseInt(_)||0)')" class="layui-input border-0 padding-left-0 text-center" ng-model="rows[0].virtual">
-                        </label>
-                    </td>
                     <td class="text-center layui-bg-gray">
                         <label class="think-checkbox margin-0 full-width full-height block"><input lay-ignore type="checkbox" ng-model="rows[0].status"></label>
                     </td>
@@ -290,6 +296,9 @@
                     for (let td in list[row]) {
                         if (_key.length === 0) {
                             list[row][0].key = _key = key.join(';;');
+                            list[row][0].express = getValue(_key, function (data) {
+                                return data.express || '1';
+                            });
                             list[row][0].virtual = getValue(_key, function (data) {
                                 return data.virtual || '0';
                             });
@@ -299,6 +308,7 @@
                             list[row][0].selling = getValue(_key, function (data) {
                                 return data.selling || '0.00';
                             });
+
                             list[row][0].status = getValue(_key, function (data) {
                                 return !!(typeof data.status !== 'undefined' ? data.status : true);
                             });

application/store/view/goods_cate/form.html

@@ -28,9 +28,7 @@
 
     <div class="hr-line-dashed"></div>
     <div class="layui-form-item text-center">
-        <!--{notempty name='vo.id'}-->
+        {notempty name='vo.id'}<input type='hidden' value='{$vo.id}' name='id'>{/notempty}
-        <input type='hidden' value='{$vo.id}' name='id'>
-        <!--{/notempty}-->
         <button class="layui-btn" type='submit'>保存数据</button>
         <button class="layui-btn layui-btn-danger" type='button' data-confirm="确定要取消编辑吗？" data-close>取消编辑</button>
     </div>

application/store/view/order/index.html

@@ -67,7 +67,7 @@
         <td class="nowrap">
             {foreach $vo.list as $g}
             <div class="nowrap">
-                <p class="text-right">{$g.goods_title|default=''} x{$g.number|default=0}</p>
+                <p class="text-right">{$g.goods_title|default=''} x{$g.number_goods|default=0}</p>
                 <p class="text-right color-desc">
                     售价 {$g.price_real} 元,分成比例 {$g.price_rate+0}%，分成金额 {$g.price_rate_amount+0} 元
                 </p>