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

Skip to content

L
liquidnet-bus-v1
Commit 9418d3ca authored by sunyuntian's avatar sunyuntian
Browse files
Options

Merge branch 'dev_20111115' of... 

Merge branch 'dev_20111115' of http://gitlab.zhengzai.tv/dongjingwei/liquidnet-bus-v1 into dev_20111115
parents 2d818bba 72c09f49
Hide whitespace changes
Inline Side-by-side
Showing with 61 additions and 41 deletions
liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/constant/SweetConstant.java
View file @ 9418d3ca
......@@ -55,9 +55,11 @@ public class SweetConstant {
public final static String REDIS_KEY_SWEET_WECHAT_USER_UNIONID_PHONE_MODERNSKY = "sweet:wechatUser:modernsky:phone:";
public final static String REDIS_KEY_SWEET_WECHAT_USER_UNIONID_UID = "sweet:wechatUser:zhengzai:uid:";
public final static String REDIS_KEY_SWEET_WECHAT_USER_UNIONID_UID_MODERNSKY = "sweet:wechatUser:modernsky:uid:";
// 微信用户相关 新
public final static String REDIS_KEY_SWEET_WECHAT_USERS = "sweet:user:service:unionId:";
// 微信服务号用户相关 新
public final static String REDIS_KEY_SWEET_WECHAT_USERS_UNIONID = "sweet:user:service:unionId:";
public final static String REDIS_KEY_SWEET_WECHAT_USERS_OPENID = "sweet:user:service:openId:";
public final static String REDIS_KEY_SWEET_WECHAT_USERS_TYPE = ":type:";
public final static String REDIS_KEY_SWEET_WECHAT_USERS_UNIONID = "sweet:user:service:openId:";
// 微信小程序用户相关 新
public final static String REDIS_KEY_SWEET_APPLET_USERS_PHONE = "sweet:user:applet:mobile:";
public final static String REDIS_KEY_SWEET_APPLET_USERS_UNIONID = "sweet:user:applet:unionid:";
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinOrderTicketsMapper.xml
View file @ 9418d3ca
......@@ -344,7 +344,7 @@
</if>
<if test="expressStatus == 80">AND (oe.express_status = 80 OR oe.express_status = 8000)</if>
<if test="mailno != ''">AND oe.mailno LIKE concat('%', #{mailno}, '%')</if>
<if test="ticketsId != '' and ticketsId != null">AND kotr.ticket_id = ${ticketsId} </if>
<if test="ticketsId != '' and ticketsId != null">AND kotr.ticket_id = ${ticketsId}</if>
</where>
ORDER BY kot.mid DESC
</select>
......@@ -399,7 +399,7 @@
<select id="getOrderScore" resultType="Integer">
select sum(price_actual) from kylin_order_tickets kot
select IFNULL(sum(price_actual),0) from kylin_order_tickets kot
inner join kylin_order_ticket_relations as kotr on kotr.order_id = kot.order_tickets_id
inner join kylin_order_ticket_status as kots on kots.order_id = kot.order_tickets_id
inner join kylin_order_ticket_entities as kote on kote.order_id = kot.order_tickets_id
......
liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-sweet/src/main/java/com/liquidnet/service/consumer/sweet/service/impl/SweetWechatTemplateMsgServiceImpl.java
View file @ 9418d3ca
......@@ -108,7 +108,7 @@ public class SweetWechatTemplateMsgServiceImpl {
return "";
} else {
SweetAppletUsers sweetAppletUser = sweetAppletUsers.get(0);
SweetWechatUsersVo sweetWechatUsers = redisDataUtils.getSweetWechatUsers(sweetAppletUser.getUnionId(), 1);
SweetWechatUsersVo sweetWechatUsers = redisDataUtils.getSweetWechatUsersOfUnionId(sweetAppletUser.getUnionId(), 1);
if (null == sweetWechatUsers) {
log.info("getOpenId没有此WechatUser用户：[phone={},unionId={}]", phone, sweetAppletUser.getUnionId());
return "";
......
liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-sweet/src/main/java/com/liquidnet/service/consumer/sweet/utils/RedisDataUtils.java
View file @ 9418d3ca
......@@ -15,8 +15,8 @@ public class RedisDataUtils {
@Autowired
private RedisUtil redisUtil;
public SweetWechatUsersVo getSweetWechatUsers(String unionId, Integer type) {
String redisKey = SweetConstant.REDIS_KEY_SWEET_WECHAT_USERS.concat(unionId)
public SweetWechatUsersVo getSweetWechatUsersOfUnionId(String unionId, Integer type) {
String redisKey = SweetConstant.REDIS_KEY_SWEET_WECHAT_USERS_UNIONID.concat(unionId)
.concat(SweetConstant.REDIS_KEY_SWEET_WECHAT_USERS_TYPE).concat(String.valueOf(type));
Object obj = redisUtil.get(redisKey);
if (null == obj) {
......
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/kylin/DataImpl.java
View file @ 9418d3ca
......@@ -43,7 +43,7 @@ import java.util.List;
public class DataImpl {
@Value("${liquidnet.service.stone.url}")
private String stoneUrl ;
private String stoneUrl;
@Autowired
private MongoTemplate mongoTemplate;
......@@ -66,9 +66,9 @@ public class DataImpl {
//查询全部用户
List<AdamUser> adamUserList = userMapper.selectList(Wrappers.lambdaQuery(AdamUser.class).eq(AdamUser::getState, 1)
.select(AdamUser::getUid).last("limit " + ((page - 1) * size) + "," + ((page) * size)));
log.info("AdamUserSize = "+adamUserList.size());
log.info("AdamUserSize = " + adamUserList.size());
int finishCount = 0;
for (AdamUser item : adamUserList) {
int finishCount = 0;
//获取用户相关信息
String uid = item.getUid();
String mobile = item.getMobile();
......@@ -96,9 +96,13 @@ public class DataImpl {
Integer performancePrice = orderTicketsMapper.getOrderScore(uid);
score += (performancePrice.intValue() / 100);
//获取商品每日任务积分
String resultData = HttpUtil.get("http://testmall.zhengzai.tv/admin/sumUserCost?user_id=" + 1, null);
String resultData = HttpUtil.get("http://devmall.zhengzai.tv/admin/sumUserCost?user_id=" + 1, null);
int goodsPrice = (int) JSONObject.parseObject(resultData).get("cost");
score += (goodsPrice / 100);
try {
score += (goodsPrice / 100);
}catch (Exception e){
}
//获取 关注摩登天空服务号
if (getUnionIdByPhone(mobile) != null) {
......@@ -138,10 +142,11 @@ public class DataImpl {
params.add("content", "历史积分");
HttpUtil.post(stoneUrl + "/user/logs/in2111", params);
}
finishCount+=1;
log.info("finishCount = "+finishCount);
finishCount += 1;
}
log.info("完成次数 = " + finishCount);
} catch (Exception e) {
log.info("异常 : {} ", e);
e.printStackTrace();
return false;
}
......@@ -239,20 +244,20 @@ public class DataImpl {
logs.setUid(uid);
logs.setScore(item.getScore());
logs.setCreatedAt(item.getCreatedAt());
if(item.getScore().intValue()<0){
scoreUse+=item.getScore().negate().intValue();
}else{
scoreAll+=item.getScore().intValue();
if (item.getScore().intValue() < 0) {
scoreUse += item.getScore().negate().intValue();
} else {
scoreAll += item.getScore().intValue();
}
logCreate(logs);
}
//初始化 redis
List<StoneScoreLogs> getLogsList = (List<StoneScoreLogs>) logList(uid, 1, 40).get("data");
redisDataSourceUtil.getRedisStoneUtil().set(redisKey,getLogsList);
redisDataSourceUtil.getRedisStoneUtil().set(redisKey, getLogsList);
String restKey = StoneConstant.USER.concat(uid).concat(StoneConstant.SURPLUS_SCORE);
String useKey = StoneConstant.USER.concat(uid).concat(StoneConstant.USE_SCORE);
redisDataSourceUtil.getRedisStoneUtil().set(useKey,scoreUse);
redisDataSourceUtil.getRedisStoneUtil().set(restKey,scoreAll-scoreUse);
redisDataSourceUtil.getRedisStoneUtil().set(useKey, scoreUse);
redisDataSourceUtil.getRedisStoneUtil().set(restKey, scoreAll - scoreUse);
return true;
}
......@@ -274,7 +279,7 @@ public class DataImpl {
}
SweetAppletUsersVo sweetAppletUsers = (SweetAppletUsersVo) obj;
String redisKey2 = SweetConstant.REDIS_KEY_SWEET_WECHAT_USERS.concat(sweetAppletUsers.getUnionId())
String redisKey2 = SweetConstant.REDIS_KEY_SWEET_WECHAT_USERS_UNIONID.concat(sweetAppletUsers.getUnionId())
.concat(SweetConstant.REDIS_KEY_SWEET_WECHAT_USERS_TYPE).concat(String.valueOf(2));
Object obj2 = redisDataSourceUtil.getRedisSweetUtil().get(redisKey2);
if (null == obj2) {
......@@ -289,7 +294,7 @@ public class DataImpl {
}
public HashMap<String, Object> logList(String uid, int page, int size) {
LocalDateTime now = LocalDateTime.now();
LocalDateTime now = LocalDateTime.now();
HashMap<String, Object> info = CollectionUtil.mapStringObject();
// 排序 分页
Pageable pageable = PageRequest.of(page - 1, size, Sort.by(Sort.Direction.DESC, "createdAt"));
......
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/handler/SubscribeHandler.java
View file @ 9418d3ca
......@@ -66,7 +66,7 @@ public class SubscribeHandler implements WxMpMessageHandler {
} else {// 摩登服务号
type = 2;
}
SweetWechatUsersVo sweetWechatUsers = redisUtils.getSweetWechatUsers(wxMpUser.getUnionId(), type);
SweetWechatUsersVo sweetWechatUsers = redisUtils.getSweetWechatUsersOfUnionId(wxMpUser.getUnionId(), type);
if (null == sweetWechatUsers) {
SweetWechatUsersVo sweetWechatUsersVo = SweetWechatUsersVo.getNew();
sweetWechatUsersVo.setWechatUserId(IDGenerator.nextSnowId());
......
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetCityVoteServiceImpl.java
View file @ 9418d3ca
......@@ -82,7 +82,7 @@ public class SweetCityVoteServiceImpl extends ServiceImpl<SweetCityVoteMapper, S
SweetCityVote aNew = SweetCityVote.getNew();
aNew.setVoteId(IDGenerator.nextSnowId());
aNew.setPhone(param.getPhone());
SweetWechatUsersVo sweetWechatUsers = usersRedisUtils.getSweetWechatUsers(param.getUnionId(), 2);
SweetWechatUsersVo sweetWechatUsers = usersRedisUtils.getSweetWechatUsersOfUnionId(param.getUnionId(), 2);
String sweetWechatOpenId = "";
if (null != sweetWechatUsers) {
sweetWechatOpenId = sweetWechatUsers.getOpenId();
......
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetWechatLoginServiceImpl.java
View file @ 9418d3ca
......@@ -76,7 +76,7 @@ public class SweetWechatLoginServiceImpl {
String mobile = userInfoVoData.getMobile();
String userId = userInfoVoData.getUid();
// mysql redis todo 一个手机号多个微信？？？
SweetAppletUsersVo sweetAppletUsers = redisUtils.getSweetAppletUsers(mobile);
SweetAppletUsersVo sweetAppletUsers = redisUtils.getSweetAppletUsersOfPhone(mobile);
if (null == sweetAppletUsers) {
LinkedList<String> sqlsA = CollectionUtil.linkedListString();
LinkedList<Object[]> sqlsDataA = CollectionUtil.linkedListObjectArr();
......@@ -100,7 +100,7 @@ public class SweetWechatLoginServiceImpl {
// 1。关注过了也登陆过小程序的可以脚本处理 脚本不处理就需要每个用户点进入小程序登陆
// 2。关注过了 无小程序的 本次登陆才有的 接口也不是前端请求的 就没有地方触发做任务接口
// 3。有小程序未关注的就关注时候适用
/*SweetWechatUsersVo sweetWechatUsersSky = redisUtils.getSweetWechatUsers(unionId, 2);
/*SweetWechatUsersVo sweetWechatUsersSky = redisUtils.getSweetWechatUsersOfUnionId(unionId, 2);
if (null != sweetWechatUsersSky) {
feignStoneIntegralClient.doTask(4, userId);
}*/
......
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetWechatTemplateServiceImpl.java
View file @ 9418d3ca
......@@ -99,7 +99,7 @@ public class SweetWechatTemplateServiceImpl {
for (SweetRemind remindInfo : sweetRemindList) {
try {
String remindId = remindInfo.getRemindId();
SweetWechatUsersVo sweetWechatUsers = redisUtils.getSweetWechatUsers(remindInfo.getUnionId(), 1);
SweetWechatUsersVo sweetWechatUsers = redisUtils.getSweetWechatUsersOfUnionId(remindInfo.getUnionId(), 1);
ResponseDto<KylinPerformanceVo> kylinPerformanceVo = feignKylinPerformancesClient.detail(remindInfo.getPerformancesId(), 0, 0, "");
KylinPerformanceVo performanceVoData = kylinPerformanceVo.getData();
if (null == sweetWechatUsers) {
......@@ -258,7 +258,7 @@ public class SweetWechatTemplateServiceImpl {
if (null == type || type < 1) {
type = 1;
}
SweetWechatUsersVo sweetWechatUsers = redisUtils.getSweetWechatUsers(unionId, type);
SweetWechatUsersVo sweetWechatUsers = redisUtils.getSweetWechatUsersOfUnionId(unionId, type);
if (null != sweetWechatUsers && !sweetWechatUsers.getUnionId().isEmpty()) {
// 同步手机号
......@@ -319,11 +319,11 @@ public class SweetWechatTemplateServiceImpl {
}
public boolean followStatusPhone(Integer type, String phone) {
SweetAppletUsersVo sweetAppletUsers = redisUtils.getSweetAppletUsers(phone);
SweetAppletUsersVo sweetAppletUsers = redisUtils.getSweetAppletUsersOfPhone(phone);
if (null == sweetAppletUsers) {
return false;
}
SweetWechatUsersVo sweetWechatUsers = redisUtils.getSweetWechatUsers(sweetAppletUsers.getUnionId(), type);
SweetWechatUsersVo sweetWechatUsers = redisUtils.getSweetWechatUsersOfUnionId(sweetAppletUsers.getUnionId(), type);
if (null != sweetWechatUsers && !sweetWechatUsers.getUnionId().isEmpty()) {
return true;
} else {
......
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/syncRedis/UserDataServiceImpl.java
View file @ 9418d3ca
......@@ -157,7 +157,7 @@ public class UserDataServiceImpl {
for (int page = 0; page < countPage; page++) {
List<SweetAppletUser> sweetAppletUsers = sweetAppletUserMapper.selectList(Wrappers.lambdaQuery(SweetAppletUser.class).last("limit " + (page * size) + "," + ((page + 1) * size)));
for (SweetAppletUser info : sweetAppletUsers) {
SweetAppletUsersVo oldInfo = redisUtils.getSweetAppletUsers(info.getGetPurePhoneNumber());
SweetAppletUsersVo oldInfo = redisUtils.getSweetAppletUsersOfPhone(info.getGetPurePhoneNumber());
if (null == oldInfo) {
ResponseDto<AdamUserInfoVo> userInfoVo = feignAdamBaseClient.registerByMobile(info.getGetPurePhoneNumber());
AdamUserInfoVo userInfoVoData = userInfoVo.getData();
......
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/utils/WechatUsersRedisUtils.java
View file @ 9418d3ca
......@@ -15,8 +15,8 @@ public class WechatUsersRedisUtils {
@Autowired
private RedisUtil redisUtil;
public SweetWechatUsersVo getSweetWechatUsers(String unionId, Integer type) {
String redisKey = SweetConstant.REDIS_KEY_SWEET_WECHAT_USERS.concat(unionId)
public SweetWechatUsersVo getSweetWechatUsersOfUnionId(String unionId, Integer type) {
String redisKey = SweetConstant.REDIS_KEY_SWEET_WECHAT_USERS_UNIONID.concat(unionId)
.concat(SweetConstant.REDIS_KEY_SWEET_WECHAT_USERS_TYPE).concat(String.valueOf(type));
Object obj = redisUtil.get(redisKey);
if (null == obj) {
......@@ -27,7 +27,7 @@ public class WechatUsersRedisUtils {
}
}
public SweetWechatUsersVo getSweetWechatUsersOfOpenId(String openId, Integer type) {
String redisKey = SweetConstant.REDIS_KEY_SWEET_WECHAT_USERS_UNIONID.concat(openId)
String redisKey = SweetConstant.REDIS_KEY_SWEET_WECHAT_USERS_OPENID.concat(openId)
.concat(SweetConstant.REDIS_KEY_SWEET_WECHAT_USERS_TYPE).concat(String.valueOf(type));
Object obj = redisUtil.get(redisKey);
if (null == obj) {
......@@ -38,25 +38,25 @@ public class WechatUsersRedisUtils {
}
}
public void setSweetWechatUsers(SweetWechatUsersVo sweetWechatUsersVo) {
String redisKey = SweetConstant.REDIS_KEY_SWEET_WECHAT_USERS.concat(sweetWechatUsersVo.getUnionId())
String redisKey = SweetConstant.REDIS_KEY_SWEET_WECHAT_USERS_UNIONID.concat(sweetWechatUsersVo.getUnionId())
.concat(SweetConstant.REDIS_KEY_SWEET_WECHAT_USERS_TYPE).concat(String.valueOf(sweetWechatUsersVo.getType()));
redisUtil.set(redisKey, sweetWechatUsersVo);
String redisKeyOpenId = SweetConstant.REDIS_KEY_SWEET_WECHAT_USERS_UNIONID.concat(sweetWechatUsersVo.getOpenId())
String redisKeyOpenId = SweetConstant.REDIS_KEY_SWEET_WECHAT_USERS_OPENID.concat(sweetWechatUsersVo.getOpenId())
.concat(SweetConstant.REDIS_KEY_SWEET_WECHAT_USERS_TYPE).concat(String.valueOf(sweetWechatUsersVo.getType()));
redisUtil.set(redisKeyOpenId, sweetWechatUsersVo);
}
public void delSweetWechatUsers(String unionId, String openId, Integer type) {
String redisKey = SweetConstant.REDIS_KEY_SWEET_WECHAT_USERS.concat(unionId)
String redisKey = SweetConstant.REDIS_KEY_SWEET_WECHAT_USERS_UNIONID.concat(unionId)
.concat(SweetConstant.REDIS_KEY_SWEET_WECHAT_USERS_TYPE).concat(String.valueOf(type));
redisUtil.del(redisKey);
String redisKeyOpenId = SweetConstant.REDIS_KEY_SWEET_WECHAT_USERS_UNIONID.concat(openId)
String redisKeyOpenId = SweetConstant.REDIS_KEY_SWEET_WECHAT_USERS_OPENID.concat(openId)
.concat(SweetConstant.REDIS_KEY_SWEET_WECHAT_USERS_TYPE).concat(String.valueOf(type));
redisUtil.del(redisKeyOpenId);
}
public SweetAppletUsersVo getSweetAppletUsers(String mobile) {
public SweetAppletUsersVo getSweetAppletUsersOfPhone(String mobile) {
String redisKey = SweetConstant.REDIS_KEY_SWEET_APPLET_USERS_PHONE.concat(mobile);
Object obj = redisUtil.get(redisKey);
if (null == obj) {
......@@ -66,9 +66,22 @@ public class WechatUsersRedisUtils {
return sweetAppletUsersVo;
}
}
public SweetAppletUsersVo getSweetAppletUsersOfUnionId(String unionId) {
String redisKey = SweetConstant.REDIS_KEY_SWEET_APPLET_USERS_UNIONID.concat(unionId);
Object obj = redisUtil.get(redisKey);
if (null == obj) {
return null;
} else {
SweetAppletUsersVo sweetAppletUsersVo = (SweetAppletUsersVo) obj;
return sweetAppletUsersVo;
}
}
public void setSweetAppletUsers(SweetAppletUsersVo sweetAppletUsersVo) {
String redisKey = SweetConstant.REDIS_KEY_SWEET_APPLET_USERS_PHONE.concat(sweetAppletUsersVo.getPurePhoneNumber());
redisUtil.set(redisKey, sweetAppletUsersVo);
String redisKeyU = SweetConstant.REDIS_KEY_SWEET_APPLET_USERS_UNIONID.concat(sweetAppletUsersVo.getUnionId());
redisUtil.set(redisKeyU, sweetAppletUsersVo);
}
}
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