Merge remote-tracking branch 'origin/master'

luodangjia

2024-12-09 5728732f45cc45f3c5cbde0abe7a7c5efee605b9

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianController.java

@@ -1,27 +1,22 @@
package com.ruoyi.other.controller;


import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.core.web.page.TableDataInfo;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.other.api.feignClient.OrderClient;
import com.ruoyi.other.service.GoodsEvaluateService;
import com.ruoyi.other.api.domain.TechnicianScore;
import com.ruoyi.other.service.TechnicianScoreService;
import com.ruoyi.other.service.TechnicianService;
import com.ruoyi.other.service.TechnicianSubscribeService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;

import javax.annotation.Resource;
import java.util.List;

import com.ruoyi.other.vo.TechnicianDetailVO;
import com.ruoyi.other.vo.TechnicianVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

/**
 * <p>
@@ -38,13 +33,10 @@
    @Resource
    private TechnicianService technicianService;
    @Resource
    private GoodsEvaluateService goodsEvaluateService;
    @Resource
    private OrderClient orderClient;
    @Resource
    private TechnicianSubscribeService technicianSubscribeService;
    private TechnicianScoreService technicianScoreService;
    @Resource
    private TokenService tokenService;

//        @PostMapping("/shop/list")
//   @ApiOperation(value = "获取门店的技师列表", tags = {"小程序-门店详情-技师预约"})
//   public R<Page<Technician>> shoplist(@RequestParam Integer shopId,@RequestParam Integer pageNum,@RequestParam Integer pageSize){
@@ -120,5 +112,23 @@
    public R<TechnicianDetailVO> technicianDetail(@ApiParam("技师id") @RequestParam Long technicianId) {
        return R.ok(technicianService.technicianDetail(technicianId));
    }

    /**
     * 打分
     */
    @PostMapping("/grade")
    @ApiOperation(value = "打分", tags = {"打分-小程序"})
    public R<Void> grade(@RequestBody TechnicianScore technicianScore) {
        Long userid = tokenService.getLoginUserApplet().getUserid();
        TechnicianScore technicianScoreServiceOne = technicianScoreService.getOne(new LambdaQueryWrapper<TechnicianScore>()
                .eq(TechnicianScore::getAppUserId, userid)
                .eq(TechnicianScore::getTechnicianId, technicianScore.getTechnicianId()));
        if (technicianScoreServiceOne != null) {
            return R.fail("已打过分，无法再次打分");
        }
        technicianScore.setAppUserId(userid);
        technicianScoreService.save(technicianScore);
        return R.ok();
    }
}