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

doum

3 天以前 48d06fac940e6f28d599eb7fbf05c2cce41ecb30

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/InternalWebController.java

@@ -5,6 +5,7 @@
import com.doumee.config.annotation.LoginNoRequired;
import com.doumee.core.annotation.trace.Trace;
import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.service.business.third.model.LoginUserInfo;
import com.doumee.service.business.third.model.PageData;
import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
@@ -34,7 +35,7 @@
@RestController
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/web/member")
@Slf4j
@LoginNoRequired
//@LoginNoRequired
public class InternalWebController extends BaseController {

    @Autowired
@@ -99,9 +100,10 @@
     */
    @ApiOperation("取消预约")
    @GetMapping("/visitsCancel")
    @CloudRequiredPermission("business:visits:cancel")
//    @CloudRequiredPermission("business:visits:cancel")
    public ApiResponse visitsCancel(@RequestParam Integer visitId,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        visitsService.visitsCancel(visitId);
        LoginUserInfo loginUserInfo = getLoginUser(token);
        visitsService.visitsCancel(visitId,loginUserInfo);
        return ApiResponse.success(null);
    }