diff --git a/application/store/command/AutoRun.php b/application/store/command/AutoRun.php index aec36418e..16c97c437 100644 --- a/application/store/command/AutoRun.php +++ b/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 \think\console\Output $output + * 业务指令执行 + * @param Input $input + * @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()]); + } + } + } + } \ No newline at end of file diff --git a/application/store/controller/Config.php b/application/store/controller/Config.php index 1beb18b35..9bc44a18e 100644 --- a/application/store/controller/Config.php +++ b/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 */ diff --git a/application/store/controller/Express.php b/application/store/controller/ExpressCompany.php similarity index 90% rename from application/store/controller/Express.php rename to application/store/controller/ExpressCompany.php index fbc4cb3c8..f0f8649c5 100644 --- a/application/store/controller/Express.php +++ b/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(); } /** diff --git a/application/store/controller/ExpressProvince.php b/application/store/controller/ExpressProvince.php new file mode 100644 index 000000000..c3ef0b6b7 --- /dev/null +++ b/application/store/controller/ExpressProvince.php @@ -0,0 +1,92 @@ +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); + } + +} \ No newline at end of file diff --git a/application/store/controller/ExpressTemplate.php b/application/store/controller/ExpressTemplate.php new file mode 100644 index 000000000..2dc0a0038 --- /dev/null +++ b/application/store/controller/ExpressTemplate.php @@ -0,0 +1,81 @@ +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('邮费规则配置成功！'); + } + +} \ No newline at end of file diff --git a/application/store/controller/Goods.php b/application/store/controller/Goods.php index 41a3cef9f..d243dfb65 100644 --- a/application/store/controller/Goods.php +++ b/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']]); } diff --git a/application/store/controller/GoodsCate.php b/application/store/controller/GoodsCate.php index 3095e198c..b3149858d 100644 --- a/application/store/controller/GoodsCate.php +++ b/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(); } /** diff --git a/application/store/controller/Member.php b/application/store/controller/Member.php index 075538719..f92f2f9e8 100644 --- a/application/store/controller/Member.php +++ b/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(); } diff --git a/application/store/controller/Message.php b/application/store/controller/Message.php index d6daaf3f4..16cbaf25b 100644 --- a/application/store/controller/Message.php +++ b/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(); } diff --git a/application/store/controller/Order.php b/application/store/controller/Order.php index 19f466c6a..bb9bf70e3 100644 --- a/application/store/controller/Order.php +++ b/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(); } diff --git a/application/store/controller/api/member/Order.php b/application/store/controller/api/member/Order.php index d13adddbd..b0aba206e 100644 --- a/application/store/controller/api/member/Order.php +++ b/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); diff --git a/application/store/service/Express.php b/application/store/service/Express.php new file mode 100644 index 000000000..67461467a --- /dev/null +++ b/application/store/service/Express.php @@ -0,0 +1,71 @@ +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}元", + ]; + } +} \ No newline at end of file diff --git a/application/store/service/Goods.php b/application/store/service/Goods.php index c6b2acc46..06d13b8ac 100644 --- a/application/store/service/Goods.php +++ b/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([ diff --git a/application/store/service/Order.php b/application/store/service/Order.php index b5d52ebcf..831986c97 100644 --- a/application/store/service/Order.php +++ b/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) { - if (!Goods::syncStock($goods_id)) return false; - } + $map = ['order_no' => $order_no]; + $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]; - if (Db::name('StoreProfitRecord')->where($where)->count() > 0) { - return false; - } - - + // @todo 计算订单返佣 } } \ No newline at end of file diff --git a/application/store/view/express/form.html b/application/store/view/express_company/form.html similarity index 100% rename from application/store/view/express/form.html rename to application/store/view/express_company/form.html diff --git a/application/store/view/express/index.html b/application/store/view/express_company/index.html similarity index 88% rename from application/store/view/express/index.html rename to application/store/view/express_company/index.html index e3083ac1f..8b0e015be 100644 --- a/application/store/view/express/index.html +++ b/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")} {/if} -{if auth("store/express/del")} +{if auth("store/express_company/del")} {/if} {/block} {block name="content"} - + @@ -46,17 +46,17 @@ + + - + + - @@ -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); }); diff --git a/application/store/view/goods_cate/form.html b/application/store/view/goods_cate/form.html index 53dc3aa9d..67982a866 100644 --- a/application/store/view/goods_cate/form.html +++ b/application/store/view/goods_cate/form.html @@ -28,9 +28,7 @@
- - - + {notempty name='vo.id'}{/notempty}
diff --git a/application/store/view/order/index.html b/application/store/view/order/index.html index 9a2940bd2..75fd04af4 100644 --- a/application/store/view/order/index.html +++ b/application/store/view/order/index.html @@ -67,7 +67,7 @@
{include file='express/index_search'}{include file='express_company/index_search'}
{$vo.create_at|format_datetime} - {if auth("store/express/edit")} + {if auth("store/express_company/edit")} 编 辑 {/if} - {if $vo.status eq 1 and auth("store/express/forbid")} + {if $vo.status eq 1 and auth("store/express_company/forbid")} 禁 用 - {elseif auth("store/express/resume")} + {elseif auth("store/express_company/resume")} 启 用 {/if} - {if auth("store/express/del")} + {if auth("store/express_company/del")} 删 除 {/if} diff --git a/application/store/view/express/index_search.html b/application/store/view/express_company/index_search.html similarity index 100% rename from application/store/view/express/index_search.html rename to application/store/view/express_company/index_search.html diff --git a/application/store/view/express_province/form.html b/application/store/view/express_province/form.html new file mode 100644 index 000000000..81676b791 --- /dev/null +++ b/application/store/view/express_province/form.html @@ -0,0 +1,22 @@ +
+ +
+ +
+ +
+ +
+
+ +
+ +
+ +
+ {notempty name='vo.id'}{/notempty} + + +
+ +
diff --git a/application/store/view/express_province/index.html b/application/store/view/express_province/index.html new file mode 100644 index 000000000..e411a62a2 --- /dev/null +++ b/application/store/view/express_province/index.html @@ -0,0 +1,72 @@ +{extend name='admin@main'} + +{block name="button"} + + + + + + + + + +{/block} + +{block name="content"} + + + {notempty name='list'} + + + + + + + + + + + + {foreach $list as $key=>$vo} + + + + + + + + + + {/foreach} + + {/notempty} +
{include file='express_province/index_search'}
+ + + + 省份名称创建时间使用状态
+ + + + {$vo.title|default='--'}{$vo.create_at|format_datetime} + {eq name='vo.status' value='0'}已禁用{else}使用中{/eq} + + + {if auth("store/express_province/edit")} + 编 辑 + {/if} + + {if $vo.status eq 1 and auth("store/express_province/forbid")} + 禁 用 + {elseif auth("store/express_province/resume")} + 启 用 + {/if} + + {if auth("store/express_province/del")} + 删 除 + {/if} +
+ +{empty name='list'}没有记录哦{else}{$pagehtml|raw|default=''}{/empty} + +{/block} \ No newline at end of file diff --git a/application/store/view/express_province/index_search.html b/application/store/view/express_province/index_search.html new file mode 100644 index 000000000..4354dc46e --- /dev/null +++ b/application/store/view/express_province/index_search.html @@ -0,0 +1,35 @@ +
+ 条件搜索 +
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ +
\ No newline at end of file diff --git a/application/store/view/express_template/index.html b/application/store/view/express_template/index.html new file mode 100644 index 000000000..8dab31626 --- /dev/null +++ b/application/store/view/express_template/index.html @@ -0,0 +1,76 @@ +{extend name="admin@main"} + +{block name="content"} +
+ +
+ +
+ {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} +
+ +
添加邮费规则分组
+ + {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'} + +
+ +
+ +
+ +
+ +
+ + + +{assign name='is_default' value='0'} +{assign name='index' value='[index]'} +{assign name='group_title' value='邮费规则分组'} +{php}$item=[];{/php} +
+ {include file='express_template/index_item'} +
+{/block} \ No newline at end of file diff --git a/application/store/view/express_template/index_item.html b/application/store/view/express_template/index_item.html new file mode 100644 index 000000000..d4ef6f9ae --- /dev/null +++ b/application/store/view/express_template/index_item.html @@ -0,0 +1,81 @@ +
+ + + {$group_title|default='邮费规则分组'} RuleGroup + + + {empty name='is_default'} + + {/empty} + +
+ 订单总金额满足条件时将减免该订单的所有邮费（请谨慎配置） + + + + + + +
+
+ {php}isset($item['order_reduction_state']) or $item['order_reduction_state']=0;{/php} + {foreach ['0' => '关闭','1' => '开启'] as $k => $v} + + + + + + {/foreach} +
+
+ +
+ +
+ {notempty name='is_default'} + + + {else} + + 根据配送目的地的省份进行运费计算邮费（不在规则内的将使用默认邮费规则） + + + + + + + +
+ + 可配送区域 +
+ {foreach $provinces as $p} + + {/foreach} +
+ {/notempty} + + + + + + + + + + + + + + +
首件（个）运费（元）续件（个）续费（元）
+
+ + +
\ No newline at end of file diff --git a/application/store/view/goods/form.html b/application/store/view/goods/form.html index 7d7aa4030..cb94436da 100644 --- a/application/store/view/goods/form.html +++ b/application/store/view/goods/form.html @@ -83,15 +83,26 @@
快递数量 虚拟销量 市场价格 销售价格 虚拟销量 销售状态
+ + + + - - {foreach $vo.list as $g}
-

{$g.goods_title|default=''} x{$g.number|default=0}

+

{$g.goods_title|default=''} x{$g.number_goods|default=0}

售价 {$g.price_real} 元,分成比例 {$g.price_rate+0}%，分成金额 {$g.price_rate_amount+0} 元