流水区分金豆和钱

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

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) {
+    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);
+        return userMoneyDetailsService.queryUserMoneyDetails(page, limit, sysUserId, userId,classify,type, moneyType);
     }
 
     @GetMapping("/selectUserMoney")

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) {
+    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);
+        return userMoneyDetailsService.queryUserMoneyDetails(page, limit,null, userId,classify,type, moneyType);
     }
 
     @Login

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,7 +90,6 @@ public class UserMoneyDetails implements Serializable {
     }
 
     /**
-     *
      * @param userId    用户Id tb_user的id
      * @param sysUserId 系统用户Id tb_sys_user的id
      * @param byUserId  对应用户Id
@@ -97,7 +100,8 @@ public class UserMoneyDetails implements Serializable {
      * @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;
     }
 }

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

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

@@ -14,7 +14,7 @@ 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) {
@@ -29,6 +29,9 @@ public class UserMoneyDetailsServiceImpl extends ServiceImpl<UserMoneyDetailsDao
         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));
     }

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

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

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

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

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

src/main/java/com/sqx/modules/invite/controller/InviteController.java

@@ -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,6 +177,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();
     }

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

@@ -79,7 +79,6 @@ public class AppInviteController {
     }
 
 
-
     @RequestMapping(value = "/selectInviteAndPoster", method = RequestMethod.GET)
     @ApiOperation("查看我的邀请码和海报二维码")
     @ResponseBody
@@ -145,8 +144,8 @@ public class AppInviteController {
     @Login
     @ApiOperation("钱包明细")
     @GetMapping("/queryUserMoneyDetails")
-    public Result queryUserMoneyDetails(Integer page, Integer limit,@RequestAttribute("userId") Long userId,Integer classify,Integer 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);
+        return userMoneyDetailsService.queryUserMoneyDetails(page, limit, null, userId, 2, type, moneyType);
     }
 
     @GetMapping("/selectInviteAwardList")

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

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

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

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

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

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

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

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

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

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) {
+    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);
+        return userMoneyDetailsService.queryUserMoneyDetails(page, limit, null, userId, 2, type, moneyType);
     }
 
 

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

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

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

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

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

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

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

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

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