diff --git a/crmeb/app/adminapi/controller/v1/order/RefundOrder.php b/crmeb/app/adminapi/controller/v1/order/RefundOrder.php index cf07ae5ff..e515e08ac 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 9daa53e29..764b426c1 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/StoreOrderRefundController.php b/crmeb/app/api/controller/v1/order/StoreOrderRefundController.php index 17bc6fb99..1cde536ca 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 de76b1af2..435690f41 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 关闭