TASK:新的试用订单生成;
This commit is contained in:
@@ -51,8 +51,8 @@ public class AccountController {
|
|||||||
|
|
||||||
@ApiOperation(value = "绑定邮箱")
|
@ApiOperation(value = "绑定邮箱")
|
||||||
@PostMapping("/bindEmail")
|
@PostMapping("/bindEmail")
|
||||||
public Response<BindEmailVO> bindEmail(@Valid @RequestBody AccountBindEmailDTO accountBindEmailDTO) {
|
public Response<BindEmailVO> bindEmail(@Valid @RequestBody AccountBindEmailDTO accountBindEmailDTO, HttpServletRequest request) {
|
||||||
return Response.success(accountService.bindEmail(accountBindEmailDTO));
|
return Response.success(accountService.bindEmail(accountBindEmailDTO, request));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ApiOperation(value = "忘记密码")
|
@ApiOperation(value = "忘记密码")
|
||||||
|
|||||||
@@ -48,7 +48,7 @@ public interface AccountService extends IService<Account> {
|
|||||||
* @param accountBindEmailDTO
|
* @param accountBindEmailDTO
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
BindEmailVO bindEmail(AccountBindEmailDTO accountBindEmailDTO);
|
BindEmailVO bindEmail(AccountBindEmailDTO accountBindEmailDTO, HttpServletRequest request);
|
||||||
|
|
||||||
BindEmailVO bindEmail(String email);
|
BindEmailVO bindEmail(String email);
|
||||||
|
|
||||||
|
|||||||
@@ -288,7 +288,7 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public BindEmailVO bindEmail(AccountBindEmailDTO accountBindEmailDTO) {
|
public BindEmailVO bindEmail(AccountBindEmailDTO accountBindEmailDTO, HttpServletRequest request) {
|
||||||
AuthPrincipalVo userHolder = UserContext.getUserHolder();
|
AuthPrincipalVo userHolder = UserContext.getUserHolder();
|
||||||
Account account = accountMapper.selectById(userHolder.getId());
|
Account account = accountMapper.selectById(userHolder.getId());
|
||||||
|
|
||||||
@@ -335,6 +335,15 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
|
|||||||
Account accountNew = accountMapper.selectById(userHolder.getId());
|
Account accountNew = accountMapper.selectById(userHolder.getId());
|
||||||
accountNew.setUserEmail(accountBindEmailDTO.getUserEmail());
|
accountNew.setUserEmail(accountBindEmailDTO.getUserEmail());
|
||||||
accountMapper.updateById(accountNew);
|
accountMapper.updateById(accountNew);
|
||||||
|
|
||||||
|
TrialOrder trialOrder = CopyUtil.copyObject(accountNew, TrialOrder.class);
|
||||||
|
trialOrder.setCreateTime(LocalDateTime.now());
|
||||||
|
trialOrder.setStatus(1);
|
||||||
|
// 获取用户申请试用IP
|
||||||
|
String ipAddress = RequestInfoUtil.getIpAddress(request);
|
||||||
|
trialOrder.setIp(ipAddress);
|
||||||
|
trialOrderMapper.insert(trialOrder);
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user