From 0ce8c369e6c4e92174381ef12fcd288bac0d5eff Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 11 Jun 2019 16:37:16 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=B4=BB=E5=8A=A8=E6=8A=A5=E5=90=8D][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=8A=A5=E5=90=8D=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E4=B8=8D=E5=BF=85=E5=A1=AB=E5=AD=97=E6=AE=B5]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V201906111630__ALTER_ACTIVITY_JOIN.sql | 3 +++ .../com/iformall/service/impl/WxActivityJoinServiceImpl.java | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201906111630__ALTER_ACTIVITY_JOIN.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V201906111630__ALTER_ACTIVITY_JOIN.sql b/mallinkAdmin/src/main/resources/db/migration/V201906111630__ALTER_ACTIVITY_JOIN.sql new file mode 100644 index 000000000..9c2f8fc80 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201906111630__ALTER_ACTIVITY_JOIN.sql @@ -0,0 +1,3 @@ +alter table wx_activity_join +change column nick_name nick_name varchar(20) comment '昵称', +change column answer answer json comment '答案'; \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java index 4d6951b85..b219bacea 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java @@ -125,14 +125,15 @@ public class WxActivityJoinServiceImpl implements WxActivityJoinService { @Transactional(propagation = Propagation.REQUIRED, rollbackFor = {Exception.class}) @Override public ResultData join(WxActivityJoin wxActivityJoin) { + WxCUser user = wxCUserMapper.selectByPrimaryKey(wxActivityJoin.getUserId()); //保存到报名表中 final IdWorker idWorker = IdWorker.get(); wxActivityJoin.setId(idWorker.nextId()); + wxActivityJoin.setPhone(user.getPhone()); wxActivityJoinMapper.insertSelective(wxActivityJoin); //查询是否消耗积分 WxActivity wxActivity = wxActivityMapper.selectByPrimaryKey(wxActivityJoin.getActivityId()); if (wxActivity.getUseCredit().equals(EnumActivityUseCreditStatus.YES.getCode())) { - WxCUser user = wxCUserMapper.selectByPrimaryKey(wxActivityJoin.getUserId()); Integer userCredit = user.getCredit(); Integer credit = wxActivity.getCredit(); Map data = new HashMap<>();