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

Merge branch 'test' into dev

Browse Source
This commit is contained in:
GYJ
2024-12-25 10:55:23 +08:00
parent dc3b8fe67e ba5ba7e16b
commit 6178b0440f
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/sqx/modules/pay/controller/app/WuyouController.java
View File

@@ -34,6 +34,7 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
@@ -226,6 +227,7 @@ public class WuyouController {
return "success"; return "success";
} }
@Transactional
public void activities(UserEntity user, UserEntity sourceUser) { public void activities(UserEntity user, UserEntity sourceUser) {
//分享达标 //分享达标
if (sourceUser != null && sourceUser.getUserId() != 1) { if (sourceUser != null && sourceUser.getUserId() != 1) {
@@ -237,7 +239,7 @@ public class WuyouController {
if (count == 0) { if (count == 0) {
//满3笔 //满3笔
Integer sumOrderNum = ordersService.countOrderNum(user.getUserId(), null); Integer sumOrderNum = ordersService.countOrderNum(user.getUserId(), null);
if (sumOrderNum > Integer.parseInt(commonRepository.findOne(913).getValue())) { if (sumOrderNum >= Integer.parseInt(commonRepository.findOne(913).getValue())) {
String amount = commonRepository.findOne(912).getValue(); String amount = commonRepository.findOne(912).getValue();
UserMoneyDetails userMoneyDetails = new UserMoneyDetails(); UserMoneyDetails userMoneyDetails = new UserMoneyDetails();
userMoneyDetails.setClassify(6); userMoneyDetails.setClassify(6);
@@ -260,7 +262,7 @@ public class WuyouController {
null, sysUser.getUserId(), null, "[分享达标额外奖励]", 6, 1, 2, null, sysUser.getUserId(), null, "[分享达标额外奖励]", 6, 1, 2,
new BigDecimal(qdAward), "推广人员首次达标，额外奖励现金红包" + qdAward, 2); new BigDecimal(qdAward), "推广人员首次达标，额外奖励现金红包" + qdAward, 2);
userMoneyService.updateSysMoney(1, sysUser.getUserId(), Double.valueOf(qdAward)); userMoneyService.updateSysAmount(1, sysUser.getUserId(), Double.valueOf(qdAward));
userMoneyDetailsService.save(userMoneyDetails4); userMoneyDetailsService.save(userMoneyDetails4);
Invite invite = inviteService.selectInviteByUser(sourceUser.getUserId(), user.getUserId(), 1); Invite invite = inviteService.selectInviteByUser(sourceUser.getUserId(), user.getUserId(), 1);