From 3711c96dcc78cfa9220d440a5b6eb0bb6a1f6bf7 Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Thu, 10 Mar 2022 10:31:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/.version | 4 ++-- .../controller/v1/order/RefundOrder.php | 1 - .../v1/admin/StoreOrderController.php | 1 - .../v1/order/StoreOrderController.php | 19 ++++++++++--------- .../v1/order/StoreOrderRefundController.php | 5 +++++ .../app/services/order/StoreOrderServices.php | 3 ++- template/uni-app/config/app.js | 2 +- 7 files changed, 20 insertions(+), 15 deletions(-) diff --git a/crmeb/.version b/crmeb/.version index ed1c8204..84e428f9 100644 --- a/crmeb/.version +++ b/crmeb/.version @@ -1,2 +1,2 @@ -version=CRMEB-KY v4.4.0 -version_code=440 +version=CRMEB-KY v4.4.1 +version_code=441 diff --git a/crmeb/app/adminapi/controller/v1/order/RefundOrder.php b/crmeb/app/adminapi/controller/v1/order/RefundOrder.php index cf07ae5f..e515e08a 100644 --- a/crmeb/app/adminapi/controller/v1/order/RefundOrder.php +++ b/crmeb/app/adminapi/controller/v1/order/RefundOrder.php @@ -40,7 +40,6 @@ class RefundOrder extends AuthController ['refund_type', 0] ]); $where['is_cancel'] = 0; - $where['is_del'] = 0; return app('json')->success($this->services->refundList($where)); } diff --git a/crmeb/app/api/controller/v1/admin/StoreOrderController.php b/crmeb/app/api/controller/v1/admin/StoreOrderController.php index 9daa53e2..764b426c 100644 --- a/crmeb/app/api/controller/v1/admin/StoreOrderController.php +++ b/crmeb/app/api/controller/v1/admin/StoreOrderController.php @@ -87,7 +87,6 @@ class StoreOrderController ['field_key', ''], ['field_value', ''], ]); - $where['shipping_type'] = 1; $where['is_system_del'] = 0; if (!in_array($where['status'], [-1, -2, -3])) { $where['pid'] = 0; diff --git a/crmeb/app/api/controller/v1/order/StoreOrderController.php b/crmeb/app/api/controller/v1/order/StoreOrderController.php index 48e200c6..4756651f 100644 --- a/crmeb/app/api/controller/v1/order/StoreOrderController.php +++ b/crmeb/app/api/controller/v1/order/StoreOrderController.php @@ -393,26 +393,27 @@ class StoreOrderController if ($order['pink_id'] && $services->isPinkStatus($order['pink_id'])) { return app('json')->fail('该订单已失效!'); } - if (!Cache::get('pay_' . $order['order_id'])) { + $isChannel = $this->getChennel[$from]; + //缓存不存在 ｜｜ 切换另一端支付 + if (!Cache::get('pay_' . $order['order_id']) || $isChannel != $order['is_channel']) { switch ($from) { case 'weixin': - if ($type == 1) { - $order['order_id'] = mt_rand(100, 999) . '_' . $order['order_id']; - } elseif (in_array($order->is_channel, [1, 2, 3])) {//0 + if ($type == 1 || in_array($order['is_channel'], [1, 2, 3, 4])) {//0 $order['order_id'] = mt_rand(100, 999) . '_' . $order['order_id']; } break; case 'weixinh5': - if ($type == 1) { - $order['order_id'] = mt_rand(100, 999) . '_' . $order['order_id']; - } elseif (in_array($order->is_channel, [0, 1, 3])) { + if ($type == 1 || in_array($order['is_channel'], [0, 1, 3, 4])) { $order['order_id'] = mt_rand(100, 999) . '_' . $order['order_id']; } break; case 'routine': - if ($type == 1) { + if ($type == 1 || in_array($order['is_channel'], [0, 2, 3, 4])) { $order['order_id'] = mt_rand(100, 999) . '_' . $order['order_id']; - } elseif (in_array($order->is_channel, [0, 2, 3])) { + } + break; + case 'app': + if ($type == 1 || in_array($order['is_channel'], [0, 1, 2, 3])) { $order['order_id'] = mt_rand(100, 999) . '_' . $order['order_id']; } break; diff --git a/crmeb/app/api/controller/v1/order/StoreOrderRefundController.php b/crmeb/app/api/controller/v1/order/StoreOrderRefundController.php index 17bc6fb9..1cde536c 100644 --- a/crmeb/app/api/controller/v1/order/StoreOrderRefundController.php +++ b/crmeb/app/api/controller/v1/order/StoreOrderRefundController.php @@ -4,6 +4,7 @@ namespace app\api\controller\v1\order; use app\Request; use app\services\order\StoreOrderRefundServices; +use app\services\order\StoreOrderServices; class StoreOrderRefundController { @@ -102,7 +103,11 @@ class StoreOrderRefundController */ public function delRefund(Request $request, $uni) { + $oid = $this->services->value(['order_id' => $uni, 'uid' => $request->uid()], 'store_order_id'); $res = $this->services->update(['order_id' => $uni, 'uid' => $request->uid()], ['is_del' => 1]); + /** @var StoreOrderServices $orderServices */ + $orderServices = app()->make(StoreOrderServices::class); + $orderServices->update($oid, ['is_del' => 1], 'id'); if ($res) return app('json')->successful('删除成功'); else diff --git a/crmeb/app/services/order/StoreOrderServices.php b/crmeb/app/services/order/StoreOrderServices.php index de76b1af..435690f4 100644 --- a/crmeb/app/services/order/StoreOrderServices.php +++ b/crmeb/app/services/order/StoreOrderServices.php @@ -158,8 +158,9 @@ class StoreOrderServices extends BaseServices $refund_where = ['is_cancel' => 0]; if ($uid) $refund_where['uid'] = $uid; $data['refunding_count'] = (string)$storeOrderRefundServices->count($refund_where + ['refund_type' => [1, 2, 4, 5]]); + $data['no_refund_count'] = (string)$storeOrderRefundServices->count($refund_where + ['refund_type' => 3]); $data['refunded_count'] = (string)$storeOrderRefundServices->count($refund_where + ['refund_type' => 6]); - $data['refund_count'] = (string)bcadd($data['refunding_count'], $data['refunded_count'], 0); + $data['refund_count'] = bcadd(bcadd($data['refunding_count'], $data['refunded_count'], 0), $data['no_refund_count'], 0); $data['yue_pay_status'] = (int)sys_config('balance_func_status') && (int)sys_config('yue_pay_status') == 1 ? (int)1 : (int)2;//余额支付 1 开启 2 关闭 $data['pay_weixin_open'] = (int)sys_config('pay_weixin_open') ?? 0;//微信支付 1 开启 0 关闭 $data['ali_pay_status'] = (bool)sys_config('ali_pay_status');//支付包支付 1 开启 0 关闭 diff --git a/template/uni-app/config/app.js b/template/uni-app/config/app.js index b0fba789..a6db7540 100644 --- a/template/uni-app/config/app.js +++ b/template/uni-app/config/app.js @@ -2,7 +2,7 @@ module.exports = { // 小程序配置 // #ifdef MP || APP-PLUS // 请求域名 格式： https://您的域名 - HTTP_REQUEST_URL: `https://demo26.crmeb.net`, + HTTP_REQUEST_URL: `https://demo.crmeb.com`, // #endif // H5配置