diff --git a/src/main/java/com/sqx/modules/app/controller/UserController.java b/src/main/java/com/sqx/modules/app/controller/UserController.java index 51792f71..f985eb6e 100644 --- a/src/main/java/com/sqx/modules/app/controller/UserController.java +++ b/src/main/java/com/sqx/modules/app/controller/UserController.java @@ -310,6 +310,7 @@ public class UserController { userMoneyDetails.setClassify(1); userMoneyDetails.setMoney(new BigDecimal(money)); userMoneyDetails.setCreateTime(sdf.format(new Date())); + userMoneyDetails.setMoneyType(2); userMoneyDetailsService.save(userMoneyDetails); PayDetails payDetails=new PayDetails(); payDetails.setState(1); @@ -337,6 +338,7 @@ public class UserController { userMoneyDetails.setClassify(1); userMoneyDetails.setMoney(new BigDecimal(money)); userMoneyDetails.setCreateTime(sdf.format(new Date())); + userMoneyDetails.setMoneyType(2); userMoneyDetailsService.save(userMoneyDetails); return Result.success(); } @@ -355,6 +357,7 @@ public class UserController { userMoneyDetails.setTitle("[减少金豆]平台减少金豆：" + money); userMoneyDetails.setContent("[减少金豆]平台减少金豆：" + money); } + userMoneyDetails.setMoneyType(2); userMoneyDetails.setType(type); userMoneyDetails.setClassify(1); userMoneyDetails.setMoney(new BigDecimal(money)); @@ -411,4 +414,4 @@ public class UserController { -} \ No newline at end of file +} diff --git a/src/main/java/com/sqx/modules/app/controller/UserMoneyDetailsController.java b/src/main/java/com/sqx/modules/app/controller/UserMoneyDetailsController.java index a75b55b9..e5c2439f 100644 --- a/src/main/java/com/sqx/modules/app/controller/UserMoneyDetailsController.java +++ b/src/main/java/com/sqx/modules/app/controller/UserMoneyDetailsController.java @@ -21,8 +21,8 @@ public class UserMoneyDetailsController { @ApiOperation("钱包明细") @GetMapping("/queryUserMoneyDetails") - public Result queryUserMoneyDetails(Integer page, Integer limit,Long sysUserId, Long userId,Integer classify,Integer type) { - return userMoneyDetailsService.queryUserMoneyDetails(page, limit, sysUserId, userId,classify,type); + public Result queryUserMoneyDetails(Integer page, Integer limit,Long sysUserId, Long userId,Integer classify,Integer type, Integer moneyType) { + return userMoneyDetailsService.queryUserMoneyDetails(page, limit, sysUserId, userId,classify,type, moneyType); } @GetMapping("/selectUserMoney") diff --git a/src/main/java/com/sqx/modules/app/controller/app/AppUserMoneyDetailsController.java b/src/main/java/com/sqx/modules/app/controller/app/AppUserMoneyDetailsController.java index b84674d4..f6dbfb26 100644 --- a/src/main/java/com/sqx/modules/app/controller/app/AppUserMoneyDetailsController.java +++ b/src/main/java/com/sqx/modules/app/controller/app/AppUserMoneyDetailsController.java @@ -25,8 +25,8 @@ public class AppUserMoneyDetailsController { @Login @ApiOperation("钱包明细") @GetMapping("/queryUserMoneyDetails") - public Result queryUserMoneyDetails(Integer page, Integer limit, @RequestAttribute Long userId,Integer classify,Integer type) { - return userMoneyDetailsService.queryUserMoneyDetails(page, limit,null, userId,classify,type); + public Result queryUserMoneyDetails(Integer page, Integer limit, @RequestAttribute Long userId,Integer classify,Integer type, Integer moneyType) { + return userMoneyDetailsService.queryUserMoneyDetails(page, limit,null, userId,classify,type, moneyType); } @Login 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 20e1ebf9..c2a76808 100644 --- a/src/main/java/com/sqx/modules/app/entity/UserMoneyDetails.java +++ b/src/main/java/com/sqx/modules/app/entity/UserMoneyDetails.java @@ -75,6 +75,10 @@ public class UserMoneyDetails implements Serializable { */ @ApiModelProperty("内容") private String content; + + @ApiModelProperty("金额类型： 1 红包，2金豆") + private Integer moneyType; + /** * 创建时间 */ @@ -86,18 +90,18 @@ public class UserMoneyDetails implements Serializable { } /** - * * @param userId 用户Id tb_user的id * @param sysUserId 系统用户Id tb_sys_user的id * @param byUserId 对应用户Id - * @param title 标题 - * @param classify 1注册 2首次购买 3购买 4提现 5现金大转盘 6 分享 7 分享达标 - * @param type 类别（1充值2支出） - * @param state 状态 1待支付 2已到账 3取消 - * @param money 金额 - * @param content 内容描述 + * @param title 标题 + * @param classify 1注册 2首次购买 3购买 4提现 5现金大转盘 6 分享 7 分享达标 + * @param type 类别（1充值2支出） + * @param state 状态 1待支付 2已到账 3取消 + * @param money 金额 + * @param content 内容描述 */ - public UserMoneyDetails(Long userId, Long sysUserId, Long byUserId, String title, Integer classify, Integer type, Integer state, BigDecimal money, String content) { + public UserMoneyDetails(Long userId, Long sysUserId, Long byUserId, String title, Integer classify, Integer type, + Integer state, BigDecimal money, String content, Integer moneyType) { this.userId = userId; this.sysUserId = sysUserId; this.byUserId = byUserId; @@ -108,5 +112,6 @@ public class UserMoneyDetails implements Serializable { this.money = money; this.content = content; this.createTime = DateUtil.now(); + this.moneyType = moneyType; } } diff --git a/src/main/java/com/sqx/modules/app/service/UserMoneyDetailsService.java b/src/main/java/com/sqx/modules/app/service/UserMoneyDetailsService.java index 55b548fd..fbf185e9 100644 --- a/src/main/java/com/sqx/modules/app/service/UserMoneyDetailsService.java +++ b/src/main/java/com/sqx/modules/app/service/UserMoneyDetailsService.java @@ -5,6 +5,6 @@ import com.sqx.common.utils.Result; import com.sqx.modules.app.entity.UserMoneyDetails; public interface UserMoneyDetailsService extends IService { - Result queryUserMoneyDetails(Integer page, Integer limit,Long sysUserId,Long userId,Integer classify,Integer type); + Result queryUserMoneyDetails(Integer page, Integer limit,Long sysUserId,Long userId,Integer classify,Integer type, Integer moneyType); Double monthIncome(String date,Long userId); } diff --git a/src/main/java/com/sqx/modules/app/service/impl/UserMoneyDetailsServiceImpl.java b/src/main/java/com/sqx/modules/app/service/impl/UserMoneyDetailsServiceImpl.java index 1a00a4d2..7bd51acb 100644 --- a/src/main/java/com/sqx/modules/app/service/impl/UserMoneyDetailsServiceImpl.java +++ b/src/main/java/com/sqx/modules/app/service/impl/UserMoneyDetailsServiceImpl.java @@ -14,27 +14,30 @@ import org.springframework.stereotype.Service; public class UserMoneyDetailsServiceImpl extends ServiceImpl implements UserMoneyDetailsService { @Override - public Result queryUserMoneyDetails(Integer page, Integer limit,Long sysUserId,Long userId,Integer classify,Integer type) { + public Result queryUserMoneyDetails(Integer page, Integer limit, Long sysUserId, Long userId, Integer classify, Integer type, Integer moneyType) { IPage page1 = new Page(page, limit); QueryWrapper queryWrapper = new QueryWrapper(); - if(sysUserId!=null){ + if (sysUserId != null) { queryWrapper.eq("sys_user_id", sysUserId); } - if(userId!=null){ + if (userId != null) { queryWrapper.eq("user_id", userId); } - if(classify!=null){ + if (classify != null) { queryWrapper.eq("classify", classify); } - if(type!=null){ + if (type != null) { queryWrapper.eq("type", type); } + if (moneyType != null) { + queryWrapper.eq("money_type", moneyType); + } queryWrapper.orderByDesc("create_time"); return Result.success().put("data", baseMapper.selectPage(page1, queryWrapper)); } @Override public Double monthIncome(String date, Long userId) { - return baseMapper.monthIncome(date,userId); + return baseMapper.monthIncome(date, userId); } } diff --git a/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java b/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java index 0c77ea3e..0887d957 100644 --- a/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java +++ b/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java @@ -160,6 +160,7 @@ public class UserServiceImpl extends ServiceImpl implements userMoneyDetails.setClassify(1); userMoneyDetails.setMoney(new BigDecimal(money)); userMoneyDetails.setCreateTime(sdf.format(new Date())); + userMoneyDetails.setMoneyType(2); userMoneyDetailsService.save(userMoneyDetails); messageInfo.setContent("2"); @@ -188,6 +189,7 @@ public class UserServiceImpl extends ServiceImpl implements userMoneyDetails.setClassify(1); userMoneyDetails.setMoney(new BigDecimal(money)); userMoneyDetails.setCreateTime(sdf.format(new Date())); + userMoneyDetails.setMoneyType(2); userMoneyDetailsService.save(userMoneyDetails); //发送短信 @@ -232,6 +234,7 @@ public class UserServiceImpl extends ServiceImpl implements userMoneyDetails.setClassify(1); userMoneyDetails.setMoney(money); userMoneyDetails.setCreateTime(DateUtils.format(new Date())); + userMoneyDetails.setMoneyType(2); userMoneyDetailsService.save(userMoneyDetails); } return Result.success(); diff --git a/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningController.java b/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningController.java index 81dc78b2..655058f1 100644 --- a/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningController.java +++ b/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningController.java @@ -213,7 +213,7 @@ public class DiscSpinningController { UserEntity userInfo = userService.queryByUserId(receive.getUserId()); UserMoneyDetails userMoneyDetails = new UserMoneyDetails( receive.getUserId(), null, null, "[现金大转盘]", 5, 1, 2, - receive.getNumber(), "现金红包奖励" + receive.getNumber() + "元"); + receive.getNumber(), "现金红包奖励" + receive.getNumber() + "元", 1); //上一秒 userMoneyDetails.setCreateTime(DateUtil.format(new Date(System.currentTimeMillis() - 1000), "yyyy-MM-dd HH:mm:ss")); userMoneyDetailsService.save(userMoneyDetails); @@ -246,7 +246,7 @@ public class DiscSpinningController { UserMoneyDetails userMoneyDetails = new UserMoneyDetails( userInfo.getUserId(), null, null, "[现金大转盘]", 4, 2, 1, - new BigDecimal(money), "现金红包自动提现" + money + "元"); + new BigDecimal(money), "现金红包自动提现" + money + "元", 1); userMoneyDetailsService.save(userMoneyDetails); //减去余额 钱 userMoneyService.updateAmount(2, userInfo.getUserId(), money); diff --git a/src/main/java/com/sqx/modules/integral/service/Impl/UserIntegralDetailsServiceImpl.java b/src/main/java/com/sqx/modules/integral/service/Impl/UserIntegralDetailsServiceImpl.java index 908dfaf3..e18f884e 100644 --- a/src/main/java/com/sqx/modules/integral/service/Impl/UserIntegralDetailsServiceImpl.java +++ b/src/main/java/com/sqx/modules/integral/service/Impl/UserIntegralDetailsServiceImpl.java @@ -129,6 +129,7 @@ public class UserIntegralDetailsServiceImpl extends ServiceImpl map=new HashMap<>(); - map.put("url",one.getValue()); - map.put("user",userEntity); - return Result.success().put("data",map); + Map map = new HashMap<>(); + map.put("url", one.getValue()); + map.put("user", userEntity); + return Result.success().put("data", map); } @Login @RequestMapping(value = "/selectInviteMoney", method = RequestMethod.GET) @ApiOperation("我的收益") @ResponseBody - public Result selectInviteMoney(@RequestAttribute("userId") Long userId){ + 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); + Map result = new HashMap<>(); + result.put("inviteMoney", inviteMoney); + result.put("inviteCount", inviteCount); + result.put("inviteSignCount", inviteSignCount); + return Result.success().put("data", result); } @GetMapping("/mpCreateQr") @ApiOperation("微信小程序推广二维码") - public void mpCreateQr(String invitationCode,String page, HttpServletResponse response) { - SenInfoCheckUtil.getPoster(invitationCode,page,response); + public void mpCreateQr(String invitationCode, String page, HttpServletResponse response) { + SenInfoCheckUtil.getPoster(invitationCode, page, response); } @GetMapping("/dyCreateQr") @ApiOperation("抖音小程序推广二维码") - public void dyCreateQr(String invitationCode,String page, HttpServletResponse response) { - SenInfoCheckUtil.getDyImg(invitationCode,page,response); + public void dyCreateQr(String invitationCode, String page, HttpServletResponse response) { + SenInfoCheckUtil.getDyImg(invitationCode, page, response); } @GetMapping("/insertQrCode") @ApiOperation("生成二维码") - public void selectQrCode(String content,String courseId, HttpServletResponse servletResponse) throws Exception{ + public void selectQrCode(String content, String courseId, HttpServletResponse servletResponse) throws Exception { String invitationCode = commonInfoService.findOne(88).getValue(); - String value=""; - if(StringUtils.isNotBlank(courseId)){ - value=urlAddressService.selectUrlAddressOne().getUrlAddress()+"?invitation="+invitationCode+"&qdCode="+content+"&id="+courseId; - }else{ - value=urlAddressService.selectUrlAddressOne().getUrlAddress()+"?invitation="+invitationCode+"&qdCode="+content; + String value = ""; + if (StringUtils.isNotBlank(courseId)) { + value = urlAddressService.selectUrlAddressOne().getUrlAddress() + "?invitation=" + invitationCode + "&qdCode=" + content + "&id=" + courseId; + } else { + value = urlAddressService.selectUrlAddressOne().getUrlAddress() + "?invitation=" + invitationCode + "&qdCode=" + content; } - QrCodeUtil.generate(value,qrconig,"png",servletResponse.getOutputStream()); + QrCodeUtil.generate(value, qrconig, "png", servletResponse.getOutputStream()); } @Login @RequestMapping(value = "/selectInviteByUserIdLists", method = RequestMethod.GET) @ApiOperation("查看我邀请的人员列表(查看所有邀请列表)") @ResponseBody - public Result selectInviteByUserIdLists(int page,int limit,@RequestAttribute("userId") Long userId,Integer userType){ - PageUtils pageUtils = inviteService.selectInviteUser(page, limit, userId,null,userType); - return Result.success().put("data",pageUtils); + public Result selectInviteByUserIdLists(int page, int limit, @RequestAttribute("userId") Long userId, Integer userType) { + PageUtils pageUtils = inviteService.selectInviteUser(page, limit, userId, null, userType); + return Result.success().put("data", pageUtils); } @Login @ApiOperation("钱包明细") @GetMapping("/queryUserMoneyDetails") - public Result queryUserMoneyDetails(Integer page, Integer limit,@RequestAttribute("userId") Long userId,Integer classify,Integer type) { - return userMoneyDetailsService.queryUserMoneyDetails(page, limit,null, userId,2,type); + public Result queryUserMoneyDetails(Integer page, Integer limit, @RequestAttribute("userId") Long userId, Integer classify, Integer type, Integer moneyType) { + return userMoneyDetailsService.queryUserMoneyDetails(page, limit, null, userId, 2, type, moneyType); } @GetMapping("/selectInviteAwardList") @ApiOperation("查询邀请奖励列表") - public Result selectInviteAwardList(Integer page,Integer limit){ - return Result.success().put("data",inviteAwardService.page(new Page<>(page,limit),new QueryWrapper().orderByAsc("invite_count"))); + public Result selectInviteAwardList(Integer page, Integer limit) { + return Result.success().put("data", inviteAwardService.page(new Page<>(page, limit), new QueryWrapper().orderByAsc("invite_count"))); } @Login @GetMapping("/selectInviteAwardByUserId") @ApiOperation("查询当前邀请人数的下一个等级") - public Result selectInviteAwardByUserId(@LoginUser UserEntity userEntity){ + public Result selectInviteAwardByUserId(@LoginUser UserEntity userEntity) { int inviterCount = userService.queryInviterCount(userEntity.getInvitationCode()); - return Result.success().put("data",inviteAwardService.getOne(new QueryWrapper().gt("invite_count",inviterCount) + return Result.success().put("data", inviteAwardService.getOne(new QueryWrapper().gt("invite_count", inviterCount) .last(" order by invite_count limit 1"))); } @Login @GetMapping("/selectInviteUserListByUserId") @ApiOperation("查询当前邀请人列表") - public Result selectInviteUserListByUserId(@LoginUser UserEntity userEntity){ - return Result.success().put("data",userService.list(new QueryWrapper().eq("inviter_code",userEntity.getInvitationCode()))); + public Result selectInviteUserListByUserId(@LoginUser UserEntity userEntity) { + return Result.success().put("data", userService.list(new QueryWrapper().eq("inviter_code", userEntity.getInvitationCode()))); } @Login @PostMapping("/inviteMoneyConvertUserMoney") @ApiOperation("收益充值京豆") - public Result inviteMoneyConvertUserMoney(@LoginUser UserEntity userEntity, Long payClassifyId){ - return inviteMoneyService.inviteMoneyConvertUserMoney(userEntity,payClassifyId); + public Result inviteMoneyConvertUserMoney(@LoginUser UserEntity userEntity, Long payClassifyId) { + return inviteMoneyService.inviteMoneyConvertUserMoney(userEntity, payClassifyId); } } diff --git a/src/main/java/com/sqx/modules/invite/service/impl/InviteMoneyServiceImpl.java b/src/main/java/com/sqx/modules/invite/service/impl/InviteMoneyServiceImpl.java index 462421bc..959fc252 100644 --- a/src/main/java/com/sqx/modules/invite/service/impl/InviteMoneyServiceImpl.java +++ b/src/main/java/com/sqx/modules/invite/service/impl/InviteMoneyServiceImpl.java @@ -88,6 +88,7 @@ public class InviteMoneyServiceImpl extends ServiceImpl implements userMoneyDetails.setCreateTime(format); userMoneyDetails.setTitle("[分享奖励金豆]"); userMoneyDetails.setContent("获取金豆:" + money); + userMoneyDetails.setMoneyType(2); userMoneyDetailsService.save(userMoneyDetails); } @@ -250,6 +251,7 @@ public class InviteServiceImpl extends ServiceImpl implements userMoneyDetails.setCreateTime(format); userMoneyDetails.setTitle("[邀请好友]好友名称：" + userEntity1.getUserName()); userMoneyDetails.setContent("获取佣金:" + money); + userMoneyDetails.setMoneyType(1); userMoneyDetailsService.save(userMoneyDetails); result.put("oneUserId", userEntity.getUserId()); result.put("oneMoney", money); @@ -286,6 +288,7 @@ public class InviteServiceImpl extends ServiceImpl implements userMoneyDetails.setClassify(2); userMoneyDetails.setTitle("[邀请好友]好友名称：" + userEntity1.getUserName()); userMoneyDetails.setContent("获取佣金:" + money); + userMoneyDetails.setMoneyType(1); userMoneyDetailsService.save(userMoneyDetails); result.put("twoUserId", two.getUserId()); result.put("twoMoney", money); @@ -315,6 +318,7 @@ public class InviteServiceImpl extends ServiceImpl implements title = title + "，二级推广员扣除收益：" + twoMoney; } userMoneyDetails.setContent(title + "，到账佣金:" + sumMoney); + userMoneyDetails.setMoneyType(1); userMoneyDetailsService.save(userMoneyDetails); result.put("sysUserId", sysUserEntity.getUserId()); result.put("qdMoney", sumMoney); diff --git a/src/main/java/com/sqx/modules/job/task/CashOutTask.java b/src/main/java/com/sqx/modules/job/task/CashOutTask.java index 74f86660..19dbe0ff 100644 --- a/src/main/java/com/sqx/modules/job/task/CashOutTask.java +++ b/src/main/java/com/sqx/modules/job/task/CashOutTask.java @@ -48,7 +48,7 @@ public class CashOutTask implements ITask { UserMoneyDetails userMoneyDetails = new UserMoneyDetails( cashOut.getUserId(),null,null,"提现失败",4,1,1, - new BigDecimal(cashOut.getMoney()),"提现失败存入余额" + cashOut.getMoney() + "元"); + new BigDecimal(cashOut.getMoney()),"提现失败存入余额" + cashOut.getMoney() + "元", 1); //存入余额 钱 userMoneyService.updateAmount(1, cashOut.getUserId(), Double.parseDouble(cashOut.getMoney())); diff --git a/src/main/java/com/sqx/modules/orders/service/impl/OrdersServiceImpl.java b/src/main/java/com/sqx/modules/orders/service/impl/OrdersServiceImpl.java index 9378a896..f4580a47 100644 --- a/src/main/java/com/sqx/modules/orders/service/impl/OrdersServiceImpl.java +++ b/src/main/java/com/sqx/modules/orders/service/impl/OrdersServiceImpl.java @@ -355,6 +355,7 @@ public class OrdersServiceImpl extends ServiceImpl implements userMoneyDetails.setClassify(1); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); userMoneyDetails.setCreateTime(simpleDateFormat.format(new Date())); + userMoneyDetails.setMoneyType(2); userMoneyDetailsService.save(userMoneyDetails); orders.setPayWay(6); orders.setDiamond(1); @@ -432,6 +433,7 @@ public class OrdersServiceImpl extends ServiceImpl implements userMoneyDetails.setClassify(1); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); userMoneyDetails.setCreateTime(simpleDateFormat.format(new Date())); + userMoneyDetails.setMoneyType(1); userMoneyDetailsService.save(userMoneyDetails); } bean.setStatus(2); diff --git a/src/main/java/com/sqx/modules/pay/controller/CashController.java b/src/main/java/com/sqx/modules/pay/controller/CashController.java index e4f302b9..ae225d2c 100644 --- a/src/main/java/com/sqx/modules/pay/controller/CashController.java +++ b/src/main/java/com/sqx/modules/pay/controller/CashController.java @@ -449,6 +449,7 @@ public class CashController { userMoneyDetails.setClassify(2); userMoneyDetails.setMoney(new BigDecimal(v)); userMoneyDetails.setCreateTime(sdf.format(now)); + userMoneyDetails.setMoneyType(2); userMoneyDetailsService.save(userMoneyDetails); userMoneyService.updateSysMoney(1, userId, v); } else { @@ -461,6 +462,7 @@ public class CashController { userMoneyDetails.setClassify(2); userMoneyDetails.setMoney(new BigDecimal(v)); userMoneyDetails.setCreateTime(sdf.format(now)); + userMoneyDetails.setMoneyType(1); userMoneyDetailsService.save(userMoneyDetails); inviteMoneyDao.updateInviteMoneyCashOut(1, v, userId); if (userInfo.getOpenId() != null) { diff --git a/src/main/java/com/sqx/modules/pay/controller/app/AliPayController.java b/src/main/java/com/sqx/modules/pay/controller/app/AliPayController.java index 49856145..14bdc3ce 100644 --- a/src/main/java/com/sqx/modules/pay/controller/app/AliPayController.java +++ b/src/main/java/com/sqx/modules/pay/controller/app/AliPayController.java @@ -158,6 +158,7 @@ public class AliPayController { userMoneyDetails.setType(1); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); userMoneyDetails.setCreateTime(simpleDateFormat.format(new Date())); + userMoneyDetails.setMoneyType(2); userMoneyDetailsService.save(userMoneyDetails); } @@ -243,6 +244,7 @@ public class AliPayController { userMoneyDetails.setType(1); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); userMoneyDetails.setCreateTime(simpleDateFormat.format(new Date())); + userMoneyDetails.setMoneyType(2); userMoneyDetailsService.save(userMoneyDetails); } } diff --git a/src/main/java/com/sqx/modules/pay/controller/app/AppCashController.java b/src/main/java/com/sqx/modules/pay/controller/app/AppCashController.java index b194aaea..217c42e8 100644 --- a/src/main/java/com/sqx/modules/pay/controller/app/AppCashController.java +++ b/src/main/java/com/sqx/modules/pay/controller/app/AppCashController.java @@ -73,8 +73,8 @@ public class AppCashController { @Login @ApiOperation("钱包明细") @GetMapping("/queryUserMoneyDetails") - public Result queryUserMoneyDetails(Integer page, Integer limit, @RequestAttribute("userId") Long userId, Integer classify, Integer type) { - return userMoneyDetailsService.queryUserMoneyDetails(page, limit, null, userId, 2, type); + public Result queryUserMoneyDetails(Integer page, Integer limit, @RequestAttribute("userId") Long userId, Integer classify, Integer type, Integer moneyType) { + return userMoneyDetailsService.queryUserMoneyDetails(page, limit, null, userId, 2, type, moneyType); } diff --git a/src/main/java/com/sqx/modules/pay/controller/app/IosPayController.java b/src/main/java/com/sqx/modules/pay/controller/app/IosPayController.java index 07f90ddc..cc8a9be5 100644 --- a/src/main/java/com/sqx/modules/pay/controller/app/IosPayController.java +++ b/src/main/java/com/sqx/modules/pay/controller/app/IosPayController.java @@ -128,6 +128,7 @@ public class IosPayController { userMoneyDetails.setClassify(1); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); userMoneyDetails.setCreateTime(simpleDateFormat.format(new Date())); + userMoneyDetails.setMoneyType(2); userMoneyDetailsService.save(userMoneyDetails); } else { return Result.error("订单无效!"); 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 6fe0c107..8d03d187 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 @@ -139,7 +139,7 @@ public class WuyouController { UserMoneyDetails userMoneyDetails = new UserMoneyDetails( cashOut.getUserId(), null, null, "提现失败", 4, 1, 1, - new BigDecimal(cashOut.getMoney()), "提现失败存入余额" + cashOut.getMoney() + "元"); + new BigDecimal(cashOut.getMoney()), "提现失败存入余额" + cashOut.getMoney() + "元", 1); //存入余额 钱 userMoneyService.updateAmount(1, cashOut.getUserId(), Double.parseDouble(cashOut.getMoney())); userMoneyDetailsService.save(userMoneyDetails); @@ -241,6 +241,7 @@ public class WuyouController { userMoneyDetails.setTitle("分享达标奖励"); userMoneyDetails.setState(2); userMoneyDetails.setType(1); + userMoneyDetails.setMoneyType(1); userMoneyDetailsService.save(userMoneyDetails); //存入余额 钱 userMoneyService.updateAmount(1, sourceUser.getUserId(), Double.parseDouble(amount)); diff --git a/src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java b/src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java index 54f43334..b7c6ebb1 100644 --- a/src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java +++ b/src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java @@ -315,6 +315,7 @@ public class CashOutServiceImpl extends ServiceImpl impleme userMoneyDetails.setMoney(new BigDecimal(moneySum)); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); userMoneyDetails.setCreateTime(sdf.format(new Date())); + userMoneyDetails.setMoneyType(1); userMoneyDetailsService.save(userMoneyDetails); CashOut cashOut = new CashOut(); cashOut.setState(0); @@ -375,6 +376,7 @@ public class CashOutServiceImpl extends ServiceImpl impleme userMoneyDetails.setMoney(new BigDecimal(moneySum)); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); userMoneyDetails.setCreateTime(sdf.format(new Date())); + userMoneyDetails.setMoneyType(1); userMoneyDetailsService.save(userMoneyDetails); CashOut cashOut = new CashOut(); cashOut.setState(0); @@ -455,6 +457,7 @@ public class CashOutServiceImpl extends ServiceImpl impleme userMoneyDetails.setClassify(4); userMoneyDetails.setMoney(new BigDecimal(money)); userMoneyDetails.setCreateTime(DateUtil.now()); + userMoneyDetails.setMoneyType(1); UserMoney userMoney; if (isSys) { userMoney = userMoneyService.selectSysUserMoneyByUserId(userId); diff --git a/src/main/java/com/sqx/modules/pay/service/impl/DyServiceImpl.java b/src/main/java/com/sqx/modules/pay/service/impl/DyServiceImpl.java index ebd02b70..91ec7179 100644 --- a/src/main/java/com/sqx/modules/pay/service/impl/DyServiceImpl.java +++ b/src/main/java/com/sqx/modules/pay/service/impl/DyServiceImpl.java @@ -446,6 +446,7 @@ public class DyServiceImpl implements DyService { userMoneyDetails.setClassify(1); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); userMoneyDetails.setCreateTime(simpleDateFormat.format(new Date())); + userMoneyDetails.setMoneyType(2); userMoneyDetailsService.save(userMoneyDetails); } @@ -541,6 +542,7 @@ public class DyServiceImpl implements DyService { userMoneyDetails.setTitle("抖音充值："+payClassify.getMoney()+",赠送："+payClassify.getGiveMoney()); userMoneyDetails.setMoney(BigDecimal.valueOf(payDetails.getMoney())); } + userMoneyDetails.setMoneyType(2); userMoneyDetails.setType(1); userMoneyDetails.setClassify(1); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); @@ -612,4 +614,4 @@ public class DyServiceImpl implements DyService { -} \ No newline at end of file +} diff --git a/src/main/java/com/sqx/modules/pay/service/impl/KsServiceImpl.java b/src/main/java/com/sqx/modules/pay/service/impl/KsServiceImpl.java index 02cbf84a..186d56e9 100644 --- a/src/main/java/com/sqx/modules/pay/service/impl/KsServiceImpl.java +++ b/src/main/java/com/sqx/modules/pay/service/impl/KsServiceImpl.java @@ -218,6 +218,7 @@ public class KsServiceImpl implements KsService { userMoneyDetails.setClassify(1); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); userMoneyDetails.setCreateTime(simpleDateFormat.format(new Date())); + userMoneyDetails.setMoneyType(2); userMoneyDetailsService.save(userMoneyDetails); } @@ -349,4 +350,4 @@ public class KsServiceImpl implements KsService { -} \ No newline at end of file +} diff --git a/src/main/java/com/sqx/modules/pay/service/impl/WxServiceImpl.java b/src/main/java/com/sqx/modules/pay/service/impl/WxServiceImpl.java index 2066600f..3f8f7eb9 100644 --- a/src/main/java/com/sqx/modules/pay/service/impl/WxServiceImpl.java +++ b/src/main/java/com/sqx/modules/pay/service/impl/WxServiceImpl.java @@ -319,6 +319,7 @@ public class WxServiceImpl implements WxService { userMoneyDetails.setType(1); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); userMoneyDetails.setCreateTime(simpleDateFormat.format(new Date())); + userMoneyDetails.setMoneyType(2); userMoneyDetailsService.save(userMoneyDetails); } @@ -397,6 +398,7 @@ public class WxServiceImpl implements WxService { userMoneyDetails.setType(1); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); userMoneyDetails.setCreateTime(simpleDateFormat.format(new Date())); + userMoneyDetails.setMoneyType(2); userMoneyDetailsService.save(userMoneyDetails); } @@ -467,4 +469,4 @@ public class WxServiceImpl implements WxService { return false; } } -} \ No newline at end of file +} diff --git a/src/main/java/com/sqx/modules/taskCenter/service/impl/TaskCenterServiceImpl.java b/src/main/java/com/sqx/modules/taskCenter/service/impl/TaskCenterServiceImpl.java index 73d620a4..7acd450e 100644 --- a/src/main/java/com/sqx/modules/taskCenter/service/impl/TaskCenterServiceImpl.java +++ b/src/main/java/com/sqx/modules/taskCenter/service/impl/TaskCenterServiceImpl.java @@ -186,7 +186,7 @@ public class TaskCenterServiceImpl extends ServiceImpl