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-11 16:10:24 +08:00
parent 2f73eb9032
commit 211f99c87b
25 changed files with 111 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/sqx/modules/app/controller/UserController.java
View File

@@ -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 {
}
}

4
src/main/java/com/sqx/modules/app/controller/UserMoneyDetailsController.java
View File

@@ -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")

4
src/main/java/com/sqx/modules/app/controller/app/AppUserMoneyDetailsController.java
View File

@@ -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

21
src/main/java/com/sqx/modules/app/entity/UserMoneyDetails.java
View File

@@ -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;
}
}

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

@@ -5,6 +5,6 @@ import com.sqx.common.utils.Result;
import com.sqx.modules.app.entity.UserMoneyDetails;
public interface UserMoneyDetailsService extends IService<UserMoneyDetails> {
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);
}

15
src/main/java/com/sqx/modules/app/service/impl/UserMoneyDetailsServiceImpl.java
View File

@@ -14,27 +14,30 @@ import org.springframework.stereotype.Service;
public class UserMoneyDetailsServiceImpl extends ServiceImpl<UserMoneyDetailsDao, UserMoneyDetails> 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<UserMoneyDetails> page1 = new Page(page, limit);
QueryWrapper<UserMoneyDetails> 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);
}
}

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

@@ -160,6 +160,7 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> 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<UserDao, UserEntity> 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<UserDao, UserEntity> implements
userMoneyDetails.setClassify(1);
userMoneyDetails.setMoney(money);
userMoneyDetails.setCreateTime(DateUtils.format(new Date()));
userMoneyDetails.setMoneyType(2);
userMoneyDetailsService.save(userMoneyDetails);
}
return Result.success();

4
src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningController.java
View File

@@ -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);

3
src/main/java/com/sqx/modules/integral/service/Impl/UserIntegralDetailsServiceImpl.java
View File

@@ -129,6 +129,7 @@ public class UserIntegralDetailsServiceImpl extends ServiceImpl<UserIntegralDeta
userMoneyDetails.setClassify(1);
userMoneyDetails.setMoney(BigDecimal.valueOf(v));
userMoneyDetails.setCreateTime(sdf.format(new Date()));
userMoneyDetails.setMoneyType(2);
userMoneyDetailsService.save(userMoneyDetails);
return Result.success("积分兑换成功！");
}else{
@@ -136,4 +137,4 @@ public class UserIntegralDetailsServiceImpl extends ServiceImpl<UserIntegralDeta
}
}
}
}

4
src/main/java/com/sqx/modules/invite/controller/InviteController.java
View File

@@ -159,6 +159,7 @@ public class InviteController {
userMoneyDetails.setClassify(2);
userMoneyDetails.setMoney(new BigDecimal(money));
userMoneyDetails.setCreateTime(sdf.format(new Date()));
userMoneyDetails.setMoneyType(2);
userMoneyDetailsService.save(userMoneyDetails);
return Result.success();
}
@@ -176,9 +177,10 @@ public class InviteController {
userMoneyDetails.setClassify(2);
userMoneyDetails.setMoney(new BigDecimal(money));
userMoneyDetails.setCreateTime(sdf.format(new Date()));
userMoneyDetails.setMoneyType(2);
userMoneyDetailsService.save(userMoneyDetails);
return Result.success();
}
}
}

79
src/main/java/com/sqx/modules/invite/controller/app/AppInviteController.java
View File

@@ -66,116 +66,115 @@ public class AppInviteController {
@RequestMapping(value = "/selectInviteCount", method = RequestMethod.GET)
@ApiOperation("查看我邀请的人员数量")
@ResponseBody
public Result selectInviteCount(Integer state,Long userId){
return Result.success().put("data",inviteService.selectInviteCount(state,userId));
public Result selectInviteCount(Integer state, Long userId) {
return Result.success().put("data", inviteService.selectInviteCount(state, userId));
}
@Login
@RequestMapping(value = "/selectUserMoney", method = RequestMethod.GET)
@ApiOperation("查看我的钱包")
@ResponseBody
public Result selectUserMoney(@RequestAttribute("userId") Long userId){
return Result.success().put("data",userMoneyService.selectUserMoneyByUserId(userId));
public Result selectUserMoney(@RequestAttribute("userId") Long userId) {
return Result.success().put("data", userMoneyService.selectUserMoneyByUserId(userId));
}
@RequestMapping(value = "/selectInviteAndPoster", method = RequestMethod.GET)
@ApiOperation("查看我的邀请码和海报二维码")
@ResponseBody
public Result selectInviteAndPoster(Long userId){
public Result selectInviteAndPoster(Long userId) {
UserEntity userEntity = userService.queryByUserId(userId);
CommonInfo one = commonInfoService.findOne(19);
Map<String,Object> map=new HashMap<>();
map.put("url",one.getValue());
map.put("user",userEntity);
return Result.success().put("data",map);
Map<String, Object> 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<String,Object> result=new HashMap<>();
result.put("inviteMoney",inviteMoney);
result.put("inviteCount",inviteCount);
result.put("inviteSignCount",inviteSignCount);
return Result.success().put("data",result);
Map<String, Object> 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<InviteAward>().orderByAsc("invite_count")));
public Result selectInviteAwardList(Integer page, Integer limit) {
return Result.success().put("data", inviteAwardService.page(new Page<>(page, limit), new QueryWrapper<InviteAward>().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<InviteAward>().gt("invite_count",inviterCount)
return Result.success().put("data", inviteAwardService.getOne(new QueryWrapper<InviteAward>().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<UserEntity>().eq("inviter_code",userEntity.getInvitationCode())));
public Result selectInviteUserListByUserId(@LoginUser UserEntity userEntity) {
return Result.success().put("data", userService.list(new QueryWrapper<UserEntity>().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);
}
}

2
src/main/java/com/sqx/modules/invite/service/impl/InviteMoneyServiceImpl.java
View File

@@ -88,6 +88,7 @@ public class InviteMoneyServiceImpl extends ServiceImpl<InviteMoneyDao, InviteMo
userMoneyDetails.setClassify(2);
userMoneyDetails.setMoney(price);
userMoneyDetails.setCreateTime(DateUtils.format(new Date()));
userMoneyDetails.setMoneyType(1);
userMoneyDetailsService.save(userMoneyDetails);
userMoneyService.updateMoney(1,userEntity.getUserId(),add.doubleValue());
userMoneyDetails = new UserMoneyDetails();
@@ -98,6 +99,7 @@ public class InviteMoneyServiceImpl extends ServiceImpl<InviteMoneyDao, InviteMo
userMoneyDetails.setClassify(1);
userMoneyDetails.setMoney(add);
userMoneyDetails.setCreateTime(DateUtils.format(new Date()));
userMoneyDetails.setMoneyType(1);
userMoneyDetailsService.save(userMoneyDetails);
//创建订单返回对象
return Result.success();

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

@@ -166,6 +166,7 @@ public class InviteServiceImpl extends ServiceImpl<InviteDao, Invite> implements
userMoneyDetails.setCreateTime(format);
userMoneyDetails.setTitle("[分享奖励金豆]");
userMoneyDetails.setContent("获取金豆:" + money);
userMoneyDetails.setMoneyType(2);
userMoneyDetailsService.save(userMoneyDetails);
}
@@ -250,6 +251,7 @@ public class InviteServiceImpl extends ServiceImpl<InviteDao, Invite> 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<InviteDao, Invite> 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<InviteDao, Invite> implements
title = title + "，二级推广员扣除收益：" + twoMoney;
}
userMoneyDetails.setContent(title + "，到账佣金:" + sumMoney);
userMoneyDetails.setMoneyType(1);
userMoneyDetailsService.save(userMoneyDetails);
result.put("sysUserId", sysUserEntity.getUserId());
result.put("qdMoney", sumMoney);

2
src/main/java/com/sqx/modules/job/task/CashOutTask.java
View File

@@ -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()));

2
src/main/java/com/sqx/modules/orders/service/impl/OrdersServiceImpl.java
View File

@@ -355,6 +355,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> 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<OrdersDao, Orders> 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);

2
src/main/java/com/sqx/modules/pay/controller/CashController.java
View File

@@ -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) {

2
src/main/java/com/sqx/modules/pay/controller/app/AliPayController.java
View File

@@ -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);
}
}

4
src/main/java/com/sqx/modules/pay/controller/app/AppCashController.java
View File

@@ -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);
}

1
src/main/java/com/sqx/modules/pay/controller/app/IosPayController.java
View File

@@ -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("订单无效!");

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

@@ -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));

3
src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java
View File

@@ -315,6 +315,7 @@ public class CashOutServiceImpl extends ServiceImpl<CashOutDao, CashOut> 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<CashOutDao, CashOut> 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<CashOutDao, CashOut> impleme
userMoneyDetails.setClassify(4);
userMoneyDetails.setMoney(new BigDecimal(money));
userMoneyDetails.setCreateTime(DateUtil.now());
userMoneyDetails.setMoneyType(1);
UserMoney userMoney;
if (isSys) {
userMoney = userMoneyService.selectSysUserMoneyByUserId(userId);

4
src/main/java/com/sqx/modules/pay/service/impl/DyServiceImpl.java
View File

@@ -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 {
}
}

3
src/main/java/com/sqx/modules/pay/service/impl/KsServiceImpl.java
View File

@@ -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 {
}
}

4
src/main/java/com/sqx/modules/pay/service/impl/WxServiceImpl.java
View File

@@ -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;
}
}
}
}

4
src/main/java/com/sqx/modules/taskCenter/service/impl/TaskCenterServiceImpl.java
View File

@@ -186,7 +186,7 @@ public class TaskCenterServiceImpl extends ServiceImpl<TaskCenterDao, TaskCenter
case 1:
UserMoneyDetails userMoneyDetails1 = new UserMoneyDetails(
userId, null, null, "[任务中心]", 8, 1, 2,
new BigDecimal(reward.getNumber()), taskCenter.getTitle() + "任务完成,金豆奖励" + reward.getNumber());
new BigDecimal(reward.getNumber()), taskCenter.getTitle() + "任务完成,金豆奖励" + reward.getNumber(), 2);
userMoneyService.updateMoney(1, userId, reward.getNumber());
userMoneyDetailsService.save(userMoneyDetails1);
@@ -195,7 +195,7 @@ public class TaskCenterServiceImpl extends ServiceImpl<TaskCenterDao, TaskCenter
case 2:
UserMoneyDetails userMoneyDetails2 = new UserMoneyDetails(
userId, null, null, "[任务中心]", 8, 1, 2,
new BigDecimal(reward.getNumber()), taskCenter.getTitle() + "任务完成,现金奖励" + reward.getNumber());
new BigDecimal(reward.getNumber()), taskCenter.getTitle() + "任务完成,现金奖励" + reward.getNumber(), 1);
userMoneyService.updateAmount(1, userId, reward.getNumber());
userMoneyDetailsService.save(userMoneyDetails2);