diff --git a/app/api/controller/User.php b/app/api/controller/User.php index 4e128081..c0073103 100644 --- a/app/api/controller/User.php +++ b/app/api/controller/User.php @@ -18,9 +18,13 @@ use app\api\model\user\GoodSource as GoodsSourceModel; use app\api\model\user\InvoiceOrder; use app\api\model\user\UserInvoice; use app\api\model\UserCoupon as UserCouponModel; +use app\api\model\Agreement as AgreementModel; use app\api\service\Feedback; use app\api\service\User as UserService; +use app\common\enum\dealer\withdraw\PayType; +use app\common\model\Agreement; use cores\exception\BaseException; +use think\facade\Log; use think\response\Json; /** @@ -144,8 +148,8 @@ class User extends Controller } $userData = [ 'user_id' => $userInfo->user_id, - 'user_name' => $userInfo->nick_name, - 'mobile' => $userInfo->mobile, + 'user_name' => $params['user_name'] ?? $userInfo->nick_name, + 'mobile' => $params['mobile'] ? substr_replace($params['mobile'], '****', 3, 4) : $userInfo->mobile, ]; $service = new Feedback(); $res = $service->addFeedback($params, $userData); @@ -192,15 +196,19 @@ class User extends Controller public function addInvoicing(): Json { $service = new UserInvoice(); - $list = $service->add($this->request->param()); + if (!$service->add($this->request->param())) { + return $this->renderSuccess($service->getError() ?: '操作失败'); + } return $this->renderSuccess('添加成功'); } - //发票抬头列表 + //发票抬头编辑 public function editInvoicing(): Json { $service = new UserInvoice(); - $list = $service->edit($this->request->param()); + if (!$service->edit($this->request->param())) { + return $this->renderSuccess($service->getError() ?: '操作失败'); + } return $this->renderSuccess('修改成功'); } @@ -240,4 +248,17 @@ class User extends Controller return $this->renderSuccess('提交成功，请耐心等待'); } + /** + * 个人中心协议 + */ + public function getAgreement(): Json { + $params = $this->request->param(); + $model = new AgreementModel(); + if (empty($params['type'])) { + return $this->renderSuccess("参数错误"); + } + $detail = $model->detail($params); + return $this->renderSuccess(compact('detail'), 'success'); + } + } diff --git a/app/api/controller/active.php b/app/api/controller/active.php new file mode 100644 index 00000000..388e2f02 --- /dev/null +++ b/app/api/controller/active.php @@ -0,0 +1,18 @@ +request->param(); + + } +} \ No newline at end of file diff --git a/app/api/model/Agreement.php b/app/api/model/Agreement.php new file mode 100644 index 00000000..f518c1c3 --- /dev/null +++ b/app/api/model/Agreement.php @@ -0,0 +1,48 @@ + +// +---------------------------------------------------------------------- +declare (strict_types=1); + +namespace app\api\model; + +use cores\BaseModel; +use think\model\relation\HasMany; +use think\model\relation\HasOne; +use app\common\model\store\Shop; +use app\common\model\Agreement as AgreementModel; + +/** + * 用户协议模型类 + * Class Agreement + * @package app\common\model + */ +class Agreement extends AgreementModel +{ + /** + * 隐藏字段 + * @var array + */ + protected $hidden = [ + 'add_user', + 'create_time', + 'store_id', + 'update_time' + ]; + + /** + * 协议类型 + * @param $params + * @return Agreement|array|null + */ + public function detail($params) { + return self::where('type', $params['type'])->find(); + } + +} diff --git a/app/api/service/Feedback.php b/app/api/service/Feedback.php index 9a3208b7..5f100e79 100644 --- a/app/api/service/Feedback.php +++ b/app/api/service/Feedback.php @@ -36,7 +36,8 @@ class Feedback extends BaseService 'mobile' => $user_data['mobile'], 'status' => 0, 'created_at' => time(), - 'shop_id' => $this->storeId, + 'store_id' => $this->storeId, + 'image_id' => $data['image_id'] ?? '' ]; $model = new UserFeedback(); return $model->insert($addData); @@ -53,6 +54,8 @@ class Feedback extends BaseService ->paginate($listRows)->toArray(); foreach ($list['data'] as $k => $v) { $list['data'][$k]['shop_name'] = !empty($v['shop']['shop_name']) ? $v['shop']['shop_name'] : ''; + $list['data'][$k]['created_at'] = !empty($v['created_at']) ? date('Y-m-d H:i:s', $v['created_at']) : ''; + $list['data'][$k]['replay_at'] = !empty($v['replay_at']) ? date('Y-m-d H:i:s', $v['replay_at']) : ''; unset($list['data'][$k]['shop']); } return $list; diff --git a/app/common/model/ActiveCol.php b/app/common/model/ActiveCol.php new file mode 100644 index 00000000..f5a0af0d --- /dev/null +++ b/app/common/model/ActiveCol.php @@ -0,0 +1,32 @@ + +// +---------------------------------------------------------------------- +declare (strict_types=1); + +namespace app\common\model; + +use cores\BaseModel; +use think\model\relation\HasOne; +use app\common\model\store\Shop; +/** + * 活动栏目模型类 + * Class User + * @package app\common\model + */ +class ActiveCol extends BaseModel +{ + // 定义表名 + protected $name = 'active_col'; + + // 定义主键 + protected $pk = 'id'; + + +} diff --git a/app/common/model/ActiveMain.php b/app/common/model/ActiveMain.php new file mode 100644 index 00000000..19dc3101 --- /dev/null +++ b/app/common/model/ActiveMain.php @@ -0,0 +1,42 @@ + +// +---------------------------------------------------------------------- +declare (strict_types=1); + +namespace app\common\model; + +use cores\BaseModel; +use think\model\relation\HasMany; +use think\model\relation\HasOne; +use app\common\model\store\Shop; +/** + * 活动模型类 + * Class User + * @package app\common\model + */ +class ActiveMain extends BaseModel +{ + // 定义表名 + protected $name = 'active_main'; + + // 定义主键 + protected $pk = 'id'; + + + /** + * 关联活动栏目 + * @return HasMany + */ + public function col(): HasMany + { + return $this->hasMany('activeCol', 'active_id', 'id'); + } + +} diff --git a/app/common/model/Agreement.php b/app/common/model/Agreement.php new file mode 100644 index 00000000..37af69a0 --- /dev/null +++ b/app/common/model/Agreement.php @@ -0,0 +1,33 @@ + +// +---------------------------------------------------------------------- +declare (strict_types=1); + +namespace app\common\model; + +use cores\BaseModel; +use think\model\relation\HasMany; +use think\model\relation\HasOne; +use app\common\model\store\Shop; +/** + * 用户协议模型类 + * Class User + * @package app\common\model + */ +class Agreement extends BaseModel +{ + // 定义表名 + protected $name = 'agreement'; + + // 定义主键 + protected $pk = 'id'; + + +}