From 72f8e8c3b7062c26ed9aa45a94a6df74901b6e71 Mon Sep 17 00:00:00 2001 From: Anyon Date: Sat, 9 Jan 2021 14:50:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=94=AF=E4=BB=98=E9=80=9A?= =?UTF-8?q?=E9=81=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/data/controller/api/Notify.php | 10 +- app/data/controller/api/auth/Order.php | 16 ++- app/data/service/PaymentService.php | 128 ++++++++++-------- .../service/payment/AlipayPaymentService.php | 86 ++++++------ .../service/payment/JoinPaymentService.php | 24 ++-- .../service/payment/WechatPaymentService.php | 26 ++-- app/data/view/config/slider.html | 3 - app/data/view/news_item/index.html | 4 +- app/data/view/news_mark/index.html | 17 ++- app/data/view/payment/form.html | 13 +- app/data/view/payment/index_search.html | 4 - app/data/view/shop_goods_mark/index.html | 4 +- app/data/view/shop_order/index_search.html | 6 +- app/data/view/shop_order/truck.html | 31 ++--- .../view/shop_order_service/index_search.html | 22 +-- app/data/view/shop_truck_company/index.html | 6 +- .../view/shop_truck_company/index_search.html | 3 - .../view/shop_truck_template/form_region.html | 4 - .../shop_truck_template/index_search.html | 6 +- app/data/view/store_item/form.html | 3 - app/data/view/store_item/index.html | 4 +- app/data/view/store_item/index_search.html | 6 +- app/data/view/store_used/form.html | 3 - app/data/view/store_used/index.html | 4 +- app/data/view/store_used/index_search.html | 6 +- app/data/view/store_user/form.html | 3 - app/data/view/store_user/index.html | 4 +- app/data/view/store_user/index_search.html | 6 +- app/data/view/user/index.html | 4 +- app/data/view/user/index_search.html | 11 +- app/data/view/user_message/config.html | 1 + app/data/view/user_message/index_search.html | 4 +- public/static/admin.js | 16 +-- 33 files changed, 232 insertions(+), 256 deletions(-) diff --git a/app/data/controller/api/Notify.php b/app/data/controller/api/Notify.php index 5de17999e..6c7f32a6c 100644 --- a/app/data/controller/api/Notify.php +++ b/app/data/controller/api/Notify.php @@ -20,6 +20,7 @@ class Notify extends Controller * @param string $param 支付通道 * @return string * @throws \WeChat\Exceptions\InvalidResponseException + * @throws \think\Exception * @throws \think\db\exception\DataNotFoundException * @throws \think\db\exception\DbException * @throws \think\db\exception\ModelNotFoundException @@ -27,7 +28,7 @@ class Notify extends Controller public function wxpay(string $scene = 'order', string $param = ''): string { if (strtolower($scene) === 'order') { - return WechatPaymentService::instance()->notify($param); + return WechatPaymentService::instance($param)->notify(); } else { return 'success'; } @@ -39,6 +40,7 @@ class Notify extends Controller * @param string $param 支付通道 * @return string * @throws \WeChat\Exceptions\InvalidResponseException + * @throws \think\Exception * @throws \think\db\exception\DataNotFoundException * @throws \think\db\exception\DbException * @throws \think\db\exception\ModelNotFoundException @@ -46,7 +48,7 @@ class Notify extends Controller public function alipay(string $scene = 'order', string $param = ''): string { if (strtolower($scene) === 'order') { - return AlipayPaymentService::instance()->notify($param); + return AlipayPaymentService::instance($param)->notify(); } else { return 'success'; } @@ -57,6 +59,8 @@ class Notify extends Controller * @param string $scene 支付场景 * @param string $param 支付通道 * @return string + * @throws \WeChat\Exceptions\InvalidResponseException + * @throws \think\Exception * @throws \think\db\exception\DataNotFoundException * @throws \think\db\exception\DbException * @throws \think\db\exception\ModelNotFoundException @@ -64,7 +68,7 @@ class Notify extends Controller public function joinpay(string $scene = 'order', string $param = ''): string { if (strtolower($scene) === 'order') { - return JoinPaymentService::instance()->notify($param); + return JoinPaymentService::instance($param)->notify(); } else { return 'success'; } diff --git a/app/data/controller/api/auth/Order.php b/app/data/controller/api/auth/Order.php index fb5536919..f10bab8ea 100644 --- a/app/data/controller/api/auth/Order.php +++ b/app/data/controller/api/auth/Order.php @@ -105,11 +105,15 @@ class Order extends Auth 'total_selling' => $goodsItem['price_selling'] * $count, ]; } - // 统计订单金额 - $order['amount_reduct'] = OrderService::instance()->getReduct(); - $order['amount_goods'] = array_sum(array_column($items, 'total_selling')); - $order['amount_total'] = $order['amount_goods'] - $order['amount_reduct']; try { + // 统计订单商品 + $order['amount_reduct'] = OrderService::instance()->getReduct(); + // 统计订单金额 + $order['number_goods'] = array_sum(array_column($items, 'stock_sales')); + $order['amount_goods'] = array_sum(array_column($items, 'total_selling')); + $order['amount_total'] = $order['amount_goods'] - $order['amount_reduct']; + // 支付金额不能为零 + if ($order['amount_total'] <= 0) $order['amount_total'] = 0.01; // 订单数据写入 $this->app->db->name('ShopOrder')->insert($order); $this->app->db->name('ShopOrderItem')->insertAll($items); @@ -169,6 +173,8 @@ class Order extends Auth $map = ['uid' => $this->uuid, 'order_no' => $data['order_no']]; $update = ['status' => 2, 'amount_express' => $express['template_amount']]; $update['amount_total'] = $order['amount_goods'] + $amount - $order['amount_reduct'] - $order['amount_discount']; + // 支付金额不能为零 + if ($update['amount_total'] <= 0) $update['amount_total'] = 0.01; if ($this->app->db->name('ShopOrder')->where($map)->update($update) !== false) { $this->success('订单确认成功！', ['order_no' => $order['order_no']]); } else { @@ -200,7 +206,7 @@ class Order extends Auth $openid = $this->user[UserService::TYPES[$this->type]['auth']] ?? ''; if (empty($openid)) $this->error("无法创建支付，未获取到OPENID"); } - $params = PaymentService::build($data['payment_code'])->create($openid, $order['order_no'], $order['amount_total'], '商城订单支付', '', $data['payment_back']); + $params = PaymentService::instance($data['payment_code'])->create($openid, $order['order_no'], $order['amount_total'], '商城订单支付', '', $data['payment_back']); $this->success('获取支付参数成功！', $params); } catch (HttpResponseException $exception) { throw $exception; diff --git a/app/data/service/PaymentService.php b/app/data/service/PaymentService.php index 7d6a0aee8..c8fa36b88 100644 --- a/app/data/service/PaymentService.php +++ b/app/data/service/PaymentService.php @@ -6,13 +6,16 @@ use app\data\service\payment\AlipayPaymentService; use app\data\service\payment\JoinPaymentService; use app\data\service\payment\WechatPaymentService; use think\admin\Service; +use think\App; +use think\Container; +use think\Exception; /** * 支付基础服务 * Class PaymentService * @package app\data\service */ -abstract class PaymentService extends Service +abstract class PaymentService { // 汇聚支付通道 @@ -88,23 +91,29 @@ abstract class PaymentService extends Service ], ]; + /** + * 当前应用 + * @var App + */ + protected $app; + /** * 支付通道编号 * @var string */ - protected static $code; + protected $code; /** * 默认支付类型 * @var string */ - protected static $type; + protected $type; /** * 当前支付通道 * @var array */ - protected static $params; + protected $params; /** * 支付服务对象 @@ -112,25 +121,44 @@ abstract class PaymentService extends Service */ protected static $driver = []; + /** + * PaymentService constructor. + * @param App $app 当前应用对象 + * @param string $code 支付通道编号 + * @param string $type 支付类型代码 + * @param array $params 支付通道配置 + */ + public function __construct(App $app, string $code, string $type, array $params) + { + $this->app = $app; + $this->code = $code; + $this->type = $type; + $this->params = $params; + if (method_exists($this, 'initialize')) { + $this->initialize(); + } + } + /** * 根据配置实例支付服务 * @param string $code 支付通道编号 * @return JoinPaymentService|WechatPaymentService|AlipayPaymentService - * @throws \think\Exception + * @throws Exception */ - public static function build(string $code): PaymentService + public static function instance(string $code): PaymentService { - [static::$code, static::$type, static::$params] = self::config($code); + [, $type, $params] = self::config($code); if (isset(static::$driver[$code])) return static::$driver[$code]; + $vars = ['code' => $code, 'type' => $type, 'params' => $params]; // 实例化具体支付通道类型 - if (stripos(static::$type, 'alipay_') === 0) { - return static::$driver[$code] = AlipayPaymentService::instance(); - } elseif (stripos(static::$type, 'wechat_') === 0) { - return static::$driver[$code] = WechatPaymentService::instance(); - } elseif (stripos(static::$type, 'joinpay_') === 0) { - return static::$driver[$code] = JoinPaymentService::instance(); + if (stripos($type, 'alipay_') === 0) { + return static::$driver[$code] = Container::getInstance()->make(AlipayPaymentService::class, $vars); + } elseif (stripos($type, 'wechat_') === 0) { + return static::$driver[$code] = Container::getInstance()->make(WechatPaymentService::class, $vars); + } elseif (stripos($type, 'joinpay_') === 0) { + return static::$driver[$code] = Container::getInstance()->make(JoinPaymentService::class, $vars); } else { - throw new \think\Exception(sprintf('支付驱动[%s]未定义', static::$type)); + throw new \think\Exception(sprintf('支付驱动[%s]未定义', $type)); } } @@ -138,26 +166,27 @@ abstract class PaymentService extends Service * 根据通道编号获取配置参数 * @param string $code * @return array [code,type,params] - * @throws \think\Exception - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\DbException - * @throws \think\db\exception\ModelNotFoundException + * @throws Exception */ public static function config(string $code): array { - $map = ['code' => $code, 'status' => 1, 'deleted' => 0]; - $payment = app()->db->name('DataPayment')->where($map)->find(); - if (empty($payment)) { - throw new \think\Exception("支付通道[#{$code}]禁用关闭"); + try { + $map = ['code' => $code, 'status' => 1, 'deleted' => 0]; + $payment = app()->db->name('DataPayment')->where($map)->find(); + if (empty($payment)) { + throw new \think\Exception("支付通道[#{$code}]禁用关闭"); + } + $params = @json_decode($payment['content'], true); + if (empty($params)) { + throw new \think\Exception("支付通道[#{$code}]配置无效"); + } + if (empty(static::TYPES[$payment['type']])) { + throw new \think\Exception("支付通道[@{$payment['type']}]匹配失败"); + } + return [$payment['code'], $payment['type'], $params]; + } catch (\Exception $exception) { + throw new Exception($exception->getMessage(), $exception->getCode()); } - $params = @json_decode($payment['content'], true); - if (empty($params)) { - throw new \think\Exception("支付通道[#{$code}]配置无效"); - } - if (empty(static::TYPES[$payment['type']])) { - throw new \think\Exception("支付通道[@{$payment['type']}]匹配失败"); - } - return [$payment['code'], $payment['type'], $params]; } /** @@ -165,13 +194,12 @@ abstract class PaymentService extends Service * @param string $orderNo 订单单号 * @param string $paymentTrade 交易单号 * @param string $paymentAmount 支付金额 - * @param null|string $paymentType 支付类型 * @return boolean * @throws \think\db\exception\DataNotFoundException * @throws \think\db\exception\DbException * @throws \think\db\exception\ModelNotFoundException */ - public function updateOrder(string $orderNo, string $paymentTrade, string $paymentAmount, ?string $paymentType = null): bool + public function updateOrder(string $orderNo, string $paymentTrade, string $paymentAmount): bool { // 检查订单支付状态 $map = ['order_no' => $orderNo, 'payment_status' => 0, 'status' => 2]; @@ -180,10 +208,11 @@ abstract class PaymentService extends Service // 更新订单支付状态 $data = [ 'status' => 3, - 'payment_type' => $paymentType, + 'payment_type' => $this->type, + 'payment_code' => $this->code, 'payment_trade' => $paymentTrade, - 'payment_status' => 1, 'payment_amount' => $paymentAmount, + 'payment_status' => 1, 'payment_remark' => '在线支付', 'payment_datetime' => date('Y-m-d H:i:s'), ]; @@ -195,28 +224,21 @@ abstract class PaymentService extends Service /** * 创建支付行为 - * @param string $param 通道-编号 * @param string $orderNo 商户订单单号 * @param string $paymentTitle 商户订单标题 * @param string $paymentAmount 需要支付金额 */ - protected function createPaymentAction(string $param, string $orderNo, string $paymentTitle, string $paymentAmount) + protected function createPaymentAction(string $orderNo, string $paymentTitle, string $paymentAmount) { - if (is_numeric(stripos($param, '-'))) { - [$paymentType, $paymentCode] = explode('-', $param); - } else { - [$paymentType, $paymentCode] = [$param ?: static::$type, static::$code]; - } // 创建支付记录 $this->app->db->name('DataPaymentItem')->insert([ - 'payment_code' => $paymentCode, 'payment_type' => $paymentType, + 'payment_code' => $this->code, 'payment_type' => $this->type, 'order_name' => $paymentTitle, 'order_amount' => $paymentAmount, 'order_no' => $orderNo, ]); } /** * 更新支付记录并更新订单 - * @param string $param 通道-编号 * @param string $orderNo 商户订单单号 * @param string $paymentTrade 平台交易单号 * @param string $paymentAmount 实际到账金额 @@ -225,28 +247,23 @@ abstract class PaymentService extends Service * @throws \think\db\exception\DbException * @throws \think\db\exception\ModelNotFoundException */ - protected function updatePaymentAction(string $param, string $orderNo, string $paymentTrade, string $paymentAmount): bool + protected function updatePaymentAction(string $orderNo, string $paymentTrade, string $paymentAmount): bool { - if (is_numeric(stripos($param, '-'))) { - [$paymentType, $paymentCode] = explode('-', $param); - } else { - [$paymentType, $paymentCode] = [$param ?: static::$type, static::$code]; - } // 更新支付记录 data_save('DataPaymentItem', [ 'order_no' => $orderNo, - 'payment_code' => $paymentCode, - 'payment_type' => $paymentType, + 'payment_code' => $this->code, + 'payment_type' => $this->type, 'payment_trade' => $paymentTrade, 'payment_amount' => $paymentAmount, 'payment_status' => 1, 'payment_datatime' => date('Y-m-d H:i:s'), ], 'order_no', [ - 'payment_code' => $paymentCode, - 'payment_type' => $paymentType, + 'payment_code' => $this->code, + 'payment_type' => $this->type, ]); // 更新记录状态 - return $this->updateOrder($orderNo, $paymentTrade, $paymentAmount, $paymentType); + return $this->updateOrder($orderNo, $paymentTrade, $paymentAmount); } /** @@ -258,10 +275,9 @@ abstract class PaymentService extends Service /** * 支付通知处理 - * @param string $param 支付通道-支付编号 * @return string */ - abstract public function notify(string $param = ''): string; + abstract public function notify(): string; /** * 创建支付订单 diff --git a/app/data/service/payment/AlipayPaymentService.php b/app/data/service/payment/AlipayPaymentService.php index e71fa2a9f..280617b76 100644 --- a/app/data/service/payment/AlipayPaymentService.php +++ b/app/data/service/payment/AlipayPaymentService.php @@ -30,11 +30,11 @@ class AlipayPaymentService extends PaymentService // 签名类型（RSA|RSA2） 'sign_type' => "RSA2", // 应用ID - 'appid' => static::$params['alipay_appid'], + 'appid' => $this->params['alipay_appid'], // 支付宝公钥 (1行填写，特别注意，这里是支付宝公钥，不是应用公钥，最好从开发者中心的网页上去复制) - 'public_key' => $this->_trimCertHeader(static::$params['alipay_public_key']), + 'public_key' => $this->_trimCertHeader($this->params['alipay_public_key']), // 支付宝私钥 (1行填写) - 'private_key' => $this->_trimCertHeader(static::$params['alipay_private_key']), + 'private_key' => $this->_trimCertHeader($this->params['alipay_private_key']), // 应用公钥证书（新版资金类接口转 app_cert_sn） # 'app_cert' => '', // 支付宝根证书（新版资金类接口转 alipay_root_cert_sn） @@ -57,41 +57,6 @@ class AlipayPaymentService extends PaymentService return preg_replace(['/\s+/', '/-{5}.*?-{5}/'], '', $content); } - /** - * 支付结果处理 - * @param string $param 支付通道 - * @return string - * @throws \WeChat\Exceptions\InvalidResponseException - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\DbException - * @throws \think\db\exception\ModelNotFoundException - */ - public function notify(string $param = ''): string - { - $notify = \AliPay\App::instance($this->config)->notify(); - if (in_array($notify['trade_status'], ['TRADE_SUCCESS', 'TRADE_FINISHED'])) { - if ($this->updatePaymentAction($param, $notify['out_trade_no'], $notify['trade_no'], $notify['total_amount'])) { - return 'success'; - } else { - return 'error'; - } - } else { - return 'success'; - } - } - - /** - * 查询订单数据 - * @param string $orderNo - * @return array - * @throws \WeChat\Exceptions\InvalidResponseException - * @throws \WeChat\Exceptions\LocalCacheException - */ - public function query(string $orderNo): array - { - return \AliPay\App::instance($this->config)->query($orderNo); - } - /** * 创建订单支付参数 * @param string $openid 会员OPENID @@ -106,13 +71,12 @@ class AlipayPaymentService extends PaymentService public function create(string $openid, string $orderNo, string $paymentAmount, string $paymentTitle, string $paymentRemark, string $paymentReturn = ''): array { try { - if (isset(static::TYPES[static::$type])) { - $tradeType = static::TYPES[static::$type]['type']; - $tradeParam = static::$type . '-' . static::$code; + if (isset(static::TYPES[$this->type])) { + $tradeType = static::TYPES[$this->type]['type']; } else { - throw new \think\Exception('支付类型[' . static::$type . ']未配置定义！'); + throw new \think\Exception(sprintf('支付类型[%s]未配置定义！', $this->type)); } - $this->config['notify_url'] = sysuri("@data/api.notify/alipay/scene/order/param/{$tradeParam}", [], false, true); + $this->config['notify_url'] = sysuri("@data/api.notify/alipay/scene/order/param/{$this->code}", [], false, true); if (in_array($tradeType, [static::PAYMENT_ALIPAY_WAP, static::PAYMENT_ALIPAY_WEB])) { if (empty($paymentReturn)) { throw new \think\Exception('支付回跳地址不能为空！'); @@ -133,7 +97,7 @@ class AlipayPaymentService extends PaymentService if (!empty($paymentRemark)) $data['body'] = $paymentRemark; $result = $payment->apply($data); // 创建支付记录 - $this->createPaymentAction($tradeParam, $orderNo, $paymentTitle, $paymentAmount); + $this->createPaymentAction($orderNo, $paymentTitle, $paymentAmount); // 返回支付参数 return ['result' => $result]; } catch (\think\Exception $exception) { @@ -142,4 +106,38 @@ class AlipayPaymentService extends PaymentService throw new \think\Exception($exception->getMessage(), $exception->getCode()); } } + + /** + * 支付结果处理 + * @return string + * @throws \WeChat\Exceptions\InvalidResponseException + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + */ + public function notify(): string + { + $notify = \AliPay\App::instance($this->config)->notify(); + if (in_array($notify['trade_status'], ['TRADE_SUCCESS', 'TRADE_FINISHED'])) { + if ($this->updatePaymentAction($notify['out_trade_no'], $notify['trade_no'], $notify['total_amount'])) { + return 'success'; + } else { + return 'error'; + } + } else { + return 'success'; + } + } + + /** + * 查询订单数据 + * @param string $orderNo + * @return array + * @throws \WeChat\Exceptions\InvalidResponseException + * @throws \WeChat\Exceptions\LocalCacheException + */ + public function query(string $orderNo): array + { + return \AliPay\App::instance($this->config)->query($orderNo); + } } \ No newline at end of file diff --git a/app/data/service/payment/JoinPaymentService.php b/app/data/service/payment/JoinPaymentService.php index 36e893ffe..9858d8372 100644 --- a/app/data/service/payment/JoinPaymentService.php +++ b/app/data/service/payment/JoinPaymentService.php @@ -48,10 +48,10 @@ class JoinPaymentService extends PaymentService */ protected function initialize(): JoinPaymentService { - $this->appid = static::$params['joinpay_appid']; - $this->trade = static::$params['joinpay_trade'];; - $this->mchid = static::$params['joinpay_mch_id']; - $this->mchkey = static::$params['joinpay_mch_key']; + $this->appid = $this->params['joinpay_appid']; + $this->trade = $this->params['joinpay_trade'];; + $this->mchid = $this->params['joinpay_mch_id']; + $this->mchkey = $this->params['joinpay_mch_key']; return $this; } @@ -69,11 +69,10 @@ class JoinPaymentService extends PaymentService public function create(string $openid, string $orderNo, string $paymentAmount, string $paymentTitle, string $paymentRemark, string $paymentReturn = ''): array { try { - if (isset(static::TYPES[static::$type])) { - $tradeType = static::TYPES[static::$type]['type']; - $tradeParam = static::$type . '-' . static::$code; + if (isset(static::TYPES[$this->type])) { + $tradeType = static::TYPES[$this->type]['type']; } else { - throw new \think\Exception('支付类型[' . static::$type . ']未配置定义！'); + throw new \think\Exception(sprintf('支付类型[%s]未配置定义！', $this->type)); } $data = [ 'p0_Version' => '1.0', @@ -83,7 +82,7 @@ class JoinPaymentService extends PaymentService 'p4_Cur' => '1', 'p5_ProductName' => $paymentTitle, 'p6_ProductDesc' => $paymentRemark, - 'p9_NotifyUrl' => sysuri("@data/api.notify/joinpay/scene/order/param/{$tradeParam}", [], false, true), + 'p9_NotifyUrl' => sysuri("@data/api.notify/joinpay/scene/order/param/{$this->code}", [], false, true), 'q1_FrpCode' => $tradeType ?? '', 'q5_OpenId' => $openid, 'q7_AppId' => $this->appid, @@ -94,7 +93,7 @@ class JoinPaymentService extends PaymentService $result = $this->_doReuest($data); if (is_array($result) && isset($result['ra_Code']) && intval($result['ra_Code']) === 100) { // 创建支付记录 - $this->createPaymentAction($tradeParam, $orderNo, $paymentTitle, $paymentAmount); + $this->createPaymentAction($orderNo, $paymentTitle, $paymentAmount); // 返回支付参数 return json_decode($result['rc_Result'], true); } elseif (is_array($result) && isset($result['rb_CodeMsg'])) { @@ -122,13 +121,12 @@ class JoinPaymentService extends PaymentService /** * 支付结果处理 - * @param string $param 支付通道 * @return string * @throws \think\db\exception\DataNotFoundException * @throws \think\db\exception\DbException * @throws \think\db\exception\ModelNotFoundException */ - public function notify(string $param = ''): string + public function notify(): string { $notify = $this->app->request->get(); foreach ($notify as &$item) $item = urldecode($item); @@ -136,7 +134,7 @@ class JoinPaymentService extends PaymentService return 'error'; } if (isset($notify['r6_Status']) && intval($notify['r6_Status']) === 100) { - if ($this->updatePaymentAction($param, $notify['r2_OrderNo'], $notify['r9_BankTrxNo'], $notify['r3_Amount'])) { + if ($this->updatePaymentAction($notify['r2_OrderNo'], $notify['r9_BankTrxNo'], $notify['r3_Amount'])) { return 'success'; } else { return 'error'; diff --git a/app/data/service/payment/WechatPaymentService.php b/app/data/service/payment/WechatPaymentService.php index 22924e2f6..31c7ef77e 100644 --- a/app/data/service/payment/WechatPaymentService.php +++ b/app/data/service/payment/WechatPaymentService.php @@ -25,9 +25,9 @@ class WechatPaymentService extends PaymentService protected function initialize(): WechatPaymentService { $this->payment = Order::instance([ - 'appid' => static::$params['wechat_appid'], - 'mch_id' => static::$params['wechat_mch_id'], - 'mch_key' => static::$params['wechat_mch_key'], + 'appid' => $this->params['wechat_appid'], + 'mch_id' => $this->params['wechat_mch_id'], + 'mch_key' => $this->params['wechat_mch_key'], 'cache_path' => $this->app->getRootPath() . 'runtime' . DIRECTORY_SEPARATOR . 'wechat', ]); return $this; @@ -47,28 +47,27 @@ class WechatPaymentService extends PaymentService public function create(string $openid, string $orderNo, string $paymentAmount, string $paymentTitle, string $paymentRemark, string $paymentReturn = ''): array { try { - if (isset(static::TYPES[static::$type])) { - $tradeType = static::TYPES[static::$type]['type']; - $tradeParam = static::$type . '-' . static::$code; + if (isset(static::TYPES[$this->type])) { + $tradeType = static::TYPES[$this->type]['type']; } else { - throw new \think\Exception('支付类型[' . static::$type . ']未配置定义！'); + throw new \think\Exception(sprintf('支付类型[%s]未配置定义！', $this->type)); } $body = empty($paymentRemark) ? $paymentTitle : ($paymentTitle . '-' . $paymentRemark); $data = [ 'body' => $body, 'openid' => $openid, - 'attach' => $tradeParam, + 'attach' => $this->code, 'out_trade_no' => $orderNo, 'total_fee' => $paymentAmount * 100, 'trade_type' => $tradeType ?: '', - 'notify_url' => sysuri("@data/api.notify/wxpay/scene/order/param/{$tradeParam}", [], false, true), + 'notify_url' => sysuri("@data/api.notify/wxpay/scene/order/param/{$this->code}", [], false, true), 'spbill_create_ip' => $this->app->request->ip(), ]; if (empty($data['openid'])) unset($data['openid']); $info = $this->payment->create($data); if ($info['return_code'] === 'SUCCESS' && $info['result_code'] === 'SUCCESS') { // 创建支付记录 - $this->createPaymentAction($tradeParam, $orderNo, $paymentTitle, $paymentAmount); + $this->createPaymentAction($orderNo, $paymentTitle, $paymentAmount); // 返回支付参数 return $this->payment->jsapiParams($info['prepay_id']); } @@ -99,7 +98,7 @@ class WechatPaymentService extends PaymentService $result = $this->payment->query(['out_trade_no' => $orderNo]); if (isset($result['return_code']) && isset($result['result_code']) && isset($result['attach'])) { if ($result['return_code'] === 'SUCCESS' && $result['result_code'] === 'SUCCESS') { - $this->updatePaymentAction($result['attach'], $result['out_trade_no'], $result['cash_fee'] / 100, $result['transaction_id']); + $this->updatePaymentAction($result['out_trade_no'], $result['cash_fee'] / 100, $result['transaction_id']); } } return $result; @@ -107,18 +106,17 @@ class WechatPaymentService extends PaymentService /** * 支付结果处理 - * @param string $param 支付通道 * @return string * @throws \WeChat\Exceptions\InvalidResponseException * @throws \think\db\exception\DataNotFoundException * @throws \think\db\exception\DbException * @throws \think\db\exception\ModelNotFoundException */ - public function notify(string $param = ''): string + public function notify(): string { $notify = $this->payment->getNotify(); if ($notify['result_code'] == 'SUCCESS' && $notify['return_code'] == 'SUCCESS') { - if ($this->updatePaymentAction($param, $notify['out_trade_no'], $notify['transaction_id'], $notify['cash_fee'] / 100)) { + if ($this->updatePaymentAction($notify['out_trade_no'], $notify['transaction_id'], $notify['cash_fee'] / 100)) { return $this->payment->getNotifySuccessReply(); } else { return 'error'; diff --git a/app/data/view/config/slider.html b/app/data/view/config/slider.html index 4ea34cc65..f40f2fa1b 100644 --- a/app/data/view/config/slider.html +++ b/app/data/view/config/slider.html @@ -2,9 +2,6 @@ {block name="content"}
-

- 演示接口文档：http://www.docway.net/project/1WkI0ZyQ7M1/share/1Wld0z7b1zE -

{$title|default='图片数据管理'} ( 建议上传图片尺寸为 690px 250px ) diff --git a/app/data/view/news_item/index.html b/app/data/view/news_item/index.html index 74462a9ff..3dd8c398d 100644 --- a/app/data/view/news_item/index.html +++ b/app/data/view/news_item/index.html @@ -58,7 +58,9 @@ 禁 用 - + + + 激 活 diff --git a/app/data/view/news_mark/index.html b/app/data/view/news_mark/index.html index 3d725297f..25b74a7da 100644 --- a/app/data/view/news_mark/index.html +++ b/app/data/view/news_mark/index.html @@ -33,19 +33,18 @@ {if $vo.status eq 0}已禁用{elseif $vo.status eq 1}已激活{/if} {$vo.create_at|format_datetime} - + {if auth("edit")} 编 辑 - - - + {/if} + {if auth("state") and $vo.status eq 1} 禁 用 - + {/if} + {if auth("state") and $vo.status eq 0} 激 活 - - - + {/if} + {if auth("remove")} 删 除 - + {/if} {/foreach} diff --git a/app/data/view/payment/form.html b/app/data/view/payment/form.html index 4652464d6..1527b898c 100644 --- a/app/data/view/payment/form.html +++ b/app/data/view/payment/form.html @@ -8,13 +8,14 @@ 支付名称 Payment Name - 必填，请填写分类名称（如：微信小程序支付），建议字符不要太长一般4-6个汉字 + 必填，请填写支付通道名称，通道名称尽量不要重复，字符不要太长一般4-6个汉字
支付方式 Payment Channel
diff --git a/app/data/view/payment/index_search.html b/app/data/view/payment/index_search.html index d765b13a8..c4984ce9d 100644 --- a/app/data/view/payment/index_search.html +++ b/app/data/view/payment/index_search.html @@ -7,7 +7,6 @@
-
@@ -22,7 +21,6 @@
-
@@ -36,14 +34,12 @@
-
-
diff --git a/app/data/view/shop_goods_mark/index.html b/app/data/view/shop_goods_mark/index.html index 1faf0fbcc..d6637d05b 100644 --- a/app/data/view/shop_goods_mark/index.html +++ b/app/data/view/shop_goods_mark/index.html @@ -40,7 +40,9 @@ 禁 用 - + + + 激 活 diff --git a/app/data/view/shop_order/index_search.html b/app/data/view/shop_order/index_search.html index 0c6779c01..2bc46c2b2 100644 --- a/app/data/view/shop_order/index_search.html +++ b/app/data/view/shop_order/index_search.html @@ -48,7 +48,7 @@
-
{notempty name='vo.order_no'}{/notempty} {notempty name='vo.send_datetime'}{/notempty} -
- - - \ No newline at end of file + + \ No newline at end of file diff --git a/app/data/view/shop_order_service/index_search.html b/app/data/view/shop_order_service/index_search.html index c18cfcb66..155531217 100644 --- a/app/data/view/shop_order_service/index_search.html +++ b/app/data/view/shop_order_service/index_search.html @@ -7,48 +7,41 @@ -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/data/view/shop_truck_company/index.html b/app/data/view/shop_truck_company/index.html index 4b8457955..cd74e1649 100644 --- a/app/data/view/shop_truck_company/index.html +++ b/app/data/view/shop_truck_company/index.html @@ -69,13 +69,11 @@ 编 辑 - - + 禁 用 - + 激 活 - 删 除 diff --git a/app/data/view/shop_truck_company/index_search.html b/app/data/view/shop_truck_company/index_search.html index b4c696232..94d06545a 100644 --- a/app/data/view/shop_truck_company/index_search.html +++ b/app/data/view/shop_truck_company/index_search.html @@ -7,21 +7,18 @@ -
-
-
diff --git a/app/data/view/shop_truck_template/form_region.html b/app/data/view/shop_truck_template/form_region.html index a37743964..e5e3f608f 100644 --- a/app/data/view/shop_truck_template/form_region.html +++ b/app/data/view/shop_truck_template/form_region.html @@ -13,7 +13,6 @@ -
配送城市
@@ -22,7 +21,6 @@
-
配送区域
@@ -31,13 +29,11 @@
-
- diff --git a/app/data/view/shop_truck_template/index_search.html b/app/data/view/shop_truck_template/index_search.html index 0941b7c59..b4ae831b0 100644 --- a/app/data/view/shop_truck_template/index_search.html +++ b/app/data/view/shop_truck_template/index_search.html @@ -7,26 +7,22 @@ -
-
-
- + - diff --git a/app/data/view/store_item/form.html b/app/data/view/store_item/form.html index 43af590bf..e75eac2c2 100644 --- a/app/data/view/store_item/form.html +++ b/app/data/view/store_item/form.html @@ -6,7 +6,6 @@ 必填，请填写分类名称（如：系统管理），建议字符不要太长，一般4-6个汉字 -
标签描述 Mark Remark @@ -15,10 +14,8 @@
-
{notempty name='vo.id'}{/notempty} -
diff --git a/app/data/view/store_item/index.html b/app/data/view/store_item/index.html index 0bd93b7d8..c1c53e437 100644 --- a/app/data/view/store_item/index.html +++ b/app/data/view/store_item/index.html @@ -49,7 +49,9 @@ 禁 用 - + + + 激 活 diff --git a/app/data/view/store_item/index_search.html b/app/data/view/store_item/index_search.html index 2665a2e62..a764e0445 100644 --- a/app/data/view/store_item/index_search.html +++ b/app/data/view/store_item/index_search.html @@ -7,13 +7,11 @@
-
-
-
diff --git a/app/data/view/store_used/form.html b/app/data/view/store_used/form.html index 43af590bf..e75eac2c2 100644 --- a/app/data/view/store_used/form.html +++ b/app/data/view/store_used/form.html @@ -6,7 +6,6 @@ 必填，请填写分类名称（如：系统管理），建议字符不要太长，一般4-6个汉字 -
标签描述 Mark Remark @@ -15,10 +14,8 @@
-
{notempty name='vo.id'}{/notempty} -
diff --git a/app/data/view/store_used/index.html b/app/data/view/store_used/index.html index 0c05533f4..822053083 100644 --- a/app/data/view/store_used/index.html +++ b/app/data/view/store_used/index.html @@ -49,7 +49,9 @@ 禁 用 - + + + 激 活 diff --git a/app/data/view/store_used/index_search.html b/app/data/view/store_used/index_search.html index 2665a2e62..a764e0445 100644 --- a/app/data/view/store_used/index_search.html +++ b/app/data/view/store_used/index_search.html @@ -7,13 +7,11 @@
-
-
-
diff --git a/app/data/view/store_user/form.html b/app/data/view/store_user/form.html index 43af590bf..e75eac2c2 100644 --- a/app/data/view/store_user/form.html +++ b/app/data/view/store_user/form.html @@ -6,7 +6,6 @@ 必填，请填写分类名称（如：系统管理），建议字符不要太长，一般4-6个汉字 -
标签描述 Mark Remark @@ -15,10 +14,8 @@
-
{notempty name='vo.id'}{/notempty} -
diff --git a/app/data/view/store_user/index.html b/app/data/view/store_user/index.html index 7dce20a02..40b13b28e 100644 --- a/app/data/view/store_user/index.html +++ b/app/data/view/store_user/index.html @@ -49,7 +49,9 @@ 禁 用 - + + + 激 活 diff --git a/app/data/view/store_user/index_search.html b/app/data/view/store_user/index_search.html index 2665a2e62..a764e0445 100644 --- a/app/data/view/store_user/index_search.html +++ b/app/data/view/store_user/index_search.html @@ -7,13 +7,11 @@
-
-
-
diff --git a/app/data/view/user/index.html b/app/data/view/user/index.html index 19e450cba..91d66dd87 100644 --- a/app/data/view/user/index.html +++ b/app/data/view/user/index.html @@ -44,7 +44,9 @@ 冻结账号 - + + + 解冻账号 diff --git a/app/data/view/user/index_search.html b/app/data/view/user/index_search.html index 8705ded35..8a59a0293 100644 --- a/app/data/view/user/index_search.html +++ b/app/data/view/user/index_search.html @@ -7,20 +7,17 @@ -
-
-
-
- - + + \ No newline at end of file diff --git a/app/data/view/user_message/config.html b/app/data/view/user_message/config.html index 2b219e4e4..d9116d56f 100644 --- a/app/data/view/user_message/config.html +++ b/app/data/view/user_message/config.html @@ -53,5 +53,6 @@ + {/block} \ No newline at end of file diff --git a/app/data/view/user_message/index_search.html b/app/data/view/user_message/index_search.html index 27bd0eb8f..e01d54554 100644 --- a/app/data/view/user_message/index_search.html +++ b/app/data/view/user_message/index_search.html @@ -41,5 +41,5 @@ - - + + \ No newline at end of file diff --git a/public/static/admin.js b/public/static/admin.js index 010043b4b..6ddfe550c 100644 --- a/public/static/admin.js +++ b/public/static/admin.js @@ -761,22 +761,22 @@ $(function () { $body.on('click', '[data-tips-image]', function () { $.previewImage(this.dataset.tipsImage || this.dataset.lazySrc || this.src, this.dataset.with); }); - $.previewImage = function (src, area, done, close) { - var img = new Image(), index = $.msg.loading(); - img.style.background = '#fff', img.style.display = 'none'; + $.previewImage = function (src, area) { + var img = new Image(), defer = $.Deferred(), load = $.msg.loading(); img.style.height = 'auto', img.style.width = area || '480px'; + img.style.display = 'none', img.style.background = '#FFFFFF'; document.body.appendChild(img), img.onerror = function () { - $.msg.close(index); + $.msg.close(load), defer.reject(); }, img.onload = function () { layer.open({ type: 1, title: false, shadeClose: true, content: $(img), success: function ($ele, idx) { - $.msg.close(index), (typeof done === 'function' && done($ele, idx)) - }, area: area || '480px', closeBtn: 1, skin: 'layui-layer-nobg', end: function () { - document.body.removeChild(img), (typeof close === 'function' && close()) + $.msg.close(load), defer.notify($ele, idx); + }, area: area || '480px', skin: 'layui-layer-nobg', closeBtn: 1, end: function () { + document.body.removeChild(img), defer.resolve() } }); }; - return img.src = src; + return (img.src = src), defer; }; /*! 注册 data-phone-view 事件行为 */