优化

game-admin/src/main/resources/application.yml

@@ -34,7 +34,7 @@ server:
 # 日志配置
 logging:
   level:
-    com.game: info
+    com.game: debug
     org.springframework: warn
 
 # 用户配置

game-business/src/main/java/com/game/business/controller/AppAgentController.java

@@ -64,6 +64,15 @@ public class AppAgentController extends BaseController {
     @Autowired
     private IShopSubOrderService shopSubOrderService;
 
+    @Autowired
+    private IAppGameBettingService appGameBettingService;
+
+    @Autowired
+    private IAppUsersChargeService appUsersChargeService;
+
+    @Autowired
+    private IAppUsersCashrecordService appUsersCashrecordService;
+
 
     /**
      * 首页
@@ -344,6 +353,98 @@ public class AppAgentController extends BaseController {
         List<AppGameCommission> gameCommissionList = appGameCommissionService.getByIds(Arrays.asList(userId));
         appUserDetailVo.setGameCommissionList(gameCommissionList);
 
+        Date nowDate = new Date();
+        int curDay = Integer.parseInt(DateUtil.format(nowDate,"dd"));
+
+        Date beginDate = null;
+        Date endDate = null;
+        if(curDay <= 15){
+            beginDate = DateUtil.beginOfMonth(nowDate);
+            endDate = DateUtil.parse(DateUtil.format(nowDate,"yyyy-MM-".concat("15").concat(" 23:59:59")),"yyyy-MM-dd HH:mm:ss");
+        }else{
+            beginDate = DateUtil.parse(DateUtil.format(nowDate,"yyyy-MM-".concat("15").concat(" 00:00:00")),"yyyy-MM-dd HH:mm:ss");
+            endDate = DateUtil.endOfMonth(nowDate);
+        }
+        //游戏流水
+        List<AppGameBetting> gameBettingList = appGameBettingService.selectListByDate(userId,
+                DateUtil.format(beginDate,"yyyy-MM-dd").concat(" 00:00:00"),
+                DateUtil.format(endDate,"yyyy-MM-dd").concat(" 23:59:59"),
+                null,null,null,null);
+        //当日游戏投注
+        appUserDetailVo.setTodayBetting(gameBettingList.stream().filter(e->{
+           return DateUtil.format(e.getCreateTime(),"yyyy-MM-dd").equals(DateUtil.format(nowDate,"yyyy-MM-dd")) &&
+                   e.getBettingType().intValue() == 0;
+        }).mapToDouble(AppGameBetting::getBettingAmount).sum());
+        appUserDetailVo.setTodayCoinBetting(gameBettingList.stream().filter(e->{
+           return DateUtil.format(e.getCreateTime(),"yyyy-MM-dd").equals(DateUtil.format(nowDate,"yyyy-MM-dd")) &&
+                   e.getBettingType().intValue() ==1;
+        }).mapToDouble(AppGameBetting::getBettingAmount).sum());
+
+        //本周游戏投注
+        appUserDetailVo.setWeekBetting(gameBettingList.stream().filter(e->e.getBettingType().intValue() == 0)
+                .mapToDouble(AppGameBetting::getBettingAmount).sum());
+        appUserDetailVo.setWeekCoinBetting(gameBettingList.stream().filter(e->e.getBettingType().intValue() == 1)
+                .mapToDouble(AppGameBetting::getBettingAmount).sum());
+
+        //当日游戏赢
+        appUserDetailVo.setTodayWin(gameBettingList.stream().filter(e->{
+            return DateUtil.format(e.getCreateTime(),"yyyy-MM-dd").equals(DateUtil.format(nowDate,"yyyy-MM-dd")) &&
+                    e.getIsWinning().intValue() == 1 && e.getBettingType().intValue() == 0;
+        }).mapToDouble(e->{return (e.getBettingMultiple() * e.getBettingAmount()) - e.getBettingAmount();}).sum());
+        appUserDetailVo.setTodayCoinWin(gameBettingList.stream().filter(e->{
+            return DateUtil.format(e.getCreateTime(),"yyyy-MM-dd").equals(DateUtil.format(nowDate,"yyyy-MM-dd")) &&
+                    e.getIsWinning().intValue() == 1 && e.getBettingType().intValue() == 1;
+        }).mapToDouble(e->{return (e.getBettingMultiple() * e.getBettingAmount()) - e.getBettingAmount();}).sum());
+
+        //本周游戏赢
+        appUserDetailVo.setWeekWin(gameBettingList.stream().filter(e->{
+            return e.getIsWinning().intValue() == 1 && e.getBettingType().intValue() == 0;
+        }).mapToDouble(e->{return (e.getBettingMultiple() * e.getBettingAmount()) - e.getBettingAmount();}).sum());
+        appUserDetailVo.setWeekCoinWin(gameBettingList.stream().filter(e->{
+            return e.getIsWinning().intValue() == 1 && e.getBettingType().intValue() == 1;
+        }).mapToDouble(e->{return (e.getBettingMultiple() * e.getBettingAmount()) - e.getBettingAmount();}).sum());
+
+        //当日游戏输
+        appUserDetailVo.setTodayLose(gameBettingList.stream().filter(e->{
+            return DateUtil.format(e.getCreateTime(),"yyyy-MM-dd").equals(DateUtil.format(nowDate,"yyyy-MM-dd")) &&
+                    e.getIsWinning().intValue() == 2 && e.getBettingType().intValue() == 0;
+        }).mapToDouble(e->{return e.getBettingAmount();}).sum());
+        appUserDetailVo.setTodayCoinLose(gameBettingList.stream().filter(e->{
+            return DateUtil.format(e.getCreateTime(),"yyyy-MM-dd").equals(DateUtil.format(nowDate,"yyyy-MM-dd")) &&
+                    e.getIsWinning().intValue() == 2 && e.getBettingType().intValue() == 1;
+        }).mapToDouble(e->{return e.getBettingAmount();}).sum());
+
+        //本周游戏输
+        appUserDetailVo.setWeekLose(gameBettingList.stream().filter(e->{
+            return e.getIsWinning().intValue() == 2 && e.getBettingType().intValue() == 0;
+        }).mapToDouble(e->{return e.getBettingAmount();}).sum());
+        appUserDetailVo.setWeekCoinLose(gameBettingList.stream().filter(e->{
+            return e.getIsWinning().intValue() == 2 && e.getBettingType().intValue() == 1;
+        }).mapToDouble(e->{return e.getBettingAmount();}).sum());
+
+        List<AppUsersCharge> appUsersChargeList = appUsersChargeService.getChargeList(userId,
+                DateUtil.format(beginDate,"yyyy-MM-dd").concat(" 00:00:00"),
+                DateUtil.format(endDate,"yyyy-MM-dd").concat(" 23:59:59"));
+        //当日充值
+        appUserDetailVo.setTodayCharge(appUsersChargeList.stream().filter(e->{
+           return DateUtil.format(e.getAddtime(),"yyyy-MM-dd").equals(DateUtil.format(nowDate,"yyyy-MM-dd"));
+        }).mapToDouble(e->{return e.getCoin().doubleValue();}).sum());
+
+        //本周充值
+        appUserDetailVo.setWeekCharge(appUsersChargeList.stream().mapToDouble(e->{return e.getCoin().doubleValue();}).sum());
+
+        //提现
+        List<AppUsersCashrecord> appUsersCashrecords = appUsersCashrecordService.getUserCashList(userId,
+                DateUtil.format(beginDate,"yyyy-MM-dd").concat(" 00:00:00"),
+                DateUtil.format(endDate,"yyyy-MM-dd").concat(" 23:59:59"));
+        //当日提现
+        appUserDetailVo.setTodayWithdraw(appUsersCashrecords.stream().filter(e->{
+            return DateUtil.format(e.getAddtime(),"yyyy-MM-dd").equals(DateUtil.format(nowDate,"yyyy-MM-dd"));
+        }).mapToDouble(e->{return e.getVotes().doubleValue();}).sum());
+
+        //本周提现
+        appUserDetailVo.setWeekWithdraw(appUsersCashrecords.stream().mapToDouble(e->{return e.getVotes().doubleValue();}).sum());
+
        /* AppUser queryIpUser = new AppUser();
         queryIpUser.setIpaddr(appUser.getIpaddr());
         List<AppUser> ipUserList = appUserService.selectAppUserList(queryIpUser);

game-business/src/main/java/com/game/business/domain/AppGameBetting.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.game.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -99,11 +100,19 @@ public class AppGameBetting {
     @Excel(name = "投注时间")
     @TableField(value = "create_time")
     @ApiModelProperty(value = "投注时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
     @Excel(name = "开奖时间")
     @TableField(value = "update_time")
     @ApiModelProperty(value = "开奖时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 
+    @TableField(exist = false)
+    private String beginTime;
+
+    @TableField(exist = false)
+    private String endTime;
+
 }

game-business/src/main/java/com/game/business/domain/AppUsersCashrecord.java

@@ -54,8 +54,8 @@ private static final long serialVersionUID=1L;
 
     /** 申请时间 */
     @ApiModelProperty(value = "申请时间")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "申请时间" , width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "申请时间" , width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     @TableField(value = "addtime")
     private Date addtime;
 
@@ -210,4 +210,10 @@ private static final long serialVersionUID=1L;
     @TableField(value = "votes")
     private BigDecimal votes;
 
+    @TableField(exist = false)
+    private String beginTime;
+
+    @TableField(exist = false)
+    private String endTime;
+
 }

game-business/src/main/java/com/game/business/domain/AppUsersCharge.java

@@ -216,4 +216,10 @@ private static final long serialVersionUID=1L;
     @TableField(exist = false)
     private Double todaySum;
 
+    @TableField(exist = false)
+    private String beginTime;
+
+    @TableField(exist = false)
+    private String endTime;
+
 }

game-business/src/main/java/com/game/business/domain/FinTranRecord.java

@@ -237,6 +237,12 @@ private static final long serialVersionUID=1L;
     @TableField(value = "withdraw_flag")
     private Integer withdrawFlag;
 
+    @TableField(exist = false)
+    private String beginTime;
+
+    @TableField(exist = false)
+    private String endTime;
+
     /**
      * 初始化 基本信息
      *

game-business/src/main/java/com/game/business/domain/ShopBusinessOrder.java

@@ -35,8 +35,8 @@ private static final long serialVersionUID=1L;
 
     /** 添加时间 */
     @ApiModelProperty(value = "添加时间")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "添加时间" , width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss")
+    @Excel(name = "添加时间" , width = 30, dateFormat = "yyyy-MM-dd hh:mm:ss")
     @TableField(value = "add_time")
     private Date addTime;
 
@@ -243,4 +243,10 @@ private static final long serialVersionUID=1L;
     @TableField(exist = false)
     private String productNames;
 
+    @TableField(exist = false)
+    private String beginTime;
+
+    @TableField(exist = false)
+    private String endTime;
+
 }

game-business/src/main/java/com/game/business/service/IAppGameBettingService.java

@@ -31,6 +31,11 @@ public interface IAppGameBettingService extends IService<AppGameBetting> {
 
     List<AppGameBetting> getNotLottery(Integer isWinning);
 
+    /**
+     * 根据日期查询投注情况
+     * */
+    List<AppGameBetting> selectListByDate( Long userId, String beginTime, String endTime,Long gameId,String gameDate,Integer isWinner,Integer bettingType);
+
     /**
      * 根据日期查询投注情况
      * */

game-business/src/main/java/com/game/business/service/impl/AppGameBettingServiceImpl.java

@@ -100,10 +100,14 @@ public class AppGameBettingServiceImpl extends ServiceImpl<AppGameBettingMapper,
     }
 
     @Override
-    public List<AppGameBetting> selectListByDate(Long userId, String beginTime, String endTime,Long gameId,String gameDate) {
+    public List<AppGameBetting> selectListByDate( Long userId, String beginTime, String endTime,Long gameId,String gameDate,Integer isWinner,Integer bettingType){
         LambdaQueryWrapper<AppGameBetting> queryWrapper = Wrappers.lambdaQuery();;
-        queryWrapper.ne(AppGameBetting::getIsWinning,0);//查询已开奖
-        queryWrapper.eq(AppGameBetting::getBettingType,0);
+        if(null != isWinner){
+            queryWrapper.eq(AppGameBetting::getIsWinning, isWinner);
+        }
+        if(null != bettingType) {
+            queryWrapper.eq(AppGameBetting::getBettingType, bettingType);
+        }
         if(null != userId){
             queryWrapper.eq(AppGameBetting::getUserId,userId);
         }
@@ -122,6 +126,12 @@ public class AppGameBettingServiceImpl extends ServiceImpl<AppGameBettingMapper,
         return appGameBettingMapper.selectList(queryWrapper);
     }
 
+    @Override
+    public List<AppGameBetting> selectListByDate(Long userId, String beginTime, String endTime,Long gameId,String gameDate) {
+        //查询已开奖 余额投注
+        return selectListByDate(userId,beginTime,endTime,gameId,gameDate,0,0);
+    }
+
     @Override
     public Map<String, BigDecimal> getBettingAmountSum(Long userId) {
         return appGameBettingMapper.getBettingAmountSum(userId);

game-business/src/main/java/com/game/business/service/impl/AppUsersCashrecordServiceImpl.java

@@ -101,7 +101,7 @@ public class AppUsersCashrecordServiceImpl extends ServiceImpl<AppUsersCashrecor
     @DataSource(DataSourceType.SLAVE)
     public List<AppUsersCashrecord> getUserCashList(Long userId, String beginTime, String endTime) {
         LambdaQueryWrapper<AppUsersCashrecord> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(AppUsersCashrecord::getCashOutStatus,"1");
+        queryWrapper.eq(AppUsersCashrecord::getStatus,"1");
         queryWrapper.eq(AppUsersCashrecord::getCashType,"7");//余额提现
         queryWrapper.between(AppUsersCashrecord::getAddtime,beginTime,endTime);
         return appUsersCashrecordMapper.selectList(queryWrapper);

game-business/src/main/java/com/game/business/vo/AppUserDetailVo.java

@@ -24,4 +24,36 @@ public class AppUserDetailVo implements Serializable {
     List<AppUsersCashAccount> usersCashAccounts;
     List<ShopBusinessOrder> businessOrders;
 
+    //游戏金币当日
+    private Double todayCoinBetting;
+    private Double todayCoinWin;
+    private Double todayCoinLose;
+
+    //游戏余额当日
+    private Double todayBetting;
+    private Double todayWin;
+    private Double todayLose;
+
+    //游戏金币最近一周
+    private Double weekCoinBetting;
+    private Double weekCoinWin;
+    private Double weekCoinLose;
+
+    //游戏余额最近一周
+    private Double weekBetting;
+    private Double weekWin;
+    private Double weekLose;
+
+    //金币充值
+    private Double todayCoinCharge;
+    private Double weekCoinCharge;
+
+    //充值
+    private Double todayCharge;
+    private Double weekCharge;
+
+    //提现
+    private Double todayWithdraw;
+    private Double weekWithdraw;
+
 }

game-business/src/main/resources/mapper/business/AppGameBettingMapper.xml

@@ -131,6 +131,8 @@
             <if test="bettingAmount != null "> and betting_amount = #{bettingAmount}</if>
             <if test="bettingCommission != null "> and betting_commission = #{bettingCommission}</if>
             <if test="isWinning != null  and isWinning != ''"> and is_winning = #{isWinning}</if>
+            <if test="beginTime != null  and beginTime != ''"> and create_time &gt; CONCAT(#{beginTime},' 00:00:00')</if>
+            <if test="endTime != null  and endTime != ''"> and create_time &lt; CONCAT(#{endTime},' 23:59:59')</if>
         </where>
     </select>
 

game-business/src/main/resources/mapper/business/AppUsersCashrecordMapper.xml

@@ -73,6 +73,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="unitType != null "> and unit_type = #{unitType}</if>
             <if test="uptime != null "> and uptime = #{uptime}</if>
             <if test="votes != null "> and votes = #{votes}</if>
+            <if test="beginTime != null  and beginTime != ''"> and addtime &gt; CONCAT(#{beginTime},' 00:00:00')</if>
+            <if test="endTime != null  and endTime != ''"> and addtime &lt; CONCAT(#{endTime},' 23:59:59')</if>
         </where>
     </select>
     

game-business/src/main/resources/mapper/business/AppUsersChargeMapper.xml

@@ -75,6 +75,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="type != null "> and type = #{type}</if>
             <if test="uid != null "> and uid = #{uid}</if>
             <if test="channelId != null "> and channel_id = #{channelId}</if>
+            <if test="beginTime != null  and beginTime != ''"> and addtime &gt; CONCAT(#{beginTime},' 00:00:00')</if>
+            <if test="endTime != null  and endTime != ''"> and addtime &lt; CONCAT(#{endTime},' 23:59:59')</if>
         </where>
         order by addtime desc
     </select>

game-business/src/main/resources/mapper/business/FinTranRecordMapper.xml

@@ -82,6 +82,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="tranType3 != null "> and tran_type3 = #{tranType3}</if>
             <if test="uid != null "> and uid = #{uid}</if>
             <if test="withdrawFlag != null "> and withdraw_flag = #{withdrawFlag}</if>
+            <if test="beginTime != null  and beginTime != ''"> and create_time &gt; CONCAT(#{beginTime},' 00:00:00')</if>
+            <if test="endTime != null  and endTime != ''"> and create_time &lt; CONCAT(#{endTime},' 23:59:59')</if>
         </where>
         order by create_time desc
     </select>

game-business/src/main/resources/mapper/business/ShopBusinessOrderMapper.xml

@@ -83,6 +83,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="transactionAmount != null "> and transaction_amount = #{transactionAmount}</if>
             <if test="transactionTime != null "> and transaction_time = #{transactionTime}</if>
             <if test="uid != null "> and uid = #{uid}</if>
+            <if test="beginTime != null  and beginTime != ''"> and add_time &gt; CONCAT(#{beginTime},' 00:00:00')</if>
+            <if test="endTime != null  and endTime != ''"> and add_time &lt; CONCAT(#{endTime},' 23:59:59')</if>
         </where>
     </select>
     

game-ui/src/views/business/betting/index.vue

@@ -73,6 +73,18 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="投注时间" prop="daterange">
+        <el-date-picker
+          v-model="daterange"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          @change="dateChage"
+        ></el-date-picker>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -134,7 +146,8 @@
         </template>
       </el-table-column>
       <el-table-column label="用户ID" align="center" prop="userId" />
-      <el-table-column label="游戏期号" align="center" prop="gameDate" />
+      <el-table-column label="投注时间" align="center" prop="createTime" width="100"/>
+      <el-table-column label="游戏期号" align="center" prop="gameDate" width="130"/>
       <el-table-column label="主播ID" align="center" prop="liveUserId" />
       <el-table-column label="直播房间号" align="center" prop="liveRoomId" />
       <el-table-column label="是否直播间投注 " align="center" prop="isLive">
@@ -293,6 +306,7 @@ export default {
       gameItemMap:{},
       gameItemList:[],
       gameItemShowList:[],
+      daterange:[],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -312,6 +326,8 @@ export default {
         bettingAmount: null,
         bettingCommission: null,
         isWinning: null,
+        beginTime:null,
+        endTime:null
       },
       // 表单参数
       form: {},
@@ -360,6 +376,15 @@ export default {
     });
   },
   methods: {
+    dateChage(val){
+      if(undefined != val && null != val && val.length > 1){
+        this.queryParams.beginTime = val[0];
+        this.queryParams.endTime = val[1];
+      }else{
+        this.queryParams.beginTime = null;
+        this.queryParams.endTime = null;
+      }
+    },
     getItemName(row){
       let that = this;
       let bettingGameType = row.bettingGameType;
@@ -429,6 +454,9 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      this.daterange = [];
+      this.queryParams.beginTime = null;
+      this.queryParams.endTime = null;
       this.handleQuery();
     },
     // 多选框选中数据

game-ui/src/views/business/cashrecord/index.vue

@@ -27,6 +27,18 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="日期" prop="time">
+        <el-date-picker
+          v-model="daterange"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          @change="dateChage"
+        ></el-date-picker>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -91,7 +103,7 @@
       </el-table-column>
       <el-table-column label="申请时间" align="center" prop="addtime" width="180">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.addtime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.addtime) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="提现类型" align="center" prop="cashType">
@@ -225,6 +237,7 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      daterange:[],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -233,6 +246,8 @@ export default {
         orderno: null,
         type: null,
         uid: null,
+        beginTime:null,
+        endTime:null
       },
       // 表单参数
       form: {},
@@ -245,6 +260,15 @@ export default {
     this.getList();
   },
   methods: {
+    dateChage(val){
+      if(undefined != val && null != val && val.length > 1){
+        this.queryParams.beginTime = val[0];
+        this.queryParams.endTime = val[1];
+      }else{
+        this.queryParams.beginTime = null;
+        this.queryParams.endTime = null;
+      }
+    },
     /** 查询提现记录列表 */
     getList() {
       this.loading = true;
@@ -303,6 +327,9 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      this.daterange = [];
+      this.queryParams.beginTime = null;
+      this.queryParams.endTime = null;
       this.handleQuery();
     },
     // 多选框选中数据

game-ui/src/views/business/charge/index.vue

@@ -45,6 +45,18 @@
           ></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="日期" prop="daterange">
+        <el-date-picker
+          v-model="daterange"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          @change="dateChage"
+        ></el-date-picker>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -291,6 +303,7 @@ export default {
       open: false,
       typeList:[],
       typeMap:{},
+      daterange:[],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -324,6 +337,8 @@ export default {
         platformService: null,
         platformServiceRate: null,
         channelId: null,
+        beginTime:null,
+        endTime:null
       },
       // 表单参数
       form: {},
@@ -350,6 +365,15 @@ export default {
     })
   },
   methods: {
+    dateChage(val){
+      if(undefined != val && null != val && val.length > 1){
+        this.queryParams.beginTime = val[0];
+        this.queryParams.endTime = val[1];
+      }else{
+        this.queryParams.beginTime = null;
+        this.queryParams.endTime = null;
+      }
+    },
     getTypeName(id) {
       if(id == null || id == undefined){
         return "-";
@@ -418,6 +442,9 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      this.daterange = [];
+      this.queryParams.beginTime = null;
+      this.queryParams.endTime = null;
       this.handleQuery();
     },
     // 多选框选中数据

game-ui/src/views/business/order/index.vue

@@ -67,6 +67,18 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="日期" prop="daterange">
+        <el-date-picker
+          v-model="daterange"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          @change="dateChage"
+        ></el-date-picker>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -126,7 +138,7 @@
       <el-table-column label="商品" align="center" prop="productNames" width="150"/>
       <el-table-column label="下单时间" align="center" prop="addTime" width="180">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.addTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.addTime) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="收货人地址" align="center" prop="address" width="200"/>
@@ -379,6 +391,7 @@ export default {
       // 是否显示弹出层
       open: false,
       wlOpen:false,
+      daterange:[],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -416,7 +429,9 @@ export default {
         taskId: null,
         transactionAmount: null,
         transactionTime: null,
-        uid: null
+        uid: null,
+        beginTime:null,
+        endTime:null
       },
       // 表单参数
       form: {},
@@ -439,6 +454,15 @@ export default {
     this.getList();
   },
   methods: {
+    dateChage(val){
+      if(undefined != val && null != val && val.length > 1){
+        this.queryParams.beginTime = val[0];
+        this.queryParams.endTime = val[1];
+      }else{
+        this.queryParams.beginTime = null;
+        this.queryParams.endTime = null;
+      }
+    },
     /** 查询购物订单列表 */
     getList() {
       this.loading = true;
@@ -503,6 +527,9 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      this.daterange = [];
+      this.queryParams.beginTime = null;
+      this.queryParams.endTime = null;
       this.handleQuery();
     },
     // 多选框选中数据

game-ui/src/views/business/tran_record/index.vue

@@ -115,6 +115,18 @@
           />
         </el-select>
       </el-form-item>-->
+      <el-form-item label="日期" prop="daterange">
+        <el-date-picker
+          v-model="daterange"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          @change="dateChage"
+        ></el-date-picker>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -172,6 +184,7 @@
       <el-table-column label="ID" align="center" prop="id" />
       <el-table-column label="UID" align="center" prop="uid" />
       <el-table-column label="来源UID" align="center" prop="fromUid" />
+      <el-table-column label="日期" align="center" prop="createTime" width="100"/>
       <el-table-column label="货币类型" align="center" prop="currencyType">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.currency_type" :value="scope.row.currencyType"/>
@@ -408,6 +421,7 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      daterange:[],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -444,7 +458,9 @@ export default {
         tranType2: null,
         tranType3: null,
         uid: null,
-        withdrawFlag: null
+        withdrawFlag: null,
+        beginTime:null,
+        endTime:null
       },
       // 表单参数
       form: {},
@@ -457,6 +473,15 @@ export default {
     this.getList();
   },
   methods: {
+    dateChage(val){
+      if(undefined != val && null != val && val.length > 1){
+        this.queryParams.beginTime = val[0];
+        this.queryParams.endTime = val[1];
+      }else{
+        this.queryParams.beginTime = null;
+        this.queryParams.endTime = null;
+      }
+    },
     /** 查询用户收支明细列表 */
     getList() {
       this.loading = true;
@@ -520,6 +545,9 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      this.daterange = [];
+      this.queryParams.beginTime = null;
+      this.queryParams.endTime = null;
       this.handleQuery();
     },
     // 多选框选中数据

game-ui/src/views/business/user/index.vue

@@ -519,6 +519,58 @@
             余额：{{userInfo.diamondCoin}}
           </span>
         </el-form-item>
+        <el-form-item label="今日">
+          <span>
+            充值余额：{{userInfo.infoDetail.todayCharge}}
+          </span>
+          <span style="margin-left: 1rem;">
+            提现余额：{{userInfo.infoDetail.todayWithdraw}}
+          </span>
+          <span style="margin-left: 1rem;">
+            下注余额：{{userInfo.infoDetail.todayBetting}}
+          </span>
+          <span style="margin-left: 1rem;">
+            余额赢：{{userInfo.infoDetail.todayWin}}
+          </span>
+          <span style="margin-left: 1rem;">
+            余额输：{{userInfo.infoDetail.todayLose}}
+          </span>
+          <span style="margin-left: 1rem;">
+            下注金币：{{userInfo.infoDetail.todayCoinBetting}}
+          </span>
+          <span style="margin-left: 1rem;">
+            金币赢：{{userInfo.infoDetail.todayCoinWin}}
+          </span>
+          <span style="margin-left: 1rem;">
+            金币输：{{userInfo.infoDetail.todayCoinLose}}
+          </span>
+        </el-form-item>
+        <el-form-item label="本周期">
+          <span>
+            充值余额：{{userInfo.infoDetail.weekCharge}}
+          </span>
+          <span style="margin-left: 1rem;">
+            提现余额：{{userInfo.infoDetail.weekWithdraw}}
+          </span>
+          <span style="margin-left: 1rem;">
+            下注余额：{{userInfo.infoDetail.weekBetting}}
+          </span>
+          <span style="margin-left: 1rem;">
+            余额赢：{{userInfo.infoDetail.weekWin}}
+          </span>
+          <span style="margin-left: 1rem;">
+            余额输：{{userInfo.infoDetail.weekLose}}
+          </span>
+          <span style="margin-left: 1rem;">
+            下注金币：{{userInfo.infoDetail.weekCoinBetting}}
+          </span>
+          <span style="margin-left: 1rem;">
+            金币赢：{{userInfo.infoDetail.weekCoinWin}}
+          </span>
+          <span style="margin-left: 1rem;">
+            金币输：{{userInfo.infoDetail.weekCoinLose}}
+          </span>
+        </el-form-item>
 
         <el-form-item label="">
           <el-tabs v-model="activeName" @tab-click="handleClick" style="width: 100%">
@@ -867,7 +919,9 @@ export default {
       liveLive:{},
       liveOpen:false,
       superOpen:false,
-      userInfo:{},
+      userInfo:{
+        infoDetail:{}
+      },
       closeMsg:null,
       superUserList:[],
       downUserList:[],