From 7835bef8841157f03219814d7926347bc962d85b Mon Sep 17 00:00:00 2001 From: devil_gong Date: Wed, 29 May 2019 18:32:20 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/controller/Refundlog.php | 101 ++++++++++ .../admin/view/default/order/index.html | 6 +- .../view/default/orderaftersale/index.html | 2 +- .../admin/view/default/paylog/index.html | 4 +- .../admin/view/default/refundlog/index.html | 173 ++++++++++++++++++ application/admin/view/default/site/nav.html | 16 +- application/service/OrderAftersaleService.php | 9 +- application/service/RefundLogService.php | 12 +- cert/apiclient_cert.p12 | Bin 2876 -> 0 bytes cert/apiclient_cert.pem | 26 --- cert/apiclient_key.pem | 28 --- cert/证书使用说明.txt | 18 -- config/shopxo.sql | 97 +++++----- 13 files changed, 356 insertions(+), 136 deletions(-) create mode 100644 application/admin/controller/Refundlog.php create mode 100644 application/admin/view/default/refundlog/index.html delete mode 100755 cert/apiclient_cert.p12 delete mode 100755 cert/apiclient_cert.pem delete mode 100755 cert/apiclient_key.pem delete mode 100755 cert/证书使用说明.txt diff --git a/application/admin/controller/Refundlog.php b/application/admin/controller/Refundlog.php new file mode 100644 index 000000000..6e03d3146 --- /dev/null +++ b/application/admin/controller/Refundlog.php @@ -0,0 +1,101 @@ +IsLogin(); + + // 权限校验 + $this->IsPower(); + } + + /** + * [Index 支付日志列表] + * @author Devil + * @blog http://gong.gg/ + * @version 0.0.1 + * @datetime 2016-12-06T21:31:53+0800 + */ + public function Index() + { + // 参数 + $params = input(); + $params['user'] = $this->admin; + $params['user_type'] = 'admin'; + + // 分页 + $number = MyC('admin_page_number', 10, true); + + // 条件 + $where = RefundLogService::AdminRefundLogListWhere($params); + + // 获取总数 + $total = RefundLogService::AdminRefundLogTotal($where); + + // 分页 + $page_params = array( + 'number' => $number, + 'total' => $total, + 'where' => $params, + 'page' => isset($params['page']) ? intval($params['page']) : 1, + 'url' => MyUrl('admin/refundlog/index'), + ); + $page = new \base\Page($page_params); + $this->assign('page_html', $page->GetPageHtml()); + + // 获取列表 + $data_params = array( + 'm' => $page->GetPageStarNumber(), + 'n' => $number, + 'where' => $where, + ); + $data = RefundLogService::AdminRefundLogList($data_params); + $this->assign('data_list', $data['data']); + + // 性别 + $this->assign('common_gender_list', lang('common_gender_list')); + + // 业务类型 + $this->assign('common_business_type_list', lang('common_business_type_list')); + + // 支付日志类型 + $pay_type_list = RefundLogService::RefundLogTypeList($params); + $this->assign('common_pay_type_list', $pay_type_list['data']); + + // 参数 + $this->assign('params', $params); + return $this->fetch(); + } +} +?> \ No newline at end of file diff --git a/application/admin/view/default/order/index.html b/application/admin/view/default/order/index.html index 350d74f05..6feeca471 100755 --- a/application/admin/view/default/order/index.html +++ b/application/admin/view/default/order/index.html @@ -168,7 +168,8 @@ 增加:{{$v.increase_price}}
优惠:{{$v.preferential_price}}
总价:{{$v.total_price}}
- 支付:{{$v.pay_price}} + 支付:{{$v.pay_price}}
+ 退款:{{if $v['refund_price'] gt 0}}{{$v.refund_price}}{{else /}}{{$v.refund_price}}{{/if}} {{if empty($v['extension_data'])}} @@ -261,7 +262,8 @@ 增加:{{$v.increase_price}}
优惠:{{$v.preferential_price}}
总价:{{$v.total_price}}
- 支付:{{$v.pay_price}} + 支付:{{$v.pay_price}}
+ 退款:{{if $v['refund_price'] gt 0}}{{$v.refund_price}}{{else /}}{{$v.refund_price}}{{/if}} {{/if}} diff --git a/application/admin/view/default/orderaftersale/index.html b/application/admin/view/default/orderaftersale/index.html index 86ebc418e..0a2dfc0de 100644 --- a/application/admin/view/default/orderaftersale/index.html +++ b/application/admin/view/default/orderaftersale/index.html @@ -7,7 +7,7 @@