|
@@ -10,6 +10,7 @@ import com.game.business.dto.FinTranRecordDTO;
|
|
|
import com.game.business.service.IAppGameBettingService;
|
|
|
import com.game.business.service.IAppUserService;
|
|
|
import com.game.common.core.domain.R;
|
|
|
+import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.security.access.prepost.PreAuthorize;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.web.bind.annotation.GetMapping;
|
|
@@ -72,7 +73,15 @@ public class FinTranRecordController extends BaseController
|
|
|
@ApiOperation(value = "查询消费记录统计", notes = "查询消费记录统计")
|
|
|
public R count(FinTranRecordDTO finTranRecord)
|
|
|
{
|
|
|
- JSONObject jsonObject = finTranRecordService.selecFinTranRecordCount(finTranRecord);
|
|
|
+ JSONObject jsonObject = finTranRecordService.selecFinTranRecordCount(finTranRecord);
|
|
|
+
|
|
|
+ if(StringUtils.isNotBlank(finTranRecord.getBeginTime())){
|
|
|
+ finTranRecord.setBeginTime(finTranRecord.getBeginTime() + " 00:00:00");
|
|
|
+ }
|
|
|
+
|
|
|
+ if(StringUtils.isNotBlank(finTranRecord.getEndTime())){
|
|
|
+ finTranRecord.setEndTime(finTranRecord.getEndTime() + " 23:59:59");
|
|
|
+ }
|
|
|
|
|
|
// 用户总统计(游戏投注)
|
|
|
Map<String, BigDecimal> bettingAmountSum = appGameBettingService.getBettingAmountSum(finTranRecord.getUserId());
|