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

Skip to content

L
liquidnet-bus-v1
Commit 1cda8e0a authored by 张国柄's avatar 张国柄
Browse files
Options

Merge remote-tracking branch 'origin/pre' into pre

parents 8a2b2e73 41415485
Show whitespace changes
Inline Side-by-side
Showing with 62 additions and 40 deletions
docu/dev_stone.sql
View file @ 1cda8e0a
......@@ -10,9 +10,12 @@ create table stone_score_logs
overdue_at datetime comment '过期时间',
created_at datetime ,
updated_at datetime ,
comment text
comment text,
KEY `stone_score_logs_uid_index` (`uid`),
KEY `stone_score_logs_logsId_index` (`logs_id`)
) engine = InnoDB comment '积分日志表';
drop table if exists stone_score_items;
create table stone_score_items
(
......@@ -34,7 +37,10 @@ create table stone_score_items
end_time datetime NULL COMMENT '定时下架-时间',
created_at datetime ,
updated_at datetime ,
comment text
comment text,
KEY `stone_score_items_item_id_index` (`item_id`),
KEY `stone_score_items_target_id_index` (`target_id`),
KEY `stone_score_items_status_index` (`status`)
) engine = InnoDB comment '积分物品表';
drop table if exists stone_score_user;
......@@ -46,7 +52,8 @@ create table stone_score_user
status int default 1 comment '状态[1-正常|2-冻结]',
created_at datetime ,
updated_at datetime ,
comment text
comment text,
KEY `stone_score_user_uid_index` (`uid`)
) engine = InnoDB comment '积分用户表';
drop table if exists stone_score_order;
......@@ -74,7 +81,9 @@ create table stone_score_order
pay_status tinyint NOT NULL DEFAULT 0 COMMENT '支付状态[0-未支付|1-已支付|2-支付失败]',
created_at datetime ,
updated_at datetime ,
comment text
comment text,
KEY `stone_score_order_uid_index` (`uid`),
KEY `stone_score_order_status_index` (`status`),
) engine = InnoDB comment '积分订单表';
......
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/kylin/DataImpl.java
View file @ 1cda8e0a
......@@ -67,14 +67,14 @@ public class DataImpl {
public boolean initScore(int page, int size) {
try {
long adamUserListCount = userMapper.selectCount(Wrappers.lambdaQuery(AdamUser.class).eq(AdamUser::getState, 1)
.lt(AdamUser::getMid, 2753166)
.lt(AdamUser::getMid, 2753314)
.select(AdamUser::getUid).orderByAsc(AdamUser::getMid));
int number = page;
int fount = 5000;
while (adamUserListCount > 0) {
//查询全部用户
List<AdamUser> adamUserList = userMapper.selectList(Wrappers.lambdaQuery(AdamUser.class).eq(AdamUser::getState, 1)
.lt(AdamUser::getMid, 2753166)
.lt(AdamUser::getMid, 2753314)
.select(AdamUser::getUid).orderByAsc(AdamUser::getMid).last("limit " + ((number - 1) * fount) + "," + ((number) * fount)));
for (AdamUser item : adamUserList) {
//获取用户相关信息
......@@ -179,8 +179,20 @@ public class DataImpl {
try {
//获取用户相关信息
AdamUserInfoVo userInfoVo = (AdamUserInfoVo) redisDataSourceUtil.getRedisAdamUtil().get(AdamRedisConst.INFO_USER.concat(uid));
int score = 0;
String mobile = userInfoVo.getMobile();
int score = 0;
//生成用户积分日志
int isLog = stoneScoreLogsMapper.selectCount(Wrappers.lambdaQuery(StoneScoreLogs.class).eq(StoneScoreLogs::getUid, uid).eq(StoneScoreLogs::getContent, "历史积分"));
if (isLog > 0) {
return true;
// MultiValueMap<String, String> params = CollectionUtil.linkedMultiValueMapStringString();
// params.add("uid", uid);
// params.add("score", (score >= 12000 ? 12000 : score) + "");
// params.add("content", "历史积分");
// HttpUtil.post(stoneUrl + "/user/logs/in2111", params);
}
//创建 用户积分数据
int isExists = stoneScoreUserMapper.selectCount(Wrappers.lambdaQuery(StoneScoreUser.class).eq(StoneScoreUser::getUid, uid));
if (isExists <= 0) {
......@@ -190,7 +202,6 @@ public class DataImpl {
data.setUid(uid);
data.setCreatedAt(LocalDateTime.now());
stoneScoreUserMapper.insert(data);
StoneUserVo userTaskVo = StoneUserVo.getNew();
userTaskVo.getTask();
userTaskVo.setUid(uid);
......@@ -199,33 +210,40 @@ public class DataImpl {
}
//获取演出每日任务积分
Integer performancePrice = orderTicketsMapper.getOrderScore(uid);
score += performancePrice.intValue();
score += (performancePrice.intValue());
//获取商品每日任务积分
try {
String resultData = HttpUtil.get("http://mall.zhengzai.tv/admin/sumUserCost?user_id=" + uid, null);
int goodsPrice = (int) JSONObject.parseObject(resultData).get("cost");
score += goodsPrice;
score += (goodsPrice);
} catch (Exception e) {
}
//获取 关注摩登天空服务号
if (getUnionIdByPhone(mobile) != null) {
MultiValueMap<String, String> params = CollectionUtil.linkedMultiValueMapStringString();
params.add("uid", uid);
params.add("taskId", 4 + "");
HttpUtil.post(stoneUrl + "/user/inner/doTask", params);
stoneIntegralClient.doTask(4, uid);
// MultiValueMap<String, String> params = CollectionUtil.linkedMultiValueMapStringString();
// params.add("uid", uid);
// params.add("taskId", 4 + "");
// HttpUtil.post(stoneUrl + "/user/inner/doTask", params);
}
//获取用户相关信息
if (null != userInfoVo.getSex()) {
//获取 完善个人信息
MultiValueMap<String, String> params = CollectionUtil.linkedMultiValueMapStringString();
params.add("uid", uid);
params.add("taskId", 5 + "");
HttpUtil.post(stoneUrl + "/user/inner/doTask", params);
stoneIntegralClient.doTask(5, uid);
// MultiValueMap<String, String> params = CollectionUtil.linkedMultiValueMapStringString();
// params.add("uid", uid);
// params.add("taskId", 5 + "");
// HttpUtil.post(stoneUrl + "/user/inner/doTask", params);
}
if (StringUtils.isNotBlank(userInfoVo.getBackground()) && !defaultBackgroundList.contains(userInfoVo.getBackground())) {
//获取 完善个人照片
MultiValueMap<String, String> params = CollectionUtil.linkedMultiValueMapStringString();
params.add("uid", uid);
params.add("taskId", 6 + "");
HttpUtil.post(stoneUrl + "/user/inner/doTask", params);
stoneIntegralClient.doTask(6, uid);
// MultiValueMap<String, String> params = CollectionUtil.linkedMultiValueMapStringString();
// params.add("uid", uid);
// params.add("taskId", 6 + "");
// HttpUtil.post(stoneUrl + "/user/inner/doTask", params);
}
// if (userInfoVo.getIsComplete() == 11) {
// //获取 首次体验在场
......@@ -234,16 +252,11 @@ public class DataImpl {
// params.add("taskId", 8 + "");
// HttpUtil.post(stoneUrl + "/user/inner/doTask", params);
// }
//生成用户积分日志
int isLog = stoneScoreLogsMapper.selectCount(Wrappers.lambdaQuery(StoneScoreLogs.class).eq(StoneScoreLogs::getUid, uid).eq(StoneScoreLogs::getContent, "历史积分"));
if (isLog <= 0) {
MultiValueMap<String, String> params = CollectionUtil.linkedMultiValueMapStringString();
params.add("uid", uid);
params.add("score", (score >= 12000 ? 12000 : score) + "");
params.add("content", "历史积分");
HttpUtil.post(stoneUrl + "/user/logs/in2111", params);
}
stoneIntegralClient.in2111(uid, score, "历史积分");
log.error("[ TASK INIT UID ] uid = " + uid);
log.error("[ TASK INIT SCORE ] FINISH ");
} catch (Exception e) {
log.info("异常 : {} ", e);
e.printStackTrace();
return false;
}
......
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