From 934528c6a682d3784115504f3d862b2e801e168d Mon Sep 17 00:00:00 2001 From: ck <851316342@qq.com> Date: Thu, 6 Aug 2020 16:03:25 +0800 Subject: [PATCH 1/2] =?UTF-8?q?1.platformlog=202.record=E7=BB=9F=E8=AE=A1(?= =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=9D=A5=E6=BA=90=E9=83=A8=E5=88=86,?= =?UTF-8?q?=E5=85=B6=E4=BB=96=E6=9D=A5=E6=BA=90=E5=BE=85=E7=A1=AE=E8=AE=A4?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/bsd/say/aop/LogAspect.java | 2 +- .../bsd/say/controller/WechatController.java | 1 + .../java/com/bsd/say/entities/Record.java | 47 +++++++++++++ .../java/com/bsd/say/mapper/RecordMapper.java | 9 +++ .../com/bsd/say/service/RecordService.java | 7 ++ .../service/impl/AwardListServiceImpl.java | 15 +++- .../say/service/impl/CouponServiceImpl.java | 26 +++++-- .../service/impl/LoveLetterServiceImpl.java | 68 ++++++++++++++++++- .../say/service/impl/RecordServiceImpl.java | 12 ++++ 9 files changed, 179 insertions(+), 8 deletions(-) create mode 100644 src/main/java/com/bsd/say/entities/Record.java create mode 100644 src/main/java/com/bsd/say/mapper/RecordMapper.java create mode 100644 src/main/java/com/bsd/say/service/RecordService.java create mode 100644 src/main/java/com/bsd/say/service/impl/RecordServiceImpl.java diff --git a/src/main/java/com/bsd/say/aop/LogAspect.java b/src/main/java/com/bsd/say/aop/LogAspect.java index 9e1a0ce..61b8d65 100644 --- a/src/main/java/com/bsd/say/aop/LogAspect.java +++ b/src/main/java/com/bsd/say/aop/LogAspect.java @@ -20,7 +20,7 @@ public class LogAspect { private Logger logger = LogUtils.getPlatformLogger(); - @Pointcut("execution(public * com.bsd.say.controller.*.*(..))") + @Pointcut("execution(public * com.bsd.say..controller.*.*(..))") public void webLog() { } diff --git a/src/main/java/com/bsd/say/controller/WechatController.java b/src/main/java/com/bsd/say/controller/WechatController.java index dd3ddf5..9e75d2f 100644 --- a/src/main/java/com/bsd/say/controller/WechatController.java +++ b/src/main/java/com/bsd/say/controller/WechatController.java @@ -105,6 +105,7 @@ public class WechatController { // log.error(e.getMessage(), e); e.printStackTrace(); } +// WeChatUtils.responseReplyMessage(response, "success"); output(response, "success"); } diff --git a/src/main/java/com/bsd/say/entities/Record.java b/src/main/java/com/bsd/say/entities/Record.java new file mode 100644 index 0000000..2eef701 --- /dev/null +++ b/src/main/java/com/bsd/say/entities/Record.java @@ -0,0 +1,47 @@ +package com.bsd.say.entities; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +/** + * 数据记录 + */ +@TableName("record") +@Data +public class Record extends BaseEntity{ + + private Long id; + + private String source; + + private String unionId; + + private String nickName; + + private String name; + + private String phone; + + private String fan; + + private int createLetterTimes; + + private int receiveLetterTimes; + + private String isHavaCoupon1;//是否有直接领取的优惠券 + + private String isUseCoupon1;//是否使用直接领取的优惠券 + + private String isHavaCoupon2;//是否有二等奖优惠券 + + private String isUseCoupon2;//二等奖优惠券是否使用 + + private String isAward;//是否中一等奖 + + private String awardName;//领一等奖人名 + + private String awardPhone;//领一等奖手机号 + + private String address;//领取一等奖地址 + +} diff --git a/src/main/java/com/bsd/say/mapper/RecordMapper.java b/src/main/java/com/bsd/say/mapper/RecordMapper.java new file mode 100644 index 0000000..29c296f --- /dev/null +++ b/src/main/java/com/bsd/say/mapper/RecordMapper.java @@ -0,0 +1,9 @@ +package com.bsd.say.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.bsd.say.entities.Record; +import org.springframework.stereotype.Repository; + +@Repository("recordMapper") +public interface RecordMapper extends BaseMapper { +} diff --git a/src/main/java/com/bsd/say/service/RecordService.java b/src/main/java/com/bsd/say/service/RecordService.java new file mode 100644 index 0000000..c221dd2 --- /dev/null +++ b/src/main/java/com/bsd/say/service/RecordService.java @@ -0,0 +1,7 @@ +package com.bsd.say.service; + +import com.bsd.say.entities.Record; + +public interface RecordService extends BaseService{ + +} diff --git a/src/main/java/com/bsd/say/service/impl/AwardListServiceImpl.java b/src/main/java/com/bsd/say/service/impl/AwardListServiceImpl.java index c60599c..d1e27f3 100644 --- a/src/main/java/com/bsd/say/service/impl/AwardListServiceImpl.java +++ b/src/main/java/com/bsd/say/service/impl/AwardListServiceImpl.java @@ -6,9 +6,11 @@ import com.bsd.say.beans.AjaxRequest; import com.bsd.say.beans.AjaxResult; import com.bsd.say.entities.AwardList; import com.bsd.say.entities.Coupon; +import com.bsd.say.entities.Record; import com.bsd.say.entities.Users; import com.bsd.say.mapper.AwardListMapper; import com.bsd.say.mapper.CouponMapper; +import com.bsd.say.mapper.RecordMapper; import com.bsd.say.mapper.UsersMapper; import com.bsd.say.service.AwardListService; import com.bsd.say.service.CouponService; @@ -36,6 +38,8 @@ public class AwardListServiceImpl extends BaseServiceImpllambdaQuery().eq(Record::getUnionId,unionId) + .and(queryWrapper1 -> queryWrapper1.eq(Record::getState,1))); + record.setIsAward("中奖"); + record.setAwardName(receiverName); + record.setAddress(address); + record.setAwardPhone(phone); + recordMapper.updateById(record); }else { //短信验证失败 ajaxResult.setRetmsg("FAIL"); @@ -218,7 +231,7 @@ public class AwardListServiceImpl extends BaseServiceImpl imp private LoveLetterMapper loveLetterMapper; @Resource private RedisTemplate redisTemplate; + @Resource + private RecordMapper recordMapper; @Override public CouponMapper getBaseMapper() { return this.couponMapper; @@ -101,17 +102,32 @@ public class CouponServiceImpl extends BaseServiceImpl imp users.setPhone(phone); users.setUpdateDateTime(new Date()); usersMapper.updateById(users); + //统计领取二等奖 + Record record = recordMapper.selectOne(Wrappers.lambdaQuery().eq(Record::getUnionId,unionId) + .and(queryWrapper1 -> queryWrapper1.eq(Record::getState,1))); + record.setIsHavaCoupon2("有"); + record.setUpdateDateTime(new Date()); + recordMapper.updateById(record); } else { if (StringUtils.isBlank(code)){ //来源H5 users = usersMapper.selectOne(Wrappers.lambdaQuery().eq(Users::getPhone,phone) .and(queryWrapper1 -> queryWrapper1.eq(Users::getState,1))); + + // h5的record + }else { //来源微信 String unionId = "123"; users = usersMapper.selectOne(Wrappers.lambdaQuery().eq(Users::getUnionId,unionId) .and(queryWrapper1 -> queryWrapper1.eq(Users::getState,1))); + + Record record = recordMapper.selectOne(Wrappers.lambdaQuery().eq(Record::getUnionId,unionId) + .and(queryWrapper1 -> queryWrapper1.eq(Record::getState,1))); + record.setIsHavaCoupon1("有"); + record.setUpdateDateTime(new Date()); + recordMapper.updateById(record); } coupon.setUserId(users.getId()); coupon.setCreateDateTime(new Date()); @@ -138,7 +154,7 @@ public class CouponServiceImpl extends BaseServiceImpl imp } /** - * 有没有领取过优惠券 领取优惠券手机号必传 + * 有没有领取过优惠券 * @param ajaxRequest * @return */ diff --git a/src/main/java/com/bsd/say/service/impl/LoveLetterServiceImpl.java b/src/main/java/com/bsd/say/service/impl/LoveLetterServiceImpl.java index ef45880..4a883cc 100644 --- a/src/main/java/com/bsd/say/service/impl/LoveLetterServiceImpl.java +++ b/src/main/java/com/bsd/say/service/impl/LoveLetterServiceImpl.java @@ -5,7 +5,9 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.bsd.say.beans.AjaxRequest; import com.bsd.say.beans.AjaxResult; import com.bsd.say.entities.LoveLetter; +import com.bsd.say.entities.Record; import com.bsd.say.mapper.LoveLetterMapper; +import com.bsd.say.mapper.RecordMapper; import com.bsd.say.service.LoveLetterService; import com.bsd.say.util.RandomUtils; import com.sun.org.apache.bcel.internal.generic.NEW; @@ -21,7 +23,8 @@ import java.util.Date; public class LoveLetterServiceImpl extends BaseServiceImpl implements LoveLetterService { @Autowired protected LoveLetterMapper loveLetterMapper; - + @Autowired + private RecordMapper recordMapper; @Override public LoveLetterMapper getBaseMapper() { return this.loveLetterMapper; @@ -45,6 +48,7 @@ public class LoveLetterServiceImpl extends BaseServiceImpllambdaQuery().eq(Record::getUnionId,unionId) + .and(queryWrapper1 -> queryWrapper1.eq(Record::getState,1))); + if (record == null){ + //新用户第一次生成情书 + Record record1 = new Record(); + record1.setSource("微信"); + record1.setUnionId(unionId); + /** + * 昵称等 。。。 + */ + record1.setCreateLetterTimes(1); + record1.setCreateDateTime(new Date()); + record1.setUpdateDateTime(new Date()); + recordMapper.insert(record1); + }else { + int createLetterTimes = record.getCreateLetterTimes(); + record.setCreateLetterTimes(createLetterTimes + 1); + record.setUpdateDateTime(new Date()); + recordMapper.updateById(record); + } + }else { + //非微信端来源，待确认 + + + + + } } ajaxResult.setRetcode(AjaxResult.SUCCESS); @@ -91,6 +126,7 @@ public class LoveLetterServiceImpl extends BaseServiceImpllambdaQuery().eq(Record::getUnionId,unionId) + .and(queryWrapper1 -> queryWrapper1.eq(Record::getState,1))); + if (record == null){ + //新用户第一次收到情书礼物 + Record record1 = new Record(); + record1.setSource("微信"); + record1.setUnionId(unionId); + + /** + * 昵称等 + */ + record1.setCreateDateTime(new Date()); + record1.setUpdateDateTime(new Date()); + record1.setReceiveLetterTimes(1); + recordMapper.insert(record1); + }else { + int receiveLetterTimes = record.getReceiveLetterTimes(); + record.setReceiveLetterTimes(receiveLetterTimes + 1); + record.setUpdateDateTime(new Date()); + recordMapper.updateById(record); + } + }else { + //非微信端待确认。。。 + + + } } return ajaxResult; diff --git a/src/main/java/com/bsd/say/service/impl/RecordServiceImpl.java b/src/main/java/com/bsd/say/service/impl/RecordServiceImpl.java new file mode 100644 index 0000000..65d235c --- /dev/null +++ b/src/main/java/com/bsd/say/service/impl/RecordServiceImpl.java @@ -0,0 +1,12 @@ +package com.bsd.say.service.impl; + +import com.bsd.say.entities.Record; +import com.bsd.say.mapper.RecordMapper; +import com.bsd.say.service.RecordService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service("recordService") +@Transactional +public class RecordServiceImpl extends BaseServiceImpl implements RecordService { +} From 76c329f9b692b5e06f34dcbd5dcfa1c4b5e9a265 Mon Sep 17 00:00:00 2001 From: ck <851316342@qq.com> Date: Thu, 6 Aug 2020 17:55:29 +0800 Subject: [PATCH 2/2] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0openID=202.=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=B9=8B=E5=89=8D=E8=AE=B0=E5=BD=95=E9=80=BB=E8=BE=91?= =?UTF-8?q?=203.=E8=BF=9B=E9=A6=96=E9=A1=B5=E5=B0=B1=E5=BC=80=E5=A7=8B?= =?UTF-8?q?=E8=AE=B0=E5=BD=95(=E6=9F=A5=E7=88=B1=E6=84=8F=E7=9A=84?= =?UTF-8?q?=E4=BA=BA=E6=B2=A1=E8=BF=9B=E9=A6=96=E9=A1=B5=EF=BC=8C=E8=BF=98?= =?UTF-8?q?=E6=98=AF=E5=8E=9F=E6=9D=A5=E9=80=BB=E8=BE=91)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bsd/say/controller/UsersController.java | 25 +++++++ .../java/com/bsd/say/entities/Record.java | 2 + .../com/bsd/say/service/RecordService.java | 3 + .../service/impl/LoveLetterServiceImpl.java | 28 +++----- .../say/service/impl/RecordServiceImpl.java | 71 +++++++++++++++++++ 5 files changed, 110 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/bsd/say/controller/UsersController.java b/src/main/java/com/bsd/say/controller/UsersController.java index fdda4d7..ae3ca9b 100644 --- a/src/main/java/com/bsd/say/controller/UsersController.java +++ b/src/main/java/com/bsd/say/controller/UsersController.java @@ -3,6 +3,7 @@ package com.bsd.say.controller; import com.bsd.say.beans.AjaxRequest; import com.bsd.say.beans.AjaxResult; import com.bsd.say.entities.Users; +import com.bsd.say.service.RecordService; import com.bsd.say.service.UsersService; import org.springframework.web.bind.annotation.*; @@ -14,12 +15,36 @@ import javax.annotation.Resource; public class UsersController extends BaseController{ @Resource private UsersService usersService; + @Resource + private RecordService recordService; @Override public UsersService getBaseService() { return super.getBaseService(); } + /** + * 进首页记录 + * @param ajaxRequest + * @return + */ + @RequestMapping(value = "/index-record") + @ResponseBody + public AjaxResult indexRecord(@RequestBody AjaxRequest ajaxRequest){ + + AjaxResult ajaxResult = new AjaxResult(); + try { + ajaxResult = recordService.createRecord(ajaxRequest); + } catch (Exception e) { + e.printStackTrace(); + String errMsg = e.getMessage() != null ? e.getMessage() : "操作失败"; + ajaxResult.setRetcode(AjaxResult.FAILED); + ajaxResult.setRetmsg(errMsg); + } + return ajaxResult; + } + + @RequestMapping(value = "/send-note") @ResponseBody public AjaxResult sendNote(@RequestBody AjaxRequest ajaxRequest){ diff --git a/src/main/java/com/bsd/say/entities/Record.java b/src/main/java/com/bsd/say/entities/Record.java index 2eef701..77507bf 100644 --- a/src/main/java/com/bsd/say/entities/Record.java +++ b/src/main/java/com/bsd/say/entities/Record.java @@ -14,6 +14,8 @@ public class Record extends BaseEntity{ private String source; + private String openId; + private String unionId; private String nickName; diff --git a/src/main/java/com/bsd/say/service/RecordService.java b/src/main/java/com/bsd/say/service/RecordService.java index c221dd2..4d2f3c7 100644 --- a/src/main/java/com/bsd/say/service/RecordService.java +++ b/src/main/java/com/bsd/say/service/RecordService.java @@ -1,7 +1,10 @@ package com.bsd.say.service; +import com.bsd.say.beans.AjaxRequest; +import com.bsd.say.beans.AjaxResult; import com.bsd.say.entities.Record; public interface RecordService extends BaseService{ + AjaxResult createRecord(AjaxRequest ajaxRequest); } diff --git a/src/main/java/com/bsd/say/service/impl/LoveLetterServiceImpl.java b/src/main/java/com/bsd/say/service/impl/LoveLetterServiceImpl.java index 4a883cc..58a40a3 100644 --- a/src/main/java/com/bsd/say/service/impl/LoveLetterServiceImpl.java +++ b/src/main/java/com/bsd/say/service/impl/LoveLetterServiceImpl.java @@ -80,24 +80,10 @@ public class LoveLetterServiceImpl extends BaseServiceImpllambdaQuery().eq(Record::getUnionId,unionId) .and(queryWrapper1 -> queryWrapper1.eq(Record::getState,1))); - if (record == null){ - //新用户第一次生成情书 - Record record1 = new Record(); - record1.setSource("微信"); - record1.setUnionId(unionId); - /** - * 昵称等 。。。 - */ - record1.setCreateLetterTimes(1); - record1.setCreateDateTime(new Date()); - record1.setUpdateDateTime(new Date()); - recordMapper.insert(record1); - }else { - int createLetterTimes = record.getCreateLetterTimes(); - record.setCreateLetterTimes(createLetterTimes + 1); - record.setUpdateDateTime(new Date()); - recordMapper.updateById(record); - } + int createLetterTimes = record.getCreateLetterTimes(); + record.setCreateLetterTimes(createLetterTimes + 1); + record.setUpdateDateTime(new Date()); + recordMapper.updateById(record); }else { //非微信端来源，待确认 @@ -152,10 +138,11 @@ public class LoveLetterServiceImpl extends BaseServiceImpl queryWrapper1.eq(Record::getState,1))); if (record == null){ //新用户第一次收到情书礼物 + String openId = "456"; Record record1 = new Record(); record1.setSource("微信"); record1.setUnionId(unionId); - + record1.setOpenId(openId); /** * 昵称等 */ @@ -164,6 +151,9 @@ public class LoveLetterServiceImpl extends BaseServiceImpl implements RecordService { + @Resource + private RecordMapper recordMapper; + + private Logger logger = LogUtils.getBussinessLogger(); + + @Override + public RecordMapper getBaseMapper() { + return this.recordMapper; + } + + + /** + * 访问首页的时候，去创建这个记录 + * @param ajaxRequest + * @return + */ + @Override + public AjaxResult createRecord(AjaxRequest ajaxRequest) { + AjaxResult ajaxResult = new AjaxResult(); + JSONObject data = ajaxRequest.getData(); + if (data == null){ + ajaxResult.setRetmsg("DATA MISSING"); + ajaxResult.setRetcode(AjaxResult.FAILED); + return ajaxResult; + } + else { + String code = data.getString("code"); + if (StringUtils.isNotEmpty(code)){ + //微信端 + String unionId = "123"; + Record record = recordMapper.selectOne(Wrappers.lambdaQuery().eq(Record::getUnionId,unionId) + .and(queryWrapper1 -> queryWrapper1.eq(Record::getState,1))); + if (record == null){ + //微信端新用户第一次访问 + String openId = "456"; + Record newRecord = new Record(); + newRecord.setOpenId(openId); + newRecord.setUnionId(unionId); + /** + * 昵称之类的 + */ + newRecord.setCreateDateTime(new Date()); + newRecord.setUpdateDateTime(new Date()); + newRecord.setSource("微信"); + recordMapper.insert(newRecord); + }else { + //不是第一次访问 + logger.info("unionId" + unionId); + /** + * 更新用户信息之类的 + */ + } + }else { + //非微信端待确认 + } + } + ajaxResult.setRetmsg("SUCCESS"); + ajaxResult.setRetcode(AjaxResult.SUCCESS); + return ajaxResult; + } }