czg_team/video_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

日志修改

Browse Source
This commit is contained in:
GYJ
2024-12-04 17:28:19 +08:00
parent 149eec4363
commit e8a2e9bee1
5 changed files with 139 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java
View File

@@ -875,7 +875,7 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
return getResult(userInfo);
} else {
if(StringUtils.isEmpty(msg)){
return Result.error("手机号未注册！");
return Result.error("验证码不能为空！");
}
Msg msg1 = msgDao.findByPhoneAndCode(phone, msg);
if(msg1==null){

183
src/main/java/com/sqx/modules/invite/service/impl/InviteServiceImpl.java
View File

@@ -61,19 +61,19 @@ public class InviteServiceImpl extends ServiceImpl<InviteDao, Invite> implements
private SysUserService sysUserService;
@Override
public PageUtils selectInviteList(int page,int limit,Integer state,Long userId){
Page<Map<String,Object>> pages=new Page<>(page,limit);
if(state==null || state==-1){
state=null;
public PageUtils selectInviteList(int page, int limit, Integer state, Long userId) {
Page<Map<String, Object>> pages = new Page<>(page, limit);
if (state == null || state == -1) {
state = null;
}
return new PageUtils(inviteDao.selectInviteList(pages,state,userId));
return new PageUtils(inviteDao.selectInviteList(pages, state, userId));
}
@Override
public PageUtils selectInviteUser(int page, int limit, Long userId, Integer state,Integer userType) {
public PageUtils selectInviteUser(int page, int limit, Long userId, Integer state, Integer userType) {
Page<Map<String, Object>> pages = new Page<>(page, limit);
return new PageUtils(inviteDao.selectInviteUser(pages, userId, state,userType));
return new PageUtils(inviteDao.selectInviteUser(pages, userId, state, userType));
}
@Override
@@ -83,47 +83,47 @@ public class InviteServiceImpl extends ServiceImpl<InviteDao, Invite> implements
@Override
public Integer selectInviteByUserIdCount(Long userId, Date startTime, Date endTime) {
return inviteDao.selectInviteByUserIdCount(userId,startTime,endTime);
return inviteDao.selectInviteByUserIdCount(userId, startTime, endTime);
}
@Override
public Double selectInviteByUserIdSum(Long userId, Date startTime, Date endTime) {
return inviteDao.selectInviteByUserIdSum(userId,startTime,endTime);
return inviteDao.selectInviteByUserIdSum(userId, startTime, endTime);
}
@Override
public Double sumInviteMoney(String time, Integer flag) {
return inviteDao.sumInviteMoney(time,flag);
return inviteDao.sumInviteMoney(time, flag);
}
@Override
public PageUtils inviteAnalysis(int page,int limit, String time, Integer flag) {
Page<Map<String,Object>> pages=new Page<>(page,limit);
return new PageUtils(inviteDao.inviteAnalysis(pages,time,flag));
public PageUtils inviteAnalysis(int page, int limit, String time, Integer flag) {
Page<Map<String, Object>> pages = new Page<>(page, limit);
return new PageUtils(inviteDao.inviteAnalysis(pages, time, flag));
}
@Override
public Integer selectInviteCount(Integer state,Long userId){
if(state==null || state==-1){
state=null;
public Integer selectInviteCount(Integer state, Long userId) {
if (state == null || state == -1) {
state = null;
}
return inviteDao.selectInviteCount(state,userId);
return inviteDao.selectInviteCount(state, userId);
}
@Override
public Double selectInviteSum(Integer state, Long userId) {
if(state==null || state==-1){
state=null;
if (state == null || state == -1) {
state = null;
}
return inviteDao.selectInviteSum(state,userId);
return inviteDao.selectInviteSum(state, userId);
}
@Override
public int saveBody(Long userId, UserEntity userEntity){
SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
public int saveBody(Long userId, UserEntity userEntity) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String format = sdf.format(new Date());
Invite invite=new Invite();
Invite invite = new Invite();
invite.setState(0);
invite.setMoney(0.00);
invite.setUserId(userEntity.getUserId());
@@ -133,8 +133,8 @@ public class InviteServiceImpl extends ServiceImpl<InviteDao, Invite> implements
inviteDao.insert(invite);
//同步二级
UserEntity two = userService.queryByInvitationCode(userEntity.getInviterCode());
if(two!=null){
invite=new Invite();
if (two != null) {
invite = new Invite();
invite.setState(0);
invite.setMoney(0.00);
invite.setUserId(two.getUserId());
@@ -143,44 +143,47 @@ public class InviteServiceImpl extends ServiceImpl<InviteDao, Invite> implements
invite.setUserType(2);
inviteDao.insert(invite);
}
UserEntity user=new UserEntity();
UserEntity user = new UserEntity();
user.setUserId(userId);
user.setInviterCode(userEntity.getInvitationCode());
userService.updateById(user);
String value = commonInfoService.findOne(813).getValue();
if("是".equals(value)){
//获取邀请人的邀请数量
int inviterCount = userService.queryInviterCount(userEntity.getInvitationCode());
InviteAward inviteAward = inviteAwardService.getOne(new QueryWrapper<InviteAward>().eq("invite_count", inviterCount));
if(inviteAward!=null){
if(inviteAward.getInviteMonth()==0){
userVipService.update(null, Wrappers.<UserVip>lambdaUpdate()
.set(UserVip::getIsVip,2)
.set(UserVip::getEndTime,null)
.set(UserVip::getVipType,1)
.eq(UserVip::getUserId,userEntity.getUserId()));
}else{
UserVip userVip = userVipService.selectUserVipByUserId(userEntity.getUserId());
Calendar calendar=Calendar.getInstance();
if(userVip!=null && userVip.getIsVip()==2){
Date date = DateUtils.stringToDate(userVip.getEndTime(), DateUtils.DATE_TIME_PATTERN);
calendar.setTime(date);
}else{
userVip=new UserVip();
userVip.setUserId(userEntity.getUserId());
userVip.setCreateTime(DateUtils.format(new Date()));
}
userVip.setIsVip(2);
userVip.setVipType(1);
calendar.add(Calendar.MONTH,inviteAward.getInviteMonth());
userVip.setEndTime(DateUtils.format(calendar.getTime()));
if(userVip.getVipId()!=null){
userVipService.updateById(userVip);
}else{
userVipService.save(userVip);
}
}
}
if (!"是".equals(value)) {
return 0;
}
//获取邀请人的邀请数量
int inviterCount = userService.queryInviterCount(userEntity.getInvitationCode());
InviteAward inviteAward = inviteAwardService.getOne(new QueryWrapper<InviteAward>().eq("invite_count", inviterCount));
if (inviteAward == null) {
return 0;
}
if (inviteAward.getInviteMonth() == 0) {
userVipService.update(null, Wrappers.<UserVip>lambdaUpdate()
.set(UserVip::getIsVip, 2)
.set(UserVip::getEndTime, null)
.set(UserVip::getVipType, 1)
.eq(UserVip::getUserId, userEntity.getUserId()));
return 1;
}
UserVip userVip = userVipService.selectUserVipByUserId(userEntity.getUserId());
Calendar calendar = Calendar.getInstance();
if (userVip != null && userVip.getIsVip() == 2) {
Date date = DateUtils.stringToDate(userVip.getEndTime(), DateUtils.DATE_TIME_PATTERN);
calendar.setTime(date);
} else {
userVip = new UserVip();
userVip.setUserId(userEntity.getUserId());
userVip.setCreateTime(DateUtils.format(new Date()));
}
userVip.setIsVip(2);
userVip.setVipType(1);
calendar.add(Calendar.MONTH, inviteAward.getInviteMonth());
userVip.setEndTime(DateUtils.format(calendar.getTime()));
if (userVip.getVipId() != null) {
userVipService.updateById(userVip);
} else {
userVipService.save(userVip);
}
return 1;
@@ -188,10 +191,10 @@ public class InviteServiceImpl extends ServiceImpl<InviteDao, Invite> implements
@Override
public Map<String,Object> updateInvite(UserEntity userEntity, String format, Long userId, BigDecimal price) {
Map<String,Object> result=new HashMap<>();
public Map<String, Object> updateInvite(UserEntity userEntity, String format, Long userId, BigDecimal price) {
Map<String, Object> result = new HashMap<>();
if (userEntity != null && userId != null && price != null) {
Invite invite1 = inviteDao.selectInviteByUser(userEntity.getUserId(), userId,1);
Invite invite1 = inviteDao.selectInviteByUser(userEntity.getUserId(), userId, 1);
if (invite1 == null) {
Invite invite = new Invite();
invite.setState(0);
@@ -201,14 +204,14 @@ public class InviteServiceImpl extends ServiceImpl<InviteDao, Invite> implements
invite.setCreateTime(format);
invite.setUserType(1);
inviteDao.insert(invite);
invite1 = inviteDao.selectInviteByUser(userEntity.getUserId(), userId,1);
invite1 = inviteDao.selectInviteByUser(userEntity.getUserId(), userId, 1);
}
UserEntity userEntity1 = userService.selectUserById(userId);
BigDecimal oneMoney=BigDecimal.ZERO;
BigDecimal twoMoney=BigDecimal.ZERO;
BigDecimal oneMoney = BigDecimal.ZERO;
BigDecimal twoMoney = BigDecimal.ZERO;
if (userEntity.getRate() != null && userEntity.getRate().doubleValue() > 0) {
BigDecimal rateMoney = price.multiply(userEntity.getRate()).setScale(2, BigDecimal.ROUND_HALF_UP);
oneMoney=rateMoney;
oneMoney = rateMoney;
Double money = rateMoney.doubleValue();
invite1.setUserType(1);
invite1.setState(1);
@@ -222,15 +225,15 @@ public class InviteServiceImpl extends ServiceImpl<InviteDao, Invite> implements
userMoneyDetails.setClassify(2);
userMoneyDetails.setMoney(new BigDecimal(money));
userMoneyDetails.setCreateTime(format);
userMoneyDetails.setTitle("[邀请好友]好友名称："+userEntity1.getUserName());
userMoneyDetails.setContent("获取佣金:"+money);
userMoneyDetails.setTitle("[邀请好友]好友名称：" + userEntity1.getUserName());
userMoneyDetails.setContent("获取佣金:" + money);
userMoneyDetailsService.save(userMoneyDetails);
result.put("oneUserId",userEntity.getUserId());
result.put("oneMoney",money);
result.put("oneUserId", userEntity.getUserId());
result.put("oneMoney", money);
}
UserEntity two = userService.queryByInvitationCode(userEntity.getInviterCode());
if(two!=null){
Invite invite2 = inviteDao.selectInviteByUser(two.getUserId(), userId,2);
if (two != null) {
Invite invite2 = inviteDao.selectInviteByUser(two.getUserId(), userId, 2);
if (invite2 == null) {
Invite invite = new Invite();
invite.setState(0);
@@ -240,11 +243,11 @@ public class InviteServiceImpl extends ServiceImpl<InviteDao, Invite> implements
invite.setCreateTime(format);
invite.setUserType(2);
inviteDao.insert(invite);
invite2 = inviteDao.selectInviteByUser(two.getUserId(), userId,2);
invite2 = inviteDao.selectInviteByUser(two.getUserId(), userId, 2);
}
if (two.getTwoRate() != null && two.getTwoRate().doubleValue() > 0) {
BigDecimal rateMoney = price.multiply(two.getTwoRate()).setScale(2, RoundingMode.HALF_UP);
twoMoney=rateMoney;
twoMoney = rateMoney;
Double money = rateMoney.doubleValue();
invite2.setUserType(2);
invite2.setState(1);
@@ -258,39 +261,39 @@ public class InviteServiceImpl extends ServiceImpl<InviteDao, Invite> implements
userMoneyDetails.setMoney(new BigDecimal(money));
userMoneyDetails.setCreateTime(format);
userMoneyDetails.setClassify(2);
userMoneyDetails.setTitle("[邀请好友]好友名称："+userEntity1.getUserName());
userMoneyDetails.setContent("获取佣金:"+money);
userMoneyDetails.setTitle("[邀请好友]好友名称：" + userEntity1.getUserName());
userMoneyDetails.setContent("获取佣金:" + money);
userMoneyDetailsService.save(userMoneyDetails);
result.put("twoUserId",two.getUserId());
result.put("twoMoney",money);
result.put("twoUserId", two.getUserId());
result.put("twoMoney", money);
}
}
if(StringUtils.isNotEmpty(userEntity1.getQdCode())){
if (StringUtils.isNotEmpty(userEntity1.getQdCode())) {
SysUserEntity sysUserEntity = sysUserService.selectSysUserByQdCode(userEntity1.getQdCode());
if(sysUserEntity!=null){
if (sysUserEntity != null) {
BigDecimal rateMoney = price.multiply(sysUserEntity.getQdRate()).setScale(2, RoundingMode.HALF_UP);
BigDecimal sumMoney = rateMoney.subtract(oneMoney);
sumMoney = sumMoney.subtract(twoMoney);
userMoneyService.updateSysMoney(1,sysUserEntity.getUserId(),sumMoney.doubleValue());
userMoneyService.updateSysMoney(1, sysUserEntity.getUserId(), sumMoney.doubleValue());
UserMoneyDetails userMoneyDetails = new UserMoneyDetails();
userMoneyDetails.setSysUserId(sysUserEntity.getUserId());
userMoneyDetails.setType(1);
userMoneyDetails.setMoney(sumMoney);
userMoneyDetails.setCreateTime(format);
userMoneyDetails.setClassify(10);
userMoneyDetails.setTitle("[渠道用户]用户名称："+userEntity1.getUserName());
String title="总佣金："+rateMoney;
if(oneMoney.doubleValue()>0){
title=title+"，一级推广员扣除收益："+oneMoney;
userMoneyDetails.setTitle("[渠道用户]用户名称：" + userEntity1.getUserName());
String title = "总佣金：" + rateMoney;
if (oneMoney.doubleValue() > 0) {
title = title + "，一级推广员扣除收益：" + oneMoney;
}
if(twoMoney.doubleValue()>0){
title=title+"，二级推广员扣除收益："+twoMoney;
if (twoMoney.doubleValue() > 0) {
title = title + "，二级推广员扣除收益：" + twoMoney;
}
userMoneyDetails.setContent(title+"，到账佣金:"+sumMoney);
userMoneyDetails.setContent(title + "，到账佣金:" + sumMoney);
userMoneyDetailsService.save(userMoneyDetails);
result.put("sysUserId",sysUserEntity.getUserId());
result.put("qdMoney",sumMoney);
result.put("sysUserId", sysUserEntity.getUserId());
result.put("qdMoney", sumMoney);
return result;
}
}

1
src/main/java/com/sqx/modules/pay/wuyou/Constants.java
View File

@@ -16,5 +16,6 @@ public class Constants {
final static String EXTRACT_QUERY_URL = BASE_URL + "/api/querySalary";
final static String NOTIFY_URL = "https://video.hnsiyao.cn/sqx_fast/app/wuyou/notify";
final static String EXTRACT_NOTIFY_URL = "https://video.hnsiyao.cn/sqx_fast/app/wuyou/notify";
}

5
src/main/java/com/sqx/modules/pay/wuyou/WuyouPay.java
View File

@@ -2,6 +2,7 @@ package com.sqx.modules.pay.wuyou;
import cn.hutool.http.HttpRequest;
import com.alibaba.fastjson.JSONObject;
import lombok.extern.slf4j.Slf4j;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -53,7 +54,7 @@ public class WuyouPay {
params.put("bank_branch", "1");
params.put("province", "1");
params.put("city", "1");
params.put("notify_url", "1");
params.put("notify_url", Constants.EXTRACT_NOTIFY_URL);
String sign = Encrypt.getParamsSign(params);
params.put("sign", sign);
@@ -93,7 +94,7 @@ public class WuyouPay {
.execute()
.body();
logger.info("request url: {}, params: {}, response: {}", url, params, body);
logger.info("无忧支付 request url: {}, params: {}, response: {}", url, params, body);
return body;
}