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 03b26ca1..2e7c68bb 100644 --- a/src/main/java/com/sqx/modules/app/controller/UserController.java +++ b/src/main/java/com/sqx/modules/app/controller/UserController.java @@ -23,6 +23,7 @@ import com.sqx.modules.pay.dao.PayDetailsDao; import com.sqx.modules.pay.entity.PayDetails; import com.sqx.modules.pay.service.PayDetailsService; import com.sqx.modules.sys.entity.SysUserEntity; +import com.sqx.modules.sys.service.SysUserMoneyDetailsService; import com.sqx.modules.sys.service.SysUserService; import com.sqx.modules.utils.EasyPoi.ExcelUtils; import com.sqx.modules.utils.TimeCompleteUtils; @@ -60,6 +61,8 @@ public class UserController { @Autowired private UserMoneyDetailsService userMoneyDetailsService; @Autowired + private SysUserMoneyDetailsService sysUserMoneyDetailsService; + @Autowired private UserMoneyService userMoneyService; @Autowired private InviteMoneyService inviteMoneyService; @@ -263,14 +266,22 @@ public class UserController { homeMessageResponse.setNewMonth(userService.queryUserCount(2, null, null, qdCode)); //设置本年新增 homeMessageResponse.setNewYear(userService.queryUserCount(3, null, null, qdCode)); +// //设置总收入 +// homeMessageResponse.setTotalRevenue(userService.queryPayMoney(0, qdCode)); +// //设置今日收入 +// homeMessageResponse.setTodayRevenue(userService.queryPayMoney(1, qdCode)); +// //设置本月收入 +// homeMessageResponse.setMonthRevenue(userService.queryPayMoney(2, qdCode)); +// //设置本年收入 +// homeMessageResponse.setYearRevenue(userService.queryPayMoney(3, qdCode)); //设置总收入 - homeMessageResponse.setTotalRevenue(userService.queryPayMoney(0, qdCode)); + homeMessageResponse.setTotalRevenue(sysUserMoneyDetailsService.queryPayMoney(0, sysUserId)); //设置今日收入 - homeMessageResponse.setTodayRevenue(userService.queryPayMoney(1, qdCode)); + homeMessageResponse.setTodayRevenue(sysUserMoneyDetailsService.queryPayMoney(1, sysUserId)); //设置本月收入 - homeMessageResponse.setMonthRevenue(userService.queryPayMoney(2, qdCode)); + homeMessageResponse.setMonthRevenue(sysUserMoneyDetailsService.queryPayMoney(2, sysUserId)); //设置本年收入 - homeMessageResponse.setYearRevenue(userService.queryPayMoney(3, qdCode)); + homeMessageResponse.setYearRevenue(sysUserMoneyDetailsService.queryPayMoney(3, sysUserId)); //查询指定日期下的短剧购买的 量 Map map = userService.queryPayAndExtractInfo(); diff --git a/src/main/java/com/sqx/modules/job/task/TempOrdersTask.java b/src/main/java/com/sqx/modules/job/task/TempOrdersTask.java index c360f66f..a784f98c 100644 --- a/src/main/java/com/sqx/modules/job/task/TempOrdersTask.java +++ b/src/main/java/com/sqx/modules/job/task/TempOrdersTask.java @@ -272,7 +272,7 @@ public class TempOrdersTask { if (qdAward.compareTo(BigDecimal.ZERO) > 0) { SysUserMoneyDetails userMoneyDetails4 = new SysUserMoneyDetails( sysUser.getUserId(), sysUser.getUserId(), null, "[分享达标额外奖励]", 6, 1, 2, - qdAward, "推广人员首次达标，额外奖励现金红包" + qdAward, 2); + qdAward, "推广人员首次达标，额外奖励现金红包" + qdAward, 1); sysUserMoneyService.updateSysMoney(1, sysUser.getUserId(), qdAward.doubleValue()); sysUserMoneyDetailsService.save(userMoneyDetails4); diff --git a/src/main/java/com/sqx/modules/pay/wuyou/Constants.java b/src/main/java/com/sqx/modules/pay/wuyou/Constants.java index 5d1e56e0..8b8dc62e 100644 --- a/src/main/java/com/sqx/modules/pay/wuyou/Constants.java +++ b/src/main/java/com/sqx/modules/pay/wuyou/Constants.java @@ -6,6 +6,8 @@ package com.sqx.modules.pay.wuyou; public class Constants { final static String APP_SECRET = "3MWSBmyKDeQDLXzoLr53tKVqiJv4Fm0KdsEhbpXW9YWvh35VgozL5S3rpUz4EjSb"; final static String MERCHANT_ID = "100360"; +// final static String MERCHANT_ID = "100363"; +// final static String APP_SECRET = "OSsgOvgBmODAGGP7tg7Yt4WS2VYpop1RxSa6Iu3J2H4OAmMzf57mtc1II8BkyW9N"; final static String BASE_URL = "http://47.113.117.120"; @@ -14,5 +16,6 @@ public class Constants { final static String EXTRACT_URL = BASE_URL + "/api/salary"; final static String EXTRACT_QUERY_URL = BASE_URL + "/api/querySalary"; + final static String REFUND_URL = BASE_URL + "/api/refund"; } diff --git a/src/main/java/com/sqx/modules/sys/mapper/SysUserMoneyDetailsMapper.java b/src/main/java/com/sqx/modules/sys/mapper/SysUserMoneyDetailsMapper.java index 87a69776..475d63be 100644 --- a/src/main/java/com/sqx/modules/sys/mapper/SysUserMoneyDetailsMapper.java +++ b/src/main/java/com/sqx/modules/sys/mapper/SysUserMoneyDetailsMapper.java @@ -3,6 +3,7 @@ package com.sqx.modules.sys.mapper; import com.sqx.modules.sys.entity.SysUserMoneyDetails; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** * @author Administrator @@ -12,7 +13,7 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface SysUserMoneyDetailsMapper extends BaseMapper { - + Double queryPayMoney(@Param("type") int type, @Param("date") String date,@Param("userId") Long userId); } diff --git a/src/main/java/com/sqx/modules/sys/service/SysUserMoneyDetailsService.java b/src/main/java/com/sqx/modules/sys/service/SysUserMoneyDetailsService.java index 1645dc58..0a945d35 100644 --- a/src/main/java/com/sqx/modules/sys/service/SysUserMoneyDetailsService.java +++ b/src/main/java/com/sqx/modules/sys/service/SysUserMoneyDetailsService.java @@ -10,4 +10,5 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface SysUserMoneyDetailsService extends IService { + Double queryPayMoney(int type,Long userId); } diff --git a/src/main/java/com/sqx/modules/sys/service/impl/SysUserMoneyDetailsServiceImpl.java b/src/main/java/com/sqx/modules/sys/service/impl/SysUserMoneyDetailsServiceImpl.java index 2d3735cc..7c310177 100644 --- a/src/main/java/com/sqx/modules/sys/service/impl/SysUserMoneyDetailsServiceImpl.java +++ b/src/main/java/com/sqx/modules/sys/service/impl/SysUserMoneyDetailsServiceImpl.java @@ -6,6 +6,9 @@ import com.sqx.modules.sys.service.SysUserMoneyDetailsService; import com.sqx.modules.sys.mapper.SysUserMoneyDetailsMapper; import org.springframework.stereotype.Service; +import java.text.SimpleDateFormat; +import java.util.Date; + /** * @author Administrator * @description 针对表【sys_user_money_details(钱包记录表)】的数据库操作Service实现 @@ -15,6 +18,12 @@ import org.springframework.stereotype.Service; public class SysUserMoneyDetailsServiceImpl extends ServiceImpl implements SysUserMoneyDetailsService{ + @Override + public Double queryPayMoney(int type, Long userId) { + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:ss:mm"); + String date = simpleDateFormat.format(new Date()); + return baseMapper.queryPayMoney(type, date, userId); + } } diff --git a/src/main/resources/mapper/SysUserMoneyDetailsMapper.xml b/src/main/resources/mapper/SysUserMoneyDetailsMapper.xml index 55ab903f..f25ddc78 100644 --- a/src/main/resources/mapper/SysUserMoneyDetailsMapper.xml +++ b/src/main/resources/mapper/SysUserMoneyDetailsMapper.xml @@ -27,4 +27,21 @@ content,money_type,create_time, source_id + +