czg_team/video_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug fix

Browse Source
This commit is contained in:
GYJ
2025-02-26 10:02:22 +08:00
parent 87a18903b0
commit 08bb9aa48a
3 changed files with 17 additions and 9 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

@@ -36,6 +36,7 @@ import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.IOException; import java.io.IOException;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.math.RoundingMode;
import java.text.ParseException; import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.*; import java.util.*;
@@ -262,9 +263,9 @@ public class UserController {
//查询指定日期下的短剧购买的 量 //查询指定日期下的短剧购买的 量
Map<String, Object> map = userService.queryPayAndExtractInfo(); Map<String, Object> map = userService.queryPayAndExtractInfo();
homeMessageResponse.setTodayPayAmount(map.get("payAmount") == null ? BigDecimal.ZERO :new BigDecimal(map.get("payAmount").toString())); homeMessageResponse.setTodayPayAmount(map.get("payAmount") == null ? BigDecimal.ZERO : new BigDecimal(map.get("payAmount").toString()).setScale(2, RoundingMode.HALF_UP));
homeMessageResponse.setTodayPayCount(map.get("payCount") == null ? 0 : Integer.parseInt(map.get("payCount").toString())); homeMessageResponse.setTodayPayCount(map.get("payCount") == null ? 0 : Integer.parseInt(map.get("payCount").toString()));
homeMessageResponse.setTodayExtractAmount(map.get("extractAmount") == null ? BigDecimal.ZERO : new BigDecimal(map.get("extractAmount").toString())); homeMessageResponse.setTodayExtractAmount(map.get("extractAmount") == null ? BigDecimal.ZERO : new BigDecimal(map.get("extractAmount").toString()).setScale(2, RoundingMode.HALF_UP));
homeMessageResponse.setTodayExtractCount(map.get("extractCount") == null ? 0 : Integer.parseInt(map.get("extractCount").toString())); homeMessageResponse.setTodayExtractCount(map.get("extractCount") == null ? 0 : Integer.parseInt(map.get("extractCount").toString()));
return Result.success().put("data", homeMessageResponse); return Result.success().put("data", homeMessageResponse);

8
src/main/resources/mapper/app/UserDao.xml
View File

@@ -321,16 +321,16 @@
</update> </update>
<select id="queryPayInfo" resultType="map"> <select id="queryPayInfo" resultType="map">
select SUM(pay_money) AS totalmoney, select SUM(pay_money) AS totalMoney,
COUNT(1) AS tocalCount COUNT(1) AS totalCount
from `orders` from `orders`
where status=1 and pay_way=9 where status=1 and pay_way=9
and create_time between #{start} and #{end} and create_time between #{start} and #{end}
</select> </select>
<select id="queryExtractInfo" resultType="map"> <select id="queryExtractInfo" resultType="map">
select SUM(money) AS totalmoney, select SUM(money) AS totalMoney,
COUNT(1) AS tocalCount COUNT(1) AS totalCount
from `cash_out` from `cash_out`
where state=1 where state=1
and create_at between #{start} and #{end} and create_at between #{start} and #{end}

13
src/test/java/com/sqx/Tets.java
View File

@@ -23,7 +23,6 @@ import com.sqx.modules.orders.entity.Orders;
import com.sqx.modules.orders.service.OrdersService; import com.sqx.modules.orders.service.OrdersService;
import com.sqx.modules.pay.dao.CashOutDao; import com.sqx.modules.pay.dao.CashOutDao;
import com.sqx.modules.pay.dao.PayDetailsDao; import com.sqx.modules.pay.dao.PayDetailsDao;
import com.sqx.modules.pay.entity.CashOut;
import com.sqx.modules.pay.entity.PayDetails; import com.sqx.modules.pay.entity.PayDetails;
import com.sqx.modules.pay.service.PayDetailsService; import com.sqx.modules.pay.service.PayDetailsService;
import com.sqx.modules.sys.service.SysUserService; import com.sqx.modules.sys.service.SysUserService;
@@ -40,9 +39,10 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ActiveProfiles("test") @ActiveProfiles("pay")
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
public class Tets { public class Tets {
private static final Logger log = LoggerFactory.getLogger(Tets.class); private static final Logger log = LoggerFactory.getLogger(Tets.class);
@@ -104,7 +104,11 @@ public class Tets {
@Test @Test
public void testUserCashInfo() { public void testUserCashInfo() {
List<UserMoney> userMonies = userMoneyDao.selectList(new QueryWrapper<UserMoney>().isNotNull("user_id")); List<UserMoney> userMonies = userMoneyDao.selectList(new QueryWrapper<UserMoney>().isNotNull("user_id"));
System.out.println(userMonies.size());
int totalSize = userMonies.size();
System.out.println(totalSize);
AtomicInteger hasExecuteCount = new AtomicInteger();
userMonies.parallelStream().forEach(item -> { userMonies.parallelStream().forEach(item -> {
try { try {
@@ -116,6 +120,9 @@ public class Tets {
userMoneyDao.update(item, new LambdaUpdateWrapper<UserMoney>().eq(UserMoney::getUserId, item.getUserId())); userMoneyDao.update(item, new LambdaUpdateWrapper<UserMoney>().eq(UserMoney::getUserId, item.getUserId()));
log.info("更新用户提现信息: {}", item); log.info("更新用户提现信息: {}", item);
hasExecuteCount.getAndIncrement();
log.info("已执行: {}/{}", hasExecuteCount, totalSize);
} catch (Exception e) { } catch (Exception e) {
log.error("", e); log.error("", e);
} }