diff --git a/src/main/java/com/sqx/modules/app/entity/UserMoneyDetails.java b/src/main/java/com/sqx/modules/app/entity/UserMoneyDetails.java index e61f7bd1..7ffbba0f 100644 --- a/src/main/java/com/sqx/modules/app/entity/UserMoneyDetails.java +++ b/src/main/java/com/sqx/modules/app/entity/UserMoneyDetails.java @@ -113,7 +113,7 @@ public class UserMoneyDetails implements Serializable { * @param sysUserId 系统用户Id tb_sys_user的id * @param byUserId 对应用户Id * @param title 标题 - * @param classify 1注册 2首次购买 3购买 4提现 5现金大转盘 6 分享 7 分享达标 + * @param classify 1 注册 (上级)2 充值 3 购买 4 提现 5 现金大转盘 6 分享达标 7 任务领取 8 平台操作 9 订单退款 10 渠道推广 * @param type 类别(1充值2支出) * @param state 状态 1待支付 2已到账 3取消 * @param money 金额 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 13320b58..beb58ff4 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 @@ -2,6 +2,7 @@ package com.sqx.modules.pay.controller.app; import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSONObject; +import com.amazonaws.services.dynamodbv2.xspec.S; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.sqx.common.annotation.Debounce; @@ -28,6 +29,8 @@ import com.sqx.modules.pay.wuyou.BaseResp; import com.sqx.modules.pay.wuyou.Encrypt; import com.sqx.modules.pay.wuyou.NotifyDto; import com.sqx.modules.pay.wuyou.WuyouPay; +import com.sqx.modules.sys.entity.SysUserEntity; +import com.sqx.modules.sys.service.SysUserService; import com.sqx.modules.utils.AliPayOrderUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -63,12 +66,13 @@ public class WuyouController { private final CommonInfoService commonRepository; private final CashOutDao cashOutDao; private final CompletAwardService completAwardService; + private final SysUserService sysUserService; 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, - InviteDao inviteDao,CompletAwardService completAwardService) { + InviteDao inviteDao,CompletAwardService completAwardService, SysUserService sysUserService) { this.ordersService = ordersService; this.payDetailsDao = payDetailsDao; this.userService = userService; @@ -79,6 +83,7 @@ public class WuyouController { this.commonRepository = commonRepository; this.inviteDao = inviteDao; this.completAwardService = completAwardService; + this.sysUserService = sysUserService; } @Debounce(interval = 1000, value = "#orderId") @@ -275,6 +280,15 @@ public class WuyouController { userMoneyDetailsService.save(userMoneyDetails); //存入余额 钱 userMoneyService.updateAmount(1, sourceUser.getUserId(), Double.parseDouble(amount)); + SysUserEntity sysUser = sysUserService.selectSysUserByQdCode(user.getQdCode()); + String qdAward = commonRepository.findOne(915).getValue(); + + UserMoneyDetails userMoneyDetails4 = new UserMoneyDetails( + null, sysUser.getUserId(), null, "[分享达标额外奖励]", 8, 1, 2, + new BigDecimal(qdAward), "推广人员首次达标,额外奖励现金红包" + qdAward, 2); + + userMoneyService.updateSysMoney(1, sysUser.getUserId(), Double.valueOf(qdAward)); + userMoneyDetailsService.save(userMoneyDetails4); Invite invite = inviteService.selectInviteByUser(sourceUser.getUserId(), user.getUserId(), 1); if (invite != null) { @@ -286,7 +300,7 @@ public class WuyouController { } QueryWrapper moneyDetailsQuery = new QueryWrapper<>(); - moneyDetailsQuery.eq("classify", 7); + moneyDetailsQuery.eq("classify", 6); moneyDetailsQuery.eq("user_id", sourceUser.getUserId()); //达标人数 int completeCount = userMoneyDetailsService.count(moneyDetailsQuery);