ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppUserClientFallbackFactory.java
@@ -32,7 +32,7 @@ } @Override public R<Long> getCouponCount(Long userId, Long couponId) { public R<Long> getCouponCount(Long userId, Integer couponId) { log.error("获取优惠券数量失败：{}", cause.getMessage()); throw new RuntimeException("获取优惠券数量失败"); } ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/StoreClient.java
@@ -3,7 +3,6 @@ import com.ruoyi.common.core.constant.ServiceNameConstants; import com.ruoyi.common.core.domain.R; import com.ruoyi.other.api.domain.Shop; import com.ruoyi.other.api.factory.OrderFallbackFactory; import com.ruoyi.other.api.factory.StoreFallbackFactory; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; ruoyi-api/ruoyi-api-other/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -9,4 +9,6 @@ com.ruoyi.other.api.factory.OrderActivityInfoClientFallbackFactory com.ruoyi.other.api.factory.BaseSettingClientFallbackFactory com.ruoyi.other.api.factory.CouponInfoClientFallbackFactory com.ruoyi.other.api.factory.SystemConfigClientFallbackFactory com.ruoyi.other.api.factory.SystemConfigClientFallbackFactory com.ruoyi.other.api.factory.StoreFallbackFactory com.ruoyi.other.api.factory.CouponClientFallbackFactory ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
@@ -1,5 +1,6 @@ package com.ruoyi.auth.service; import com.ruoyi.system.api.RemoteUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import com.ruoyi.common.core.constant.CacheConstants; @@ -17,6 +18,7 @@ import com.ruoyi.system.api.domain.SysUser; import com.ruoyi.system.api.model.LoginUser; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; /** @@ -26,16 +28,16 @@ */ @Component public class SysLoginService { @Autowired @Resource private RemoteUserService remoteUserService; @Autowired @Resource private SysPasswordService passwordService; @Autowired @Resource private SysRecordLogService recordLogService; @Autowired @Resource private RedisService redisService; /** ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysRecordLogService.java
@@ -1,6 +1,7 @@ package com.ruoyi.auth.service; import com.ruoyi.system.api.domain.SysLoginLog; import com.ruoyi.system.api.feignClient.SysLoginLogClient; import org.springframework.stereotype.Component; import javax.annotation.Resource; ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java
@@ -5,7 +5,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import com.ruoyi.system.api.model.SysOperLog; import com.ruoyi.system.api.domain.SysOperLog; import org.apache.commons.lang3.ArrayUtils; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.AfterReturning; ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/service/AsyncLogService.java
@@ -1,6 +1,7 @@ package com.ruoyi.common.log.service; import com.ruoyi.system.api.model.SysOperLog; import com.ruoyi.system.api.RemoteLogService; import com.ruoyi.system.api.domain.SysOperLog; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import com.ruoyi.common.core.constant.SecurityConstants; ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java
@@ -1,6 +1,5 @@ package com.ruoyi.system.service.impl; import com.ruoyi.common.security.utils.DictUtils; import com.ruoyi.system.api.domain.SysDictData; import com.ruoyi.system.mapper.SysDictDataMapper; import com.ruoyi.system.service.ISysDictDataService; ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
@@ -46,7 +46,7 @@ @Api(tags = {"登录注册-小程序"}) @RestController @RequestMapping("/app-user") public class AppUserController { public class AppUserController extends BaseController {
File was deleted ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
@@ -6,8 +6,10 @@ import com.ruoyi.account.api.model.AppUser; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.web.controller.BaseController; import com.ruoyi.common.core.web.domain.AjaxResult; import com.ruoyi.common.security.utils.SecurityUtils; import com.ruoyi.other.api.domain.Shop; import com.ruoyi.other.api.domain.Technician; import com.ruoyi.other.enums.ShopStatus; import com.ruoyi.other.service.ShopService; import com.ruoyi.other.service.TechnicianService; ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianController.java
@@ -104,7 +104,7 @@ @PostMapping("/shop/tech") @ApiOperation(value = "预约操作", tags = {"小程序-门店详情-技师预约"}) public R<Technician> shoptech(@RequestBody TechnicianSubscribe subscribe){ Long userId = tokenService.getLoginUserApplet().getUserId(); Long userId = tokenService.getLoginUserApplet().getUserid(); subscribe.setAppUserId(userId); technicianSubscribeService.save(subscribe); return R.ok();
