diff --git a/app/api/controller/PayController.php b/app/api/controller/PayController.php index e02c8011e..5cf4e8e84 100755 --- a/app/api/controller/PayController.php +++ b/app/api/controller/PayController.php @@ -19,6 +19,7 @@ use app\api\validate\PayValidate; use app\common\enum\user\UserTerminalEnum; use app\common\logic\PaymentLogic; use app\common\service\pay\WeChatPayService; +use think\facade\Log; /** * 支付 @@ -28,7 +29,7 @@ use app\common\service\pay\WeChatPayService; class PayController extends BaseApiController { - public array $notNeedLogin = ['notifyMnp', 'notifyOa']; + public array $notNeedLogin = ['notifyMnp', 'notifyOa', 'notifyApp']; /** * @notes 支付方式 diff --git a/app/common/model/user/Task.php b/app/common/model/user/Task.php new file mode 100644 index 000000000..b832990da --- /dev/null +++ b/app/common/model/user/Task.php @@ -0,0 +1,175 @@ + '未设置', + self::ONE => '一般', + self::TWO => '中', + self::THREE => '高', + self::FOUR => '紧急', + ]; + public static $FlowStatus = [ + self::ZERO => '未设置', + self::ONE => '未开始', + self::TWO => '进行中', + self::THREE => '等待验收', + self::FOUR => '已拒绝', + self::FIVE => '已关闭', + self::SIX => '通过验收', + ]; + + //列表 + function list($param, $type = 0) + { + $where = array(); + $map1 = []; + $map2 = []; + $map3 = []; + $map4 = []; + if (!empty($param['project_id'])) { + $where[] = ['project_id', '=', $param['project_id']]; + } + if (!empty($param['product_id'])) { + $where[] = ['product_id', '=', $param['product_id']]; + } else { + $map1[] = ['admin_id', '=', $param['uid']]; + $map2[] = ['director_uid', '=', $param['uid']]; + $map3[] = ['', 'exp', Db::raw("FIND_IN_SET({$param['uid']},assist_admin_ids)")]; + } + if (!empty($param['type'])) { + $where[] = ['type', '=', $param['type']]; + } + if (!empty($param['flow_status'])) { + $where[] = ['flow_status', '=', $param['flow_status']]; + } + if (!empty($param['priority'])) { + $where[] = ['priority', '=', $param['priority']]; + } + if (!empty($param['cate'])) { + $where[] = ['cate', '=', $param['cate']]; + } + if (!empty($param['director_uid'])) { + $where[] = ['director_uid', 'in', $param['director_uid']]; + } + if (!empty($param['keywords'])) { + $where[] = ['title|content', 'like', '%' . $param['keywords'] . '%']; + } + if (!empty($param['did'])) { + $where[] = ['did', '=', $param['did']]; + } + if (!empty($param['create_time'])) { + $where[] = ['create_time', 'BETWEEN', [strtotime($param['create_time']), strtotime($param['create_time'] . " +1 month -1 day")]]; + } + if (!empty($param['types']) && $param['types'] == 9) { + $where = []; + $where[] = ['end_time', 'BETWEEN', [strtotime(date('Y-m-d'), time()), strtotime(date('Y-m-d'), time()) + 86399]]; + $where[] = ['flow_status', '=', 2]; + + } + $where[] = ['delete_time', '=', 0]; + if ($type == 1) { + unset($where['project_id']); + $map1 = []; + $map2 = []; + $map3 = []; + $map4 = []; + } + + $query = Db::name('Task')->where(function ($query) use ($map1, $map2, $map3, $map4) { + $query->where($map1)->whereor($map2)->whereor($map3); + })->where($where); + $count = $query->count(); + $list = $query->withoutField('content,md_content') + ->order('flow_status asc') + ->order('id desc') + ->page($param['page']) + ->limit($param['limit']) + ->select() + ->each(function ($item, $key) { + $item['director_name'] = Db::name('Admin')->where(['id' => $item['director_uid']])->value('name'); + $item['admin_name'] = Db::name('Admin')->where(['id' => $item['admin_id']])->value('name'); + $assist_admin_names = Db::name('Admin')->where([['id', 'in', $item['assist_admin_ids']]])->column('name'); + $item['cate_name'] = Db::name('WorkCate')->where(['id' => $item['cate']])->value('title'); + $item['type_name'] = Db::name('TaskCate')->where(['id' => $item['type']])->value('title'); + $item['did_name'] = Db::name('department')->where(['id' => $item['did']])->value('title'); + if (empty($assist_admin_names)) { + $item['assist_admin_names'] = '-'; + } else { + $item['assist_admin_names'] = implode(',', $assist_admin_names); + } + $item['end_time'] = date('Y-m-d', $item['end_time']); + $item['delay'] = 0; + if ($item['over_time'] > 0 && $item['flow_status'] > 3 && $item['initial_end_time'] < time()) { + $item['delay'] = countDays(date('Y-m-d', $item['initial_end_time']), date('Y-m-d', $item['over_time'])); + } + if ($item['over_time'] == 0 && $item['flow_status'] < 2 && $item['initial_end_time'] < time()) { + $item['delay'] = countDays(date('Y-m-d', time()), $item['initial_end_time']); + } + $item['priority_name'] = self::$Priority[(int)$item['priority']]; + $item['flow_name'] = self::$FlowStatus[(int)$item['flow_status']]; + return $item; + }); + return [$count, $list]; + } + + //详情 + public function detail($id) + { + $detail = Db::name('Task')->where(['id' => $id])->find(); + if (!empty($detail)) { + $detail['product_name'] = ''; + $detail['project_name'] = ''; + if ($detail['project_id'] > 0) { + $project = Db::name('Project')->where(['id' => $detail['project_id']])->field('product_id,name')->find(); + $detail['product_name'] = Db::name('Product')->where(['id' => $project['product_id']])->value('name'); + $detail['project_name'] = $project['name']; + } + $detail['admin_name'] = Db::name('Admin')->where(['id' => $detail['admin_id']])->value('name'); + $detail['work_hours'] = Db::name('Schedule')->where(['delete_time' => 0, 'tid' => $detail['id']])->sum('labor_time'); + $detail['cate_name'] = Db::name('WorkCate')->where(['id' => $detail['cate']])->value('title'); + $detail['type_name'] = Db::name('TaskCate')->where(['id' => $detail['type']])->value('title'); + $find = Db::name('Admin')->where(['id' => $detail['director_uid']])->field('name,total_working_hours')->find(); + $detail['director_name'] = $find['name'] ?? ''; + $detail['assist_admin_names'] = ''; + if (!empty($detail['assist_admin_ids'])) { + $assist_admin_names = Db::name('Admin')->where('id', 'in', $detail['assist_admin_ids'])->column('name'); + $detail['assist_admin_names'] = implode(',', $assist_admin_names); + } + $detail['priority_name'] = self::$Priority[(int)$detail['priority']]; + $detail['flow_name'] = self::$FlowStatus[(int)$detail['flow_status']]; + $detail['times'] = time_trans($detail['create_time']); + $detail['end_time'] = date('Y-m-d H:i', $detail['end_time']); + $detail['delay'] = 0; + if ($detail['over_time'] > 0 && $detail['flow_status'] > 3 && $detail['initial_end_time'] < time()) { + $detail['delay'] = countDays(date('Y-m-d', $detail['initial_end_time']), date('Y-m-d', $detail['over_time'])); + } + if ($detail['over_time'] == 0 && $detail['flow_status'] < 2 && $detail['initial_end_time'] < time()) { + $detail['delay'] = countDays(date('Y-m-d', time()), $detail['initial_end_time']); + } + } + return $detail; + } +} + diff --git a/app/common/service/pay/WeChatPayService.php b/app/common/service/pay/WeChatPayService.php index 16c60cf0c..5e4ad3c2a 100755 --- a/app/common/service/pay/WeChatPayService.php +++ b/app/common/service/pay/WeChatPayService.php @@ -367,7 +367,7 @@ class WeChatPayService extends BasePayService $server = $this->app->getServer(); // 支付通知 $server->handlePaid(function (Message $message) { - Log::info('wechat pay notify', $message->toArray()); + Log::info('wechat pay notify', $message); if ($message['trade_state'] === 'SUCCESS') { $extra['transaction_id'] = $message['transaction_id']; $attach = $message['attach'];