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

sckw-auth/src/main/java/com/sckw/auth/controller/AuthController.java

@@ -177,6 +177,38 @@ public class AuthController {
         return HttpResult.ok(authService.login(reqVo));
     }
 
+
+    /**
+     * @param reqVo 注册
+     * @return HttpResult
+     * @desc: 用户注册
+     * @author: czh
+     * @date: 2023/6/16
+     */
+    @PostMapping("/register")
+    public HttpResult register(@Valid @RequestBody RegisterReqVo reqVo,
+                               @RequestHeader(name = "System-Type", required = true) int systemType) throws SystemException {
+        reqVo.setSystemType(systemType);
+        authService.register(reqVo);
+        return HttpResult.ok(HttpStatus.MSG_007);
+    }
+
+    /**
+     * @param reqVo 忘记密码入参
+     * @return HttpResult
+     * @desc: 忘记密码
+     * @author: czh
+     * @date: 2023/6/19
+     */
+    @PostMapping("/forgetPassword")
+    public HttpResult forgetPassword(@Valid @RequestBody ForgetPasswordReqVo reqVo,
+                                     @RequestHeader(name = "System-Type", required = true) int systemType) throws SystemException {
+        reqVo.setSystemType(systemType);
+        authService.forgetPassword(reqVo);
+        return HttpResult.ok(HttpStatus.MSG_002);
+    }
+
+
     /**
      * @param id 主键ID
      * @description 重置密码

sckw-auth/src/main/java/com/sckw/auth/service/IAuthService.java

@@ -25,6 +25,14 @@ public interface IAuthService {
      */
     void register(RegisterReqVo reqVo);
 
+    /**
+     * @param reqDto 忘记密码入参
+     * @desc: 忘记密码
+     * @author: czh
+     * @date: 2023/6/19
+     */
+    void forgetPassword(ForgetPasswordReqVo reqDto);
+
     /**
      * @param id 用户id
      * @desc: 重置密码

sckw-auth/src/main/java/com/sckw/auth/service/impl/AuthServiceImpl.java

@@ -190,6 +190,13 @@ public class AuthServiceImpl implements IAuthService {
     }
 
 
+    @Override
+    public void forgetPassword(ForgetPasswordReqVo reqDto) throws SystemException {
+        ForgetPasswordReqDto forgetPasswordReqDto = new ForgetPasswordReqDto();
+        BeanUtils.copyProperties(reqDto, forgetPasswordReqDto);
+        remoteUserService.forgetPassword(forgetPasswordReqDto);
+    }
+
     @Override
     public void resetPassword(Long id) {
         remoteUserService.resetPassword(id);

sckw-modules-api/sckw-system-api/src/main/java/com/sckw/system/api/RemoteUserService.java

@@ -98,6 +98,14 @@ public interface RemoteUserService {
     void saveUserLogin(UserLoginReqDto userLoginReqDto);
 
 
+    /**
+     * @param reqDto 忘记密码入参
+     * @desc: 忘记密码
+     * @author: czh
+     * @date: 2023/6/19
+     */
+    void forgetPassword(ForgetPasswordReqDto reqDto);
+
     /**
      * @param userId 用户id
      * @return 登录

sckw-modules/sckw-order/src/main/java/com/sckw/order/serivce/KwoTradeOrderTrackService.java

@@ -43,7 +43,7 @@ public class KwoTradeOrderTrackService {
      */
     public List<KwoTradeOrderTrack> getByOrderId(Long orderId) {
         LambdaQueryWrapper<KwoTradeOrderTrack> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(KwoTradeOrderTrack::getTOrderId,orderId).eq(KwoTradeOrderTrack::getDelFlag, Global.NO).last("LIMIT 1");
+        wrapper.eq(KwoTradeOrderTrack::getTOrderId,orderId).eq(KwoTradeOrderTrack::getDelFlag, Global.NO);
         List<KwoTradeOrderTrack> list = kwoTradeOrderTrackMapper.selectList(wrapper);
         return CollectionUtils.emptyIfNull(list);
     }

sckw-modules/sckw-system/src/main/java/com/sckw/system/dubbo/RemoteUserServiceImpl.java

@@ -89,6 +89,12 @@ public class RemoteUserServiceImpl implements RemoteUserService {
         return BeanUtils.copyToList(kwsMenuResVos, UserAccessMenuInfoResDto.class);
     }
 
+    @Override
+    public void forgetPassword(ForgetPasswordReqDto reqDto) throws SystemException {
+        com.sckw.system.model.vo.req.ForgetPasswordReqVo forgetPasswordReqVo = new ForgetPasswordReqVo();
+        BeanUtils.copyProperties(reqDto, forgetPasswordReqVo);
+        kwsUserService.forgetPassword(forgetPasswordReqVo);
+    }
 
     @Override
     public void saveUserLogin(UserLoginReqDto userLoginReqDto) {