领取优惠券逻辑修改

master
ck 5 years ago
parent ed654b1823
commit be4dd79ccc

@ -63,24 +63,25 @@ public class CouponServiceImpl extends BaseServiceImpl<CouponMapper, Coupon> imp
return ajaxResult; return ajaxResult;
}else { }else {
String phone = data.getString("phone"); String phone = data.getString("phone");
String code = data.getString("code"); String noteCode = data.getString("noteCode");
String receiverName = data.getString("receiverName"); String receiverName = data.getString("receiverName");
Boolean isAward = data.getBoolean("isAward"); Boolean isAward = data.getBoolean("isAward");
Integer letterId = data.getInteger("letterId"); String code = data.getString("data");
if (!isAward){ // Integer letterId = data.getInteger("letterId");
//如果是false情书id为必填 if (isAward){
if (letterId == null){ //如果是抽奖领券,微信code为必填
ajaxResult.setRetmsg("LETTERID MISSING"); if (StringUtils.isBlank(code)){
ajaxResult.setRetmsg("CODE MISSING");
ajaxResult.setRetcode(AjaxResult.FAILED); ajaxResult.setRetcode(AjaxResult.FAILED);
return ajaxResult; return ajaxResult;
} }
} }
if (StringUtils.isEmpty(phone)||StringUtils.isEmpty(code)){ if (StringUtils.isEmpty(phone)||StringUtils.isEmpty(noteCode)){
ajaxResult.setRetcode(AjaxResult.FAILED); ajaxResult.setRetcode(AjaxResult.FAILED);
ajaxResult.setRetmsg("PHONE OR CODE MISSING"); ajaxResult.setRetmsg("PHONE OR CODE MISSING");
return ajaxResult; return ajaxResult;
}else { }else {
if (code.equals(redisTemplate.opsForValue().get(phone))){ if (noteCode.equals(redisTemplate.opsForValue().get(phone))){
String token = MD5Utils.md5(tokenkey+df.format(new Date())); String token = MD5Utils.md5(tokenkey+df.format(new Date()));
//验证成功,领券 //验证成功,领券
JSONObject request = new JSONObject(); JSONObject request = new JSONObject();
@ -92,36 +93,18 @@ public class CouponServiceImpl extends BaseServiceImpl<CouponMapper, Coupon> imp
JSONObject resultJson = JSONObject.parseObject(result); JSONObject resultJson = JSONObject.parseObject(result);
if (resultJson.getBoolean("success")){ if (resultJson.getBoolean("success")){
Coupon coupon = new Coupon(); Coupon coupon = new Coupon();
Users users = usersMapper.selectOne(Wrappers.<Users>lambdaQuery().eq(Users::getPhone,phone) Users users;
.and(queryWrapper1 -> queryWrapper1.eq(Users::getState,1))); if (isAward){
if (users == null){ String unionId = "";
//新会员直接创 users = usersMapper.selectOne(Wrappers.<Users>lambdaQuery().eq(Users::getUnionId,unionId)
Users newUsers = new Users(); .and(queryWrapper1 -> queryWrapper1.eq(Users::getState,1)));
newUsers.setPhone(phone); users.setPhone(phone);
newUsers.setCreateDateTime(new Date()); usersMapper.insert(users);
newUsers.setUpdateDateTime(new Date());
if (isAward){
newUsers.setUserType(2);
}else {
newUsers.setUserType(1);
}
usersMapper.insert(newUsers);
coupon.setUserId(newUsers.getId());
if (!isAward){
//新用户绑定情书
LoveLetter loveLetter = loveLetterMapper.selectById(letterId);
loveLetter.setUserId(newUsers.getId());
loveLetterMapper.updateById(loveLetter);
}
}else { }else {
coupon.setUserId(users.getId()); users = usersMapper.selectOne(Wrappers.<Users>lambdaQuery().eq(Users::getPhone,phone)
if (!isAward){ .and(queryWrapper1 -> queryWrapper1.eq(Users::getState,1)));
//老用户绑定情书
LoveLetter loveLetter = loveLetterMapper.selectById(letterId);
loveLetter.setUserId(users.getId());
loveLetterMapper.updateById(loveLetter);
}
} }
coupon.setUserId(users.getId());
coupon.setCreateDateTime(new Date()); coupon.setCreateDateTime(new Date());
coupon.setUpdateDateTime(new Date()); coupon.setUpdateDateTime(new Date());
coupon.setReceiverName(receiverName); coupon.setReceiverName(receiverName);
@ -137,7 +120,7 @@ public class CouponServiceImpl extends BaseServiceImpl<CouponMapper, Coupon> imp
} }
}else { }else {
ajaxResult.setRetcode(AjaxResult.FAILED); ajaxResult.setRetcode(AjaxResult.FAILED);
ajaxResult.setRetmsg("ERROR CODE"); ajaxResult.setRetmsg("ERROR NOTECODE");
} }
return ajaxResult; return ajaxResult;
} }

Loading…
Cancel
Save