diff --git a/src/main/java/com/sqx/modules/invite/controller/app/AppInviteController.java b/src/main/java/com/sqx/modules/invite/controller/app/AppInviteController.java index de2b54b3..d585df78 100644 --- a/src/main/java/com/sqx/modules/invite/controller/app/AppInviteController.java +++ b/src/main/java/com/sqx/modules/invite/controller/app/AppInviteController.java @@ -99,9 +99,11 @@ public class AppInviteController { public Result selectInviteMoney(@RequestAttribute("userId") Long userId){ InviteMoney inviteMoney = inviteMoneyService.selectInviteMoneyByUserId(userId); Integer inviteCount = inviteService.selectInviteCount(-1, userId); + Integer inviteSignCount = inviteService.selectInviteCount(1, userId); Map result=new HashMap<>(); result.put("inviteMoney",inviteMoney); result.put("inviteCount",inviteCount); + result.put("inviteSignCount",inviteSignCount); return Result.success().put("data",result); } @@ -176,4 +178,4 @@ public class AppInviteController { return inviteMoneyService.inviteMoneyConvertUserMoney(userEntity,payClassifyId); } -} \ No newline at end of file +} diff --git a/src/main/java/com/sqx/modules/invite/service/InviteService.java b/src/main/java/com/sqx/modules/invite/service/InviteService.java index 9238e7f1..93c68dd9 100644 --- a/src/main/java/com/sqx/modules/invite/service/InviteService.java +++ b/src/main/java/com/sqx/modules/invite/service/InviteService.java @@ -3,6 +3,8 @@ package com.sqx.modules.invite.service; import com.sqx.common.utils.PageUtils; import com.sqx.modules.app.entity.UserEntity; +import com.sqx.modules.invite.entity.Invite; +import org.apache.ibatis.annotations.Param; import java.math.BigDecimal; import java.util.Date; @@ -32,4 +34,6 @@ public interface InviteService { Map updateInvite(UserEntity userEntity, String format, Long userId, BigDecimal price); + Invite selectInviteByUser(Long userId, Long inviteeUserId, Integer userType); + } diff --git a/src/main/java/com/sqx/modules/invite/service/impl/InviteServiceImpl.java b/src/main/java/com/sqx/modules/invite/service/impl/InviteServiceImpl.java index a247662d..f5e56edc 100644 --- a/src/main/java/com/sqx/modules/invite/service/impl/InviteServiceImpl.java +++ b/src/main/java/com/sqx/modules/invite/service/impl/InviteServiceImpl.java @@ -326,5 +326,8 @@ public class InviteServiceImpl extends ServiceImpl implements return result; } - + @Override + public Invite selectInviteByUser(Long userId, Long inviteeUserId, Integer userType) { + return inviteDao.selectInviteByUser(userId, inviteeUserId, userType); + } } diff --git a/src/main/java/com/sqx/modules/pay/controller/app/WuyouController.java b/src/main/java/com/sqx/modules/pay/controller/app/WuyouController.java index 7eb11a2e..6fe0c107 100644 --- a/src/main/java/com/sqx/modules/pay/controller/app/WuyouController.java +++ b/src/main/java/com/sqx/modules/pay/controller/app/WuyouController.java @@ -12,6 +12,8 @@ import com.sqx.modules.app.service.UserMoneyDetailsService; import com.sqx.modules.app.service.UserMoneyService; import com.sqx.modules.app.service.UserService; import com.sqx.modules.common.service.CommonInfoService; +import com.sqx.modules.invite.dao.InviteDao; +import com.sqx.modules.invite.entity.Invite; import com.sqx.modules.invite.service.InviteService; import com.sqx.modules.orders.entity.Orders; import com.sqx.modules.orders.service.OrdersService; @@ -27,6 +29,7 @@ import com.sqx.modules.utils.AliPayOrderUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; @@ -50,6 +53,7 @@ public class WuyouController { private final PayDetailsDao payDetailsDao; private final UserService userService; private final InviteService inviteService; + private final InviteDao inviteDao; private final UserMoneyService userMoneyService; private final UserMoneyDetailsService userMoneyDetailsService; private final CommonInfoService commonRepository; @@ -58,7 +62,8 @@ public class WuyouController { private final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); WuyouController(OrdersService ordersService, PayDetailsDao payDetailsDao, UserService userService, InviteService inviteService, CashOutDao cashOutDao, - UserMoneyService userMoneyService, UserMoneyDetailsService userMoneyDetailsService, CommonInfoService commonRepository) { + UserMoneyService userMoneyService, UserMoneyDetailsService userMoneyDetailsService, CommonInfoService commonRepository, + InviteDao inviteDao) { this.ordersService = ordersService; this.payDetailsDao = payDetailsDao; this.userService = userService; @@ -67,6 +72,7 @@ public class WuyouController { this.userMoneyService = userMoneyService; this.userMoneyDetailsService = userMoneyDetailsService; this.commonRepository = commonRepository; + this.inviteDao = inviteDao; } @Debounce(interval = 1000, value = "#orderId") @@ -238,6 +244,13 @@ public class WuyouController { userMoneyDetailsService.save(userMoneyDetails); //存入余额 钱 userMoneyService.updateAmount(1, sourceUser.getUserId(), Double.parseDouble(amount)); + + Invite invite = inviteService.selectInviteByUser(sourceUser.getUserId(), user.getUserId(), 1); + if (invite != null) { + invite.setMoney(Double.valueOf(amount)); + invite.setState(1); + inviteDao.updateById(invite); + } } } }