钱包相关

src/main/java/com/sqx/modules/app/controller/UserMoneyDetailsController.java

@@ -33,8 +33,8 @@ public class UserMoneyDetailsController {
 
     @ApiOperation("钱包明细")
     @GetMapping("/selectUserMoneyDetails")
-    public Result selectUserMoneyDetails(Integer page, Integer limit,Long userId, Integer classify) {
-        return userMoneyDetailsService.selectUserMoneyDetails(page, limit, userId,classify);
+    public Result selectUserMoneyDetails(Integer page, Integer limit,Long userId, Integer classify,Integer type) {
+        return userMoneyDetailsService.selectUserMoneyDetails(page, limit, userId,classify,type);
     }
 
     @ApiOperation("保证金管理")

src/main/java/com/sqx/modules/app/controller/app/AppUserMoneyController.java

@@ -43,8 +43,8 @@ public class AppUserMoneyController {
     @Login
     @ApiOperation("钱包明细")
     @GetMapping("/selectUserMoneyDetails")
-    public Result selectUserMoneyDetails(Integer page, Integer limit, @RequestAttribute("userId") Long userId,Integer classify) {
-        return userMoneyDetailsService.selectUserMoneyDetails(page, limit, userId,classify);
+    public Result selectUserMoneyDetails(Integer page, Integer limit, @RequestAttribute("userId") Long userId,Integer classify,Integer type) {
+        return userMoneyDetailsService.selectUserMoneyDetails(page, limit, userId,classify,type);
     }
 
 

src/main/java/com/sqx/modules/app/service/UserMoneyDetailsService.java

@@ -12,7 +12,7 @@ import java.util.HashMap;
 public interface UserMoneyDetailsService extends IService<UserMoneyDetails> {
     Result queryUserMoneyDetails(Integer page, Integer limit, UserMoneyDetails userMoneyDetails);
 
-    Result selectUserMoneyDetails(Integer page, Integer limit,Long userId, Integer classify);
+    Result selectUserMoneyDetails(Integer page, Integer limit,Long userId, Integer classify,Integer type);
 
     Double monthIncome(String date,Long userId);
 

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

@@ -34,11 +34,11 @@ public class UserMoneyDetailsServiceImpl extends ServiceImpl<UserMoneyDetailsDao
     }
 
     @Override
-    public Result selectUserMoneyDetails(Integer page, Integer limit,Long userId, Integer classify) {
+    public Result selectUserMoneyDetails(Integer page, Integer limit,Long userId, Integer classify,Integer type) {
         //原类别 1保证金 2抽佣金额 3师傅订单收益 4余额充值（后续再加） 5用户提现 6师傅提现 7用户支付订单  8会员分销 9退款
         //1保证金（1） 2分销收益（2）3用户钱包（4，5，7，8） 4师傅钱包（3,6,8）
         return Result.success().put("data", baseMapper.selectPage(new Page<>(page,limit),
-                new QueryWrapper<UserMoneyDetails>().eq("user_id",userId)
+                new QueryWrapper<UserMoneyDetails>().eq("user_id",userId).eq(type != null && type != 0, "type", type)
                         .eq(classify==1,"classify",1)
                         .eq(classify==2,"classify",2)
                         .in(classify==3,"classify",4,5,7,8,9)

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

@@ -950,8 +950,8 @@ public class OrdersServiceImp extends ServiceImpl<OrdersDao, Orders> implements
 
 
             UserMoneyDetails userMoneyDetails=new UserMoneyDetails();
-            userMoneyDetails.setTitle("完成订单："+orders.getOrdersNo());
-            userMoneyDetails.setContent("到账收益："+orders.getDriveMoney());
+            userMoneyDetails.setTitle("完成订单：");
+            userMoneyDetails.setContent("到账收益："+orders.getDriveMoney()+" 订单号："+orders.getOrdersNo());
             userMoneyDetails.setUserType(2);
             userMoneyDetails.setUserId(driver.getUserId());
             userMoneyDetails.setMoney(orders.getDriveMoney());

src/main/java/com/sqx/modules/pay/controller/CashController.java

@@ -605,9 +605,10 @@ public class CashController {
                 UserMoneyDetails userMoneyDetails = new UserMoneyDetails();
                 userMoneyDetails.setUserId(userInfo.getUserId());
                 userMoneyDetails.setUserType(2);
-                userMoneyDetails.setTitle("[退款提醒]退款：" + one.getRate());
+                userMoneyDetails.setTitle("提现失败退款");
                 userMoneyDetails.setContent("退款原因：" + content);
                 userMoneyDetails.setType(1);
+                userMoneyDetails.setClassify(6);
                 userMoneyDetails.setMoney(money);
                 userMoneyDetails.setCreateTime(sdf.format(now));
                 userMoneyDetailsService.save(userMoneyDetails);

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

@@ -314,11 +314,13 @@ public class CashOutServiceImpl extends ServiceImpl<CashOutDao, CashOut> impleme
 
                 moneyDetails.setUserId(userId);
                 moneyDetails.setUserType(userType);
-                moneyDetails.setTitle("提现：" + money);
+
 
                 if (classify == 1) {
+                    moneyDetails.setTitle("支付宝提现：");
                     moneyDetails.setContent("支付宝提现：" + money + "，扣除总金额：" + moneySum + "，手续费：" + mul);
                 } else {
+                    moneyDetails.setTitle("微信提现：");
                     cashOut.setCashQrCode(userEntity.getCashQrCode());
                     moneyDetails.setContent("微信提现：" + money + "，扣除总金额：" + moneySum + "，手续费：" + mul);
                 }