记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit 7cd058ff authored by Administrator's avatar Administrator 🎨
Browse files
Options

Merge branch 'pre' into 'master' 

Pre

See merge request !18
parents be8c398b f512ac53
Hide whitespace changes
Inline Side-by-side
Showing with 60 additions and 38 deletions
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/constant/SweetConstant.java
View file @ 7cd058ff
......@@ -15,6 +15,7 @@ public class SweetConstant {
public final static String REDIS_KEY_SWEET_SHOP = "sweet:artists:shop:manual:";
public final static String REDIS_KEY_SWEET_LUCK_DRAW = "sweet:luckDraw:mobile:";
public final static String REDIS_KEY_SWEET_LUCK_DRAW_RESULT = "sweet:luckDraw:num:";
public final static String REDIS_KEY_SWEET_LUCK_DRAW_SURPLUS = "sweet:luckDraw:num:";//中奖库存
public final static String REDIS_KEY_SWEET_LUCK_DRAW_ALL = "sweet:luckDraw:num:";//中奖总量
public final static String REDIS_KEY_SWEET_LUCK_DRAW_PRESENT_MOBILE = "sweet:luckDraw:present:mobile:";//中奖库存
......
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetAppletController.java
View file @ 7cd058ff
......@@ -336,6 +336,7 @@ public class SweetAppletController {
HashMap<String, Integer> hashMap = CollectionUtil.mapStringInteger();
hashMap.put("count", redisDataUtils.getLuckDrawStatus(mobile, luckDrawNum));
hashMap.put("prize", redisDataUtils.getLuckDrawResult(mobile, luckDrawNum));
return ResponseDto.success(hashMap);
}
......
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetWechatSyncDataController.java
View file @ 7cd058ff
......@@ -6,6 +6,7 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
......@@ -19,6 +20,7 @@ import java.io.*;
@Api(tags = "同步微信用户数据")
@RestController
@RequestMapping("/wechatSync")
@Slf4j
public class SweetWechatSyncDataController {
@Autowired
......@@ -35,8 +37,7 @@ public class SweetWechatSyncDataController {
BufferedReader bufferedReader = new BufferedReader(read);
String mobile = null;
while ((mobile = bufferedReader.readLine()) != null) {
System.out.println(mobile);
log.info("regMobilen：mobile：[{}]", mobile);
try {
MultiValueMap<String, String> params = new LinkedMultiValueMap();
params.add("mobile", mobile);
......@@ -46,7 +47,7 @@ public class SweetWechatSyncDataController {
String url = "";
HttpUtil.post(url, params);
} catch (Exception e) {
e.printStackTrace();
log.info("regMobileException：mobile：[{}]", mobile);
}
}
......@@ -62,7 +63,7 @@ public class SweetWechatSyncDataController {
try {
sweetWechatMpService.userInfo();
} catch (Exception e) {
e.printStackTrace();
log.error("getUsers", e);
}
}
......@@ -75,7 +76,7 @@ public class SweetWechatSyncDataController {
try {
sweetWechatMpService.getUser(openId);
} catch (Exception e) {
e.printStackTrace();
log.error("getUser", e);
}
}
......
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetWechatMpService.java
View file @ 7cd058ff
......@@ -47,42 +47,49 @@ public class SweetWechatMpService {
log.info("nextOpenid：[{}] ", nextOpenid);
for (String openId : openids) {
WxMpUser wxMpUser = wxMpService.getUserService().userInfo(openId);
log.info("openId：[{}],wxMpUsers：[{}]", openId, wxMpUser);
SweetWechatUser userInfo = redisDataUtils.getSweetWechatUser(wxMpUser.getUnionId());
if (null == userInfo) {
SweetWechatUser sweetWechatUser = SweetWechatUser.getNew();
sweetWechatUser.setOpenId(wxMpUser.getOpenId());
sweetWechatUser.setUnionId(wxMpUser.getUnionId());
sweetWechatUser.setNickname(wxMpUser.getNickname());
sweetWechatUser.setSexDesc(wxMpUser.getSexDesc());
sweetWechatUser.setSex(wxMpUser.getSex());
sweetWechatUser.setHeadImgUrl(wxMpUser.getHeadImgUrl());
sweetWechatUser.setLanguage(wxMpUser.getLanguage());
sweetWechatUser.setCountry(wxMpUser.getCountry());
sweetWechatUser.setProvince(wxMpUser.getProvince());
sweetWechatUser.setCity(wxMpUser.getCity());
sweetWechatUser.setSubscribeTime(DateUtil.ofEpochMilli(wxMpUser.getSubscribeTime()));
sweetWechatUser.setSubscribeScene(wxMpUser.getSubscribeScene());
sweetWechatUser.setUserId(IDGenerator.nextSnowId());
LinkedList<String> sqls = CollectionUtil.linkedListString();
LinkedList<Object[]> sqlsDataA = CollectionUtil.linkedListObjectArr();
sqls.add(SqlMapping.get("sweet_user.insert"));
sqlsDataA.add(new Object[]{
sweetWechatUser.getUserId(), sweetWechatUser.getOpenId(), sweetWechatUser.getUnionId(), sweetWechatUser.getNickname(),
sweetWechatUser.getSexDesc(), sweetWechatUser.getSex(), sweetWechatUser.getHeadImgUrl(), sweetWechatUser.getLanguage(),
sweetWechatUser.getCountry(), sweetWechatUser.getProvince(), sweetWechatUser.getCity(),
sweetWechatUser.getSubscribeTime(), sweetWechatUser.getSubscribeScene()
});
queueUtils.sendMsgByRedis(MQConst.SweetQueue.SWEET_USER_INSERT_DRAW.getKey(),
SqlMapping.gets(sqls, sqlsDataA));
// 入缓存
redisDataUtils.setSweetWechatUser(sweetWechatUser);
try {
WxMpUser wxMpUser = wxMpService.getUserService().userInfo(openId);
if (!wxMpUser.getSubscribe()) {
log.info("getSubscribeFalse：openId：[{}]", openId);
continue;
}
SweetWechatUser userInfo = redisDataUtils.getSweetWechatUser(wxMpUser.getUnionId());
if (null == userInfo) {
SweetWechatUser sweetWechatUser = SweetWechatUser.getNew();
sweetWechatUser.setOpenId(wxMpUser.getOpenId());
sweetWechatUser.setUnionId(wxMpUser.getUnionId());
sweetWechatUser.setNickname(wxMpUser.getNickname());
sweetWechatUser.setSexDesc(wxMpUser.getSexDesc());
sweetWechatUser.setSex(wxMpUser.getSex());
sweetWechatUser.setHeadImgUrl(wxMpUser.getHeadImgUrl());
sweetWechatUser.setLanguage(wxMpUser.getLanguage());
sweetWechatUser.setCountry(wxMpUser.getCountry());
sweetWechatUser.setProvince(wxMpUser.getProvince());
sweetWechatUser.setCity(wxMpUser.getCity());
sweetWechatUser.setSubscribeTime(DateUtil.ofEpochMilli(wxMpUser.getSubscribeTime()));
sweetWechatUser.setSubscribeScene(wxMpUser.getSubscribeScene());
sweetWechatUser.setUserId(IDGenerator.nextSnowId());
LinkedList<String> sqls = CollectionUtil.linkedListString();
LinkedList<Object[]> sqlsDataA = CollectionUtil.linkedListObjectArr();
sqls.add(SqlMapping.get("sweet_user.insert"));
sqlsDataA.add(new Object[]{
sweetWechatUser.getUserId(), sweetWechatUser.getOpenId(), sweetWechatUser.getUnionId(), sweetWechatUser.getNickname(),
sweetWechatUser.getSexDesc(), sweetWechatUser.getSex(), sweetWechatUser.getHeadImgUrl(), sweetWechatUser.getLanguage(),
sweetWechatUser.getCountry(), sweetWechatUser.getProvince(), sweetWechatUser.getCity(),
sweetWechatUser.getSubscribeTime(), sweetWechatUser.getSubscribeScene()
});
queueUtils.sendMsgByRedis(MQConst.SweetQueue.SWEET_USER_INSERT_DRAW.getKey(),
SqlMapping.gets(sqls, sqlsDataA));
// 入缓存
redisDataUtils.setSweetWechatUser(sweetWechatUser);
}
} catch (Exception e) {
log.info("forException：openId：[{}]", openId);
}
}
log.info("nextOpenidSuccess：[{}] ", nextOpenid);
} while (!nextOpenid.isEmpty());
log.info("同步微信用户完成");
}
public void getUser(String openId) throws WxErrorException {
......
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/utils/RedisDataUtils.java
View file @ 7cd058ff
......@@ -404,6 +404,17 @@ public class RedisDataUtils {
}
}
//获取抽奖状态
public int getLuckDrawResult(String mobile, String luckDrawNum) {
String redisKey = SweetConstant.REDIS_KEY_SWEET_LUCK_DRAW_RESULT.concat(luckDrawNum).concat(":mobile:" + mobile);
Object obj = redisUtil.get(redisKey);
if(obj==null){
return 0;
}else{
return (int) redisUtil.get(redisKey);
}
}
//修改抽奖状态
public SweetPrizeVo changeLuckDrawStatus(String mobile, String unionId,String luckDrawNum) {
LinkedList<String> sqls = CollectionUtil.linkedListString();
......@@ -444,6 +455,7 @@ public class RedisDataUtils {
if (surplus < prizeALl) {
prize = (int) redisUtil.incr(redisSurplus, 1);
redisUtil.set(redisKey, 2);
redisUtil.set(SweetConstant.REDIS_KEY_SWEET_LUCK_DRAW_RESULT.concat(luckDrawNum).concat(":mobile:" + mobile),prize);
}
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment