Merge remote-tracking branch 'origin/dev' into dev

nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/MaTechnicianController.java

@@ -208,6 +208,7 @@ public class MaTechnicianController extends BaseController {
      * 商户忘记密码接口
      */
     @PostMapping("/resetPassword")
+    @ApiOperation("商户忘记密码接口")
     public Result<?> resetPassword(@RequestBody ThirdPartyLoginsVo thirdPartyLoginsVo) {
         // 核心正则表达式：
         // ^ 表示开头，$ 表示结尾
@@ -243,6 +244,7 @@ public class MaTechnicianController extends BaseController {
      * 校验图形验证码接口
      */
     @PostMapping("/getValidateCaptcha")
+    @ApiOperation("校验图形验证码接口")
     public Result<?> getValidateCaptcha(@RequestBody ValidateCaptchaDto req) {
         validateCaptcha(req.getPhone(), req.getCode(), req.getUuid());
         return Result.ok("校验成功");
@@ -252,6 +254,7 @@ public class MaTechnicianController extends BaseController {
      * 商户入驻申请接口
      */
     @PostMapping("/apply")
+    @ApiOperation("商户入驻申请接口")
     public Result<?> apply(@RequestBody MaTechnicianAppAddVo req) {
         // 1. 基础参数校验
         if (StringUtils.isAnyBlank(req.getTeName(), req.getTePhone(),  req.getAvatar())) {
@@ -311,6 +314,7 @@ public class MaTechnicianController extends BaseController {
      * @param req
      */
     @PostMapping("/applyFile")
+    @ApiOperation("申请技师文件")
     public Result applyFile(@RequestBody MerchantApplyFileRequestDto req) {
         maTechnicianService.applyFile(req);
         return Result.ok("上传成功");
@@ -320,6 +324,7 @@ public class MaTechnicianController extends BaseController {
      * 获取待接单列表：前端传技师实时经纬度筛选订单
      */
     @PostMapping("/wait/list")
+    @ApiOperation("获取待接单列表")
     public Result<List<WaitOrderDTO>> getWaitOrder(@RequestBody WaitOrderQueryDTO query) {
         List<WaitOrderDTO> list = maTechnicianService.listWaitOrder(query);
         return Result.ok(list);
@@ -330,6 +335,7 @@ public class MaTechnicianController extends BaseController {
      * 仅列表查询逻辑修正
      */
     @PostMapping("/accept")
+    @ApiOperation("滑动接单")
     public Result<String> acceptOrder(@RequestBody AcceptOrderReqDTO req) {
         String tip = maTechnicianService.acceptOrder(req);
         return Result.ok(tip);
@@ -340,6 +346,7 @@ public class MaTechnicianController extends BaseController {
      * 仅列表查询逻辑修正
      */
     @GetMapping("/rest/confirm")
+    @ApiOperation("确认接单")
     public Result<String> confirmRestAccept(@RequestParam Long techId, @RequestParam Long orderId) {
         String tip = maTechnicianService.confirmRestAccept(techId, orderId);
         return Result.ok(tip);
@@ -350,6 +357,7 @@ public class MaTechnicianController extends BaseController {
      * 仅列表查询逻辑修正
      */
     @PostMapping("/refuse")
+    @ApiOperation("拒绝接单")
     public Result<Void> refuseOrder(@RequestBody RefuseOrderReqDTO req) {
         maTechnicianService.refuseOrder(req);
         return Result.ok("拒绝成功");
@@ -361,6 +369,7 @@ public class MaTechnicianController extends BaseController {
      * @param
      */
     @GetMapping("/switchToOffline")
+    @ApiOperation("技师状态切换")
     public Result switchToOffline(@RequestParam Long userId, @RequestParam Boolean forceConfirm) {
         return maTechnicianService.switchToOffline(userId, forceConfirm);
     }
@@ -369,6 +378,7 @@ public class MaTechnicianController extends BaseController {
      * 查询商户信息接口
      */
     @GetMapping("/getTechnician")
+    @ApiOperation("查询商户信息接口")
     public Result<?> getTechnician(@RequestParam String openid) {
         LambdaQueryWrapper<MaTechnician> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(MaTechnician::getCOpenid, openid);
@@ -377,9 +387,10 @@ public class MaTechnicianController extends BaseController {
     }
 
     /**
-     * 修改和上传商户信息接口
+     * 修改商户信息接口
      */
     @PostMapping("/updateTechnician")
+    @ApiOperation("修改商户信息接口")
     public Result<?> updateTechnician(@RequestBody MaTechnicianAppAddVo req) {
         if (req.getAuditStatus() == 0 || req.getAuditStatus() == 3) {
             //修改基本信息
@@ -648,19 +659,21 @@ public class MaTechnicianController extends BaseController {
     }
 
     /**
-     * 1. 获取服务类目列表 (对应图1、图3)
+     * 1. 获取服务类目列表
      */
     @GetMapping("/getServiceCategoryList")
+    @ApiOperation("获取服务类目列表")
     public AjaxResult getServiceCategoryList() {
         List<ServiceCategory> list = serviceCategoryService.listH5ServiceCategory();
         return AjaxResult.success(list);
     }
 
     /**
-     * 1. 获取技能列表 (对应图1、图3)
-     * 支持 Tab 切换：all(全部), active(已开通), applying(申请中), rejected(驳回)
+     * 1. 获取技能列表
+     *
      */
     @PostMapping("/getSkillList")
+    @ApiOperation("获取技能列表")
     public Result<List<MaProject>> getSkillList(@RequestBody MaProjectGetVo req) {
 
         List<MaProject> list = maTechnicianService.selectMaTechnicianListBy(req.getUserId(), req.getAuditStatus());
@@ -674,6 +687,7 @@ public class MaTechnicianController extends BaseController {
      * @return
      */
     @PostMapping("/getNotApplyList")
+    @ApiOperation("查询未开通的服务项目列表")
     public Result<?> getNotApplyList(@RequestBody MaProjectGetVo req) {
 
         return Result.ok(maTechnicianService.getNotApplyList(req.getUserId(), req.getTypeId()));
@@ -684,6 +698,7 @@ public class MaTechnicianController extends BaseController {
      * 申请开通新服务
      */
     @PostMapping("/applyForService")
+    @ApiOperation("申请开通新服务")
     public AjaxResult applyForService(@RequestBody MaProjectSaveDto dto) {
 
         return toAjax(maTechnicianService.applyForService(dto));
@@ -696,6 +711,7 @@ public class MaTechnicianController extends BaseController {
      * @return
      */
     @PostMapping("/updateApply")
+    @ApiOperation("重新申请开通新服务")
     public Result<?> updateApply(@RequestBody MaProjectUpdateDto req) {
         if (StringUtils.isNotEmpty(req.getProjectId()) && StringUtils.isNotEmpty(req.getApplyReason())) {
             LambdaUpdateWrapper<MaProject> updateWrapper = new LambdaUpdateWrapper<>();
@@ -715,6 +731,7 @@ public class MaTechnicianController extends BaseController {
      * @return
      */
     @PostMapping("/updateMaProject")
+    @ApiOperation("申请下架,删除服务项目,编辑售价价格")
     public Result<?> updateMaProject(@RequestBody MaProjectUpdateDto req) {
         String message = "";
         if (StringUtils.isNotEmpty(req.getProjectId())) {
@@ -753,6 +770,7 @@ public class MaTechnicianController extends BaseController {
      */
 
     @GetMapping("/getTechnicianList")
+    @ApiOperation("商户入住信息")
     public Result<?> getTechnicianList(@RequestParam(value = "userId") Long userId) {
         return Result.ok(maTechnicianService.getTechnicianList(userId));
     }
@@ -765,6 +783,7 @@ public class MaTechnicianController extends BaseController {
      */
 
     @GetMapping("/getContractRecords")
+    @ApiOperation("查询商户合同记录信息")
     public Result<?> getContractRecords(@RequestParam(value = "userId") Long userId) {
         return Result.ok(maTechnicianService.getContractRecords(userId));
     }

nightFragrance-framework/src/main/java/com/ylx/framework/config/SecurityConfig.java

@@ -114,7 +114,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
                         "/wx/pay/payNotify", "/wx/pay/refundNotify", "/weChat/getAccessToken","/weChat/phoneLogin","/weChat/sendMsg", "/weChat/getCode", "/weChat/verifyToken", "/sq/getAccessToken",
                         "/area/select", "/system/dept/list", "/api/xiangmu/v1/wx/recommend", "/product/category/create","/area/code","/area/city","/product/category/list",
                         "/wx/pay/query/order/{outTradeNo}","/api/products/**","/api/user/point/**","/userCenter/userApp/queryBind","/weChat/uuidLogin","/couponReceive/getShareVolutionDetail",
-                        "/userCenter/userApp/bind/update","/serviceCategory/h5List","/api/lbt/v1/select","/sq/getTechnicianToken"
+                        "/userCenter/ugit credential rejectserApp/bind/update","/serviceCategory/h5List","/api/lbt/v1/select","/sq/getTechnicianToken"
                         ,"/technician/technician/clientLogin","/technician/technician/wait/list","/technician/technician/getServiceCategoryList"
                 ,"/technician/technician/getTechnician" ,"/technician/technician/getSkillList","/technician/technician/getTechnicianList"
                        ).permitAll()

nightFragrance-massage/src/main/java/com/ylx/fareSetting/controller/MaProjectFareSettingController.java

@@ -39,8 +39,8 @@ public class MaProjectFareSettingController {
      * 保存免车费设置
      */
     @PostMapping("/save")
+    @ApiOperation("保存免车费设置")
     public R<String> save(@RequestBody @Valid DriverFeeDTO dto) {
-
         maProjectFareSettingService.saveOrUpdateFee(dto);
         return R.ok("设置成功");
     }