diff --git a/mcwl-admin/src/main/java/com/mcwl/web/controller/pay/AliPay/OrderTradeController.java b/mcwl-admin/src/main/java/com/mcwl/web/controller/pay/AliPay/OrderTradeController.java index f7fdccf..2b767ca 100644 --- a/mcwl-admin/src/main/java/com/mcwl/web/controller/pay/AliPay/OrderTradeController.java +++ b/mcwl-admin/src/main/java/com/mcwl/web/controller/pay/AliPay/OrderTradeController.java @@ -90,7 +90,6 @@ public class OrderTradeController extends BaseController { return R.fail("用户未登录"); } orderTrade.setUserId(userId); - orderTrade.setCreateBy(getUsername()); return R.ok(orderTradeService.insertMallProduct(orderTrade)); } @@ -106,7 +105,6 @@ public class OrderTradeController extends BaseController { return R.fail("用户未登录"); } orderTrade.setUserId(userId); - orderTrade.setUpdateBy(getUsername()); orderTradeService.updateMallProduct(orderTrade); return R.ok(); } diff --git a/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/MallProductController.java b/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/MallProductController.java index 50d499d..96b55ac 100644 --- a/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/MallProductController.java +++ b/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/MallProductController.java @@ -89,7 +89,6 @@ public class MallProductController extends BaseController { ModelProduct modelProduct = requestModel.getModelProduct(); Long userId = SecurityUtils.getUserId(); modelProduct.setUserId(userId); - modelProduct.setCreateBy(getUsername()); return modelService.addModel(requestModel); } @@ -100,7 +99,6 @@ public class MallProductController extends BaseController { Long userId = SecurityUtils.getUserId(); modelProduct.setUserId(userId); - modelProduct.setUpdateBy(getUsername()); modelService.updaModel(requestModel); return AjaxResult.success("修改成功"); diff --git a/mcwl-common/src/main/java/com/mcwl/common/handler/MyMetaObjectHandler.java b/mcwl-common/src/main/java/com/mcwl/common/handler/MyMetaObjectHandler.java index c59718d..85f6a27 100644 --- a/mcwl-common/src/main/java/com/mcwl/common/handler/MyMetaObjectHandler.java +++ b/mcwl-common/src/main/java/com/mcwl/common/handler/MyMetaObjectHandler.java @@ -21,10 +21,11 @@ public class MyMetaObjectHandler implements MetaObjectHandler { @Override public void insertFill(MetaObject metaObject) { try { - this.strictInsertFill(metaObject, "createBy", String.class, SecurityUtils.getUsername()); + this.strictInsertFill(metaObject, "createBy", String.class, SecurityUtils.getLoginUser().getUser().getNickName()); } catch (Exception e) { this.strictInsertFill(metaObject, "createBy", String.class, ""); } + this.strictInsertFill(metaObject, "createTime", Date.class, new Date()); try { this.strictInsertFill(metaObject, "tenantId", Long.class, SecurityUtils.getUserId()); @@ -36,7 +37,7 @@ public class MyMetaObjectHandler implements MetaObjectHandler { @Override public void updateFill(MetaObject metaObject) { try { - this.setFieldValByName("updateBy", SecurityUtils.getUsername(), metaObject); + this.setFieldValByName("updateBy", SecurityUtils.getLoginUser().getUser().getNickName(), metaObject); } catch (Exception e) { this.setFieldValByName("updateBy", "", metaObject); } diff --git a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/PublishCommentServiceImpl.java b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/PublishCommentServiceImpl.java index 265d9aa..4760e4f 100644 --- a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/PublishCommentServiceImpl.java +++ b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/PublishCommentServiceImpl.java @@ -66,7 +66,7 @@ public class PublishCommentServiceImpl extends ServiceImpl impl BeanUtil.copyProperties(publish, publishVo); Long userId = publish.getUserId(); SysUser sysUser = sysUserService.selectUserById(userId); - publishVo.setUserName(sysUser.getUserName()); + publishVo.setUserName(sysUser.getNickName()); publishVo.setAvatar(sysUser.getAvatar()); return publishVo; } @@ -112,7 +112,7 @@ public class PublishServiceImpl extends ServiceImpl impl BeanUtil.copyProperties(publish, publishVo); Long userId = publish.getUserId(); SysUser sysUser = sysUserService.selectUserById(userId); - publishVo.setUserName(sysUser.getUserName()); + publishVo.setUserName(sysUser.getNickName()); publishVo.setAvatar(sysUser.getAvatar()); publishVoList.add(publishVo); } @@ -142,7 +142,7 @@ public class PublishServiceImpl extends ServiceImpl impl BeanUtil.copyProperties(publish, publishVo); Long userId = publish.getUserId(); SysUser sysUser = sysUserService.selectUserById(userId); - publishVo.setUserName(sysUser.getUserName()); + publishVo.setUserName(sysUser.getNickName()); publishVo.setAvatar(sysUser.getAvatar()); publishVoList.add(publishVo); } @@ -171,7 +171,7 @@ public class PublishServiceImpl extends ServiceImpl impl BeanUtil.copyProperties(publish, publishVo); Long userId = publish.getUserId(); SysUser sysUser = sysUserService.selectUserById(userId); - publishVo.setUserName(sysUser.getUserName()); + publishVo.setUserName(sysUser.getNickName()); publishVo.setAvatar(sysUser.getAvatar()); publishVoList.add(publishVo); } diff --git a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/QuestionServiceImpl.java b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/QuestionServiceImpl.java index 59b9b3f..e460882 100644 --- a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/QuestionServiceImpl.java +++ b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/QuestionServiceImpl.java @@ -130,7 +130,7 @@ public class QuestionServiceImpl extends ServiceImpl i BeanUtil.copyProperties(question, questionVo); Long questionUserId = question.getQuestionUserId(); SysUser sysUser = sysUserService.selectUserById(questionUserId); - questionVo.setQuestionUserName(sysUser.getUserName()); + questionVo.setQuestionUserName(sysUser.getNickName()); questionVo.setQuestionUserAvatar(sysUser.getAvatar()); questionVoList.add(questionVo); @@ -160,7 +160,7 @@ public class QuestionServiceImpl extends ServiceImpl i BeanUtil.copyProperties(question, questionVo); Long questionUserId = question.getQuestionUserId(); SysUser sysUser = sysUserService.selectUserById(questionUserId); - questionVo.setQuestionUserName(sysUser.getUserName()); + questionVo.setQuestionUserName(sysUser.getNickName()); questionVo.setQuestionUserAvatar(sysUser.getAvatar()); @@ -215,7 +215,7 @@ public class QuestionServiceImpl extends ServiceImpl i BeanUtil.copyProperties(question, questionVo); Long questionUserId = question.getQuestionUserId(); SysUser sysUser = sysUserService.selectUserById(questionUserId); - questionVo.setQuestionUserName(sysUser.getUserName()); + questionVo.setQuestionUserName(sysUser.getNickName()); questionVo.setQuestionUserAvatar(sysUser.getAvatar()); questionVoList.add(questionVo); diff --git a/mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/service/impl/MemberServiceImpl.java b/mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/service/impl/MemberServiceImpl.java index 3fd0fe8..fa25dbc 100644 --- a/mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/service/impl/MemberServiceImpl.java +++ b/mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/service/impl/MemberServiceImpl.java @@ -240,9 +240,6 @@ public class MemberServiceImpl extends ServiceImpl impleme memberConsume.setConsumePoints(consumePoints); memberConsume.setRemainingPoints(points - consumePoints); memberConsume.setConsumeTime(new Date()); - memberConsume.setCreateBy(SecurityUtils.getUsername()); - memberConsume.setUpdateBy(SecurityUtils.getUsername()); - memberConsume.setUpdateTime(new Date()); memberConsumeService.save(memberConsume); } diff --git a/mcwl-pay/src/main/java/com/mcwl/pay/service/impl/AliPayServiceImpl.java b/mcwl-pay/src/main/java/com/mcwl/pay/service/impl/AliPayServiceImpl.java index 575a848..603fc08 100644 --- a/mcwl-pay/src/main/java/com/mcwl/pay/service/impl/AliPayServiceImpl.java +++ b/mcwl-pay/src/main/java/com/mcwl/pay/service/impl/AliPayServiceImpl.java @@ -186,7 +186,7 @@ public class AliPayServiceImpl implements AliPayService { BeanUtil.copyProperties(orderTradeDto, tradeEntity); tradeEntity.setCode(UUID.randomUUID().toString(true).substring(0, 30) + "_member"); tradeEntity.setUserId(SecurityUtils.getUserId()); - tradeEntity.setUserName(SecurityUtils.getUsername()); + tradeEntity.setUserName(SecurityUtils.getLoginUser().getUser().getNickName()); tradeEntity.setProductId(productId); tradeEntity.setProductName(memberLevel.getMemberName()); tradeEntity.setTotalAmount(orderTradeDto.getAmount()); @@ -230,7 +230,7 @@ public class AliPayServiceImpl implements AliPayService { tradeEntity.setUserId(SecurityUtils.getUserId()); tradeEntity.setProductId(-1L); tradeEntity.setProductName("积分充值"); - tradeEntity.setUserName(SecurityUtils.getUsername()); + tradeEntity.setUserName(SecurityUtils.getLoginUser().getUser().getNickName()); tradeEntity.setTotalAmount(paymentAmount); tradeEntity.setOrderStatus(1); tradeEntity.setPayStatus(1); @@ -268,7 +268,7 @@ public class AliPayServiceImpl implements AliPayService { tradeEntity.setUserId(SecurityUtils.getUserId()); tradeEntity.setProductId(-1L); tradeEntity.setProductName("金币充值"); - tradeEntity.setUserName(SecurityUtils.getUsername()); + tradeEntity.setUserName(SecurityUtils.getLoginUser().getUser().getNickName()); tradeEntity.setTotalAmount(paymentAmount); tradeEntity.setOrderStatus(1); tradeEntity.setPayStatus(1); @@ -395,11 +395,11 @@ public class AliPayServiceImpl implements AliPayService { // 账户余额不足，发送邮件通知 ArrayList tos = CollUtil.newArrayList("2119157836@qq.com"); - String content = String.format("账户余额不足：用户%s提现%s", sysUser.getUserName(), amount); - MailUtil.send(tos, "上海辰风互娱", content, false); + String content = String.format("账户余额不足：用户%s提现%s", sysUser.getNickName(), amount); + MailUtil.send(tos, "魔创未来", content, false); throw new ServiceException("网络连接出错,请稍后再试"); } - System.out.println("用户" + SecurityUtils.getUsername() + "提现失败：" + response.getSubMsg()); + System.out.println("用户" + SecurityUtils.getLoginUser().getUser().getNickName() + "提现失败：" + response.getSubMsg()); throw new ServiceException("提现失败"); } diff --git a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelCommentLikeServiceImpl.java b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelCommentLikeServiceImpl.java index 6b759e0..d30743b 100644 --- a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelCommentLikeServiceImpl.java +++ b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelCommentLikeServiceImpl.java @@ -58,9 +58,6 @@ public class ModelCommentLikeServiceImpl extends ServiceImpl