20190122加入房间

src/main/java/com/izouma/awesomeadmin/constant/AppConstant.java

@@ -196,7 +196,7 @@ public interface AppConstant {
         Integer RECHARGE = 0;
 
         /**
-         * 消费
+         * 消费/加入房间
          */
         Integer CONSUMPTION = 1;
 

src/main/java/com/izouma/awesomeadmin/model/HouseInfo.java

@@ -2,13 +2,14 @@ package com.izouma.awesomeadmin.model;
 
 import java.math.BigDecimal;
 import java.util.*;
+
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonInclude;
 
 
 @JsonAutoDetect
 @JsonInclude(JsonInclude.Include.NON_NULL)
-public class HouseInfo{
+public class HouseInfo {
     private Integer id;
     private String delFlag;
     private Date updateTime;
@@ -37,241 +38,276 @@ public class HouseInfo{
     private Integer seasonId;
     private String video;
 
-private String idStr;
+    private String idStr;
+
+    private String searchKey;
 
-private String searchKey;
+    /**
+     * and,test_name,like,value;or,remark,=,123
+     */
+    private String advancedQuery;
 
-/**
-* and,test_name,like,value;or,remark,=,123
-*/
-private String advancedQuery;
+    /**
+     * column_name_,desc_;column_name_,asc
+     */
+    private String orderByStr;
 
-/**
-* column_name_,desc_;column_name_,asc
-*/
-private String orderByStr;
+    private HouseLevel houseLevelInfo;
 
-    public Integer getId(){
+    public Integer getId() {
         return this.id;
     }
 
-    public void setId(Integer id){
+    public void setId(Integer id) {
         this.id = id;
     }
-    public String getDelFlag(){
+
+    public String getDelFlag() {
         return this.delFlag;
     }
 
-    public void setDelFlag(String delFlag){
+    public void setDelFlag(String delFlag) {
         this.delFlag = delFlag;
     }
-    public Date getUpdateTime(){
+
+    public Date getUpdateTime() {
         return this.updateTime;
     }
 
-    public void setUpdateTime(Date updateTime){
+    public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
-    public String getUpdateUser(){
+
+    public String getUpdateUser() {
         return this.updateUser;
     }
 
-    public void setUpdateUser(String updateUser){
+    public void setUpdateUser(String updateUser) {
         this.updateUser = updateUser;
     }
-    public Date getCreateTime(){
+
+    public Date getCreateTime() {
         return this.createTime;
     }
 
-    public void setCreateTime(Date createTime){
+    public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
-    public String getCreateUser(){
+
+    public String getCreateUser() {
         return this.createUser;
     }
 
-    public void setCreateUser(String createUser){
+    public void setCreateUser(String createUser) {
         this.createUser = createUser;
     }
-    public String getHouseName(){
+
+    public String getHouseName() {
         return this.houseName;
     }
 
-    public void setHouseName(String houseName){
+    public void setHouseName(String houseName) {
         this.houseName = houseName;
     }
-    public String getHouseAbstract(){
+
+    public String getHouseAbstract() {
         return this.houseAbstract;
     }
 
-    public void setHouseAbstract(String houseAbstract){
+    public void setHouseAbstract(String houseAbstract) {
         this.houseAbstract = houseAbstract;
     }
-    public String getIcon(){
+
+    public String getIcon() {
         return this.icon;
     }
 
-    public void setIcon(String icon){
+    public void setIcon(String icon) {
         this.icon = icon;
     }
-    public String getHouseCode(){
+
+    public String getHouseCode() {
         return this.houseCode;
     }
 
-    public void setHouseCode(String houseCode){
+    public void setHouseCode(String houseCode) {
         this.houseCode = houseCode;
     }
-    public Integer getUserId(){
+
+    public Integer getUserId() {
         return this.userId;
     }
 
-    public void setUserId(Integer userId){
+    public void setUserId(Integer userId) {
         this.userId = userId;
     }
-    public Integer getHouseType(){
+
+    public Integer getHouseType() {
         return this.houseType;
     }
 
-    public void setHouseType(Integer houseType){
+    public void setHouseType(Integer houseType) {
         this.houseType = houseType;
     }
-    public String getHouseLevel(){
+
+    public String getHouseLevel() {
         return this.houseLevel;
     }
 
-    public void setHouseLevel(String houseLevel){
+    public void setHouseLevel(String houseLevel) {
         this.houseLevel = houseLevel;
     }
-    public Integer getGameId(){
+
+    public Integer getGameId() {
         return this.gameId;
     }
 
-    public void setGameId(Integer gameId){
+    public void setGameId(Integer gameId) {
         this.gameId = gameId;
     }
-    public Integer getStatusFlag(){
+
+    public Integer getStatusFlag() {
         return this.statusFlag;
     }
 
-    public void setStatusFlag(Integer statusFlag){
+    public void setStatusFlag(Integer statusFlag) {
         this.statusFlag = statusFlag;
     }
-    public String getRecommendFlag(){
+
+    public String getRecommendFlag() {
         return this.recommendFlag;
     }
 
-    public void setRecommendFlag(String recommendFlag){
+    public void setRecommendFlag(String recommendFlag) {
         this.recommendFlag = recommendFlag;
     }
-    public Integer getRank(){
+
+    public Integer getRank() {
         return this.rank;
     }
 
-    public void setRank(Integer rank){
+    public void setRank(Integer rank) {
         this.rank = rank;
     }
-    public String getUseFlag(){
+
+    public String getUseFlag() {
         return this.useFlag;
     }
 
-    public void setUseFlag(String useFlag){
+    public void setUseFlag(String useFlag) {
         this.useFlag = useFlag;
     }
-    public String getGameHouseId(){
+
+    public String getGameHouseId() {
         return this.gameHouseId;
     }
 
-    public void setGameHouseId(String gameHouseId){
+    public void setGameHouseId(String gameHouseId) {
         this.gameHouseId = gameHouseId;
     }
-    public String getGameHousePassword(){
+
+    public String getGameHousePassword() {
         return this.gameHousePassword;
     }
 
-    public void setGameHousePassword(String gameHousePassword){
+    public void setGameHousePassword(String gameHousePassword) {
         this.gameHousePassword = gameHousePassword;
     }
-    public Date getBeginTime(){
+
+    public Date getBeginTime() {
         return this.beginTime;
     }
 
-    public void setBeginTime(Date beginTime){
+    public void setBeginTime(Date beginTime) {
         this.beginTime = beginTime;
     }
-    public Date getEndTime(){
+
+    public Date getEndTime() {
         return this.endTime;
     }
 
-    public void setEndTime(Date endTime){
+    public void setEndTime(Date endTime) {
         this.endTime = endTime;
     }
-    public String getMatchName(){
+
+    public String getMatchName() {
         return this.matchName;
     }
 
-    public void setMatchName(String matchName){
+    public void setMatchName(String matchName) {
         this.matchName = matchName;
     }
-    public Integer getPlayerNumber(){
+
+    public Integer getPlayerNumber() {
         return this.playerNumber;
     }
 
-    public void setPlayerNumber(Integer playerNumber){
+    public void setPlayerNumber(Integer playerNumber) {
         this.playerNumber = playerNumber;
     }
-    public BigDecimal getBonus(){
+
+    public BigDecimal getBonus() {
         return this.bonus;
     }
 
-    public void setBonus(BigDecimal bonus){
+    public void setBonus(BigDecimal bonus) {
         this.bonus = bonus;
     }
-    public Integer getSeasonId(){
+
+    public Integer getSeasonId() {
         return this.seasonId;
     }
 
-    public void setSeasonId(Integer seasonId){
+    public void setSeasonId(Integer seasonId) {
         this.seasonId = seasonId;
     }
-    public String getVideo(){
+
+    public String getVideo() {
         return this.video;
     }
 
-    public void setVideo(String video){
+    public void setVideo(String video) {
         this.video = video;
     }
 
-public String getSearchKey() {
-    return searchKey;
-}
+    public String getSearchKey() {
+        return searchKey;
+    }
 
-public void setSearchKey(String searchKey) {
-    this.searchKey = searchKey;
-}
+    public void setSearchKey(String searchKey) {
+        this.searchKey = searchKey;
+    }
 
-public String getAdvancedQuery() {
-    return advancedQuery;
-}
+    public String getAdvancedQuery() {
+        return advancedQuery;
+    }
 
-public void setAdvancedQuery(String advancedQuery) {
-    this.advancedQuery = advancedQuery;
-}
+    public void setAdvancedQuery(String advancedQuery) {
+        this.advancedQuery = advancedQuery;
+    }
 
-public String getOrderByStr() {
-    return orderByStr;
-}
+    public String getOrderByStr() {
+        return orderByStr;
+    }
 
-public void setOrderByStr(String orderByStr) {
-    this.orderByStr = orderByStr;
-}
+    public void setOrderByStr(String orderByStr) {
+        this.orderByStr = orderByStr;
+    }
 
-public String getIdStr() {
-    return idStr;
-}
+    public String getIdStr() {
+        return idStr;
+    }
 
-public void setIdStr(String idStr) {
-    this.idStr = idStr;
-}
+    public void setIdStr(String idStr) {
+        this.idStr = idStr;
+    }
 
+    public HouseLevel getHouseLevelInfo() {
+        return houseLevelInfo;
+    }
+
+    public void setHouseLevelInfo(HouseLevel houseLevelInfo) {
+        this.houseLevelInfo = houseLevelInfo;
+    }
 }
 

src/main/java/com/izouma/awesomeadmin/service/HouseInfoService.java

@@ -1,14 +1,17 @@
 package com.izouma.awesomeadmin.service;
 
 import java.util.*;
+
 import com.izouma.awesomeadmin.dto.Page;
+import com.izouma.awesomeadmin.dto.Result;
 import com.izouma.awesomeadmin.model.HouseInfo;
+import com.izouma.awesomeadmin.model.PlayerInfo;
 
 
 /**
-*  service接口类
-*/
-public interface HouseInfoService{
+ * service接口类
+ */
+public interface HouseInfoService {
 
     List<HouseInfo> getHouseInfoList(HouseInfo record);
 
@@ -23,5 +26,7 @@ public interface HouseInfoService{
     boolean deleteHouseInfo(HouseInfo record);
 
     boolean updateHouseInfo(HouseInfo record);
+
+    Result joinHouseInfo(PlayerInfo record);
 }
 

src/main/java/com/izouma/awesomeadmin/service/MemberCoinService.java

@@ -23,5 +23,7 @@ public interface MemberCoinService{
     boolean deleteMemberCoin(MemberCoin record);
 
     boolean updateMemberCoin(MemberCoin record);
+
+    int song(MemberCoin memberCoin);
 }
 

src/main/java/com/izouma/awesomeadmin/service/impl/HouseInfoServiceImpl.java

@@ -1,52 +1,69 @@
 package com.izouma.awesomeadmin.service.impl;
 
+import java.math.BigDecimal;
 import java.util.*;
+
+import com.izouma.awesomeadmin.dto.Result;
+import com.izouma.awesomeadmin.model.*;
+import com.izouma.awesomeadmin.service.MemberCoinService;
+import com.izouma.awesomeadmin.service.PlayerInfoService;
+import com.izouma.awesomeadmin.service.UserInfoService;
+import com.izouma.awesomeadmin.util.MbappUtil;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.izouma.awesomeadmin.constant.AppConstant;
 import com.izouma.awesomeadmin.dto.Page;
-import com.izouma.awesomeadmin.model.HouseInfo;
 import com.izouma.awesomeadmin.service.HouseInfoService;
 import com.izouma.awesomeadmin.dao.HouseInfoMapper;
 
 /**
-*  service接口实现类
-*/
+ * service接口实现类
+ */
 @Service
-public class HouseInfoServiceImpl implements HouseInfoService{
+public class HouseInfoServiceImpl implements HouseInfoService {
 
     private static Logger logger = Logger.getLogger(HouseInfoServiceImpl.class);
 
     @Autowired
     private HouseInfoMapper houseInfoMapper;
 
+    @Autowired
+    private UserInfoService userInfoService;
+
+    @Autowired
+    private MemberCoinService memberCoinService;
+
+    @Autowired
+    private PlayerInfoService playerInfoService;
+
     @Override
     public List<HouseInfo> getHouseInfoList(HouseInfo record) {
 
         logger.info("getHouseInfoList");
         try {
 
-        return houseInfoMapper.queryAllHouseInfo(record);
+            return houseInfoMapper.queryAllHouseInfo(record);
         } catch (Exception e) {
-        logger.error("getHouseInfoList", e);
+            logger.error("getHouseInfoList", e);
         }
 
         return null;
     }
+
     @Override
     public List<HouseInfo> getHouseInfoByPage(Page page, HouseInfo record) {
 
         logger.info("getHouseInfoByPage");
         try {
 
-        Map<String, Object> parameter = new HashMap<String, Object>();
-        parameter.put("record", record);
-        parameter.put(AppConstant.PAGE, page);
+            Map<String, Object> parameter = new HashMap<String, Object>();
+            parameter.put("record", record);
+            parameter.put(AppConstant.PAGE, page);
 
-        return houseInfoMapper.queryHouseInfoByPage(parameter);
+            return houseInfoMapper.queryHouseInfoByPage(parameter);
         } catch (Exception e) {
-        logger.error("getHouseInfoByPage", e);
+            logger.error("getHouseInfoByPage", e);
         }
 
         return null;
@@ -60,7 +77,7 @@ public class HouseInfoServiceImpl implements HouseInfoService{
 
             return houseInfoMapper.selectByPrimaryKey(Integer.valueOf(id));
         } catch (Exception e) {
-        logger.error("getHouseInfoById", e);
+            logger.error("getHouseInfoById", e);
         }
 
         return null;
@@ -74,7 +91,7 @@ public class HouseInfoServiceImpl implements HouseInfoService{
 
             return houseInfoMapper.queryHouseInfo(record);
         } catch (Exception e) {
-        logger.error("getHouseInfo", e);
+            logger.error("getHouseInfo", e);
         }
 
         return null;
@@ -85,11 +102,12 @@ public class HouseInfoServiceImpl implements HouseInfoService{
 
         logger.info("createHouseInfo");
         try {
+            record.setHouseCode(MbappUtil.getCodeByUUId());
 
             int updates = houseInfoMapper.insertSelective(record);
 
             if (updates > 0) {
-                 return true;
+                return true;
             }
         } catch (Exception e) {
             logger.error("createHouseInfo", e);
@@ -104,13 +122,13 @@ public class HouseInfoServiceImpl implements HouseInfoService{
         logger.info("deleteHouseInfo");
         try {
 
-             int updates = houseInfoMapper.delete(record);
+            int updates = houseInfoMapper.delete(record);
 
             if (updates > 0) {
-                 return true;
+                return true;
             }
         } catch (Exception e) {
-             logger.error("deleteHouseInfo", e);
+            logger.error("deleteHouseInfo", e);
         }
 
         return false;
@@ -125,13 +143,92 @@ public class HouseInfoServiceImpl implements HouseInfoService{
             int updates = houseInfoMapper.updateByPrimaryKeySelective(record);
 
             if (updates > 0) {
-                 return true;
+                return true;
             }
         } catch (Exception e) {
-             logger.error("updateHouseInfo", e);
+            logger.error("updateHouseInfo", e);
         }
 
         return false;
     }
+
+    @Override
+    public Result joinHouseInfo(PlayerInfo record) {
+
+        logger.info("joinHouseInfo");
+        try {
+
+            UserInfo userInfo = new UserInfo();
+            userInfo.setId(record.getUserId());
+            userInfo = userInfoService.getSingleUserInfo(userInfo);
+
+            if (userInfo == null) {
+                return new Result(false, "加入失败，用户不存在！");
+            }
+
+            HouseInfo houseInfo = new HouseInfo();
+            houseInfo.setId(record.getHouseId());
+            houseInfo = houseInfoMapper.queryHouseInfo(houseInfo);
+            if (houseInfo != null) {
+                return new Result(false, "加入失败，房间不存在！");
+            }
+            double entryCoin = 50;
+
+            HouseLevel houseLevel = houseInfo.getHouseLevelInfo();
+            if (houseLevel != null) {
+                entryCoin = houseLevel.getEntryCoin().doubleValue();
+            }
+
+            /**
+             * 余额
+             */
+            double moneyCoin = userInfo.getMoneyCoin();
+
+            if (entryCoin > moneyCoin) {
+                return new Result(false, "加入失败，余额不足");
+            }
+
+            record.setGameId(houseInfo.getGameId());
+            record.setHouseId(houseInfo.getId());
+            record.setJoinTime(new Date());
+            record.setPrincipal(BigDecimal.valueOf(entryCoin));
+            record.setSeasonId(houseInfo.getSeasonId());
+
+            playerInfoService.createPlayerInfo(record);
+
+            // 只能用余额支付
+            if (entryCoin > 0) {
+
+                MemberCoin memberCoin = new MemberCoin();
+                memberCoin.setCreateUser("系统");
+                memberCoin.setHouseId(houseInfo.getId());
+                memberCoin.setUserId(userInfo.getId());
+                memberCoin.setGameId(houseInfo.getGameId());
+                memberCoin.setSeasonId(houseInfo.getSeasonId());
+                memberCoin.setPlayerId(record.getId());
+
+                memberCoin.setMoney(BigDecimal.valueOf(-entryCoin));
+                memberCoin.setBalance(BigDecimal.valueOf(moneyCoin - entryCoin));
+                memberCoin.setTypeFlag(AppConstant.CoinType.CONSUMPTION);
+                memberCoin.setRemark("加入房间：" + houseInfo.getHouseCode());
+                memberCoinService.createMemberCoin(memberCoin);
+
+            }
+
+            UserInfo updateUser = new UserInfo();
+            updateUser.setId(userInfo.getId());
+            updateUser.setMoneyCoin(moneyCoin - entryCoin);
+            userInfoService.updateUserInfo(updateUser);
+
+
+            return new Result(true, "加入成功");
+
+
+        } catch (Exception e) {
+            logger.error("joinHouseInfo", e);
+        }
+
+        return new Result(false, "加入失败");
+    }
 }
 

src/main/java/com/izouma/awesomeadmin/service/impl/MemberCoinServiceImpl.java

@@ -1,6 +1,10 @@
 package com.izouma.awesomeadmin.service.impl;
 
+import java.math.BigDecimal;
 import java.util.*;
+
+import com.izouma.awesomeadmin.model.UserInfo;
+import com.izouma.awesomeadmin.service.UserInfoService;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -11,42 +15,46 @@ import com.izouma.awesomeadmin.service.MemberCoinService;
 import com.izouma.awesomeadmin.dao.MemberCoinMapper;
 
 /**
-*  service接口实现类
-*/
+ * service接口实现类
+ */
 @Service
-public class MemberCoinServiceImpl implements MemberCoinService{
+public class MemberCoinServiceImpl implements MemberCoinService {
 
     private static Logger logger = Logger.getLogger(MemberCoinServiceImpl.class);
 
     @Autowired
     private MemberCoinMapper memberCoinMapper;
 
+    @Autowired
+    private UserInfoService userInfoService;
+
     @Override
     public List<MemberCoin> getMemberCoinList(MemberCoin record) {
 
         logger.info("getMemberCoinList");
         try {
 
-        return memberCoinMapper.queryAllMemberCoin(record);
+            return memberCoinMapper.queryAllMemberCoin(record);
         } catch (Exception e) {
-        logger.error("getMemberCoinList", e);
+            logger.error("getMemberCoinList", e);
         }
 
         return null;
     }
+
     @Override
     public List<MemberCoin> getMemberCoinByPage(Page page, MemberCoin record) {
 
         logger.info("getMemberCoinByPage");
         try {
 
-        Map<String, Object> parameter = new HashMap<String, Object>();
-        parameter.put("record", record);
-        parameter.put(AppConstant.PAGE, page);
+            Map<String, Object> parameter = new HashMap<String, Object>();
+            parameter.put("record", record);
+            parameter.put(AppConstant.PAGE, page);
 
-        return memberCoinMapper.queryMemberCoinByPage(parameter);
+            return memberCoinMapper.queryMemberCoinByPage(parameter);
         } catch (Exception e) {
-        logger.error("getMemberCoinByPage", e);
+            logger.error("getMemberCoinByPage", e);
         }
 
         return null;
@@ -60,7 +68,7 @@ public class MemberCoinServiceImpl implements MemberCoinService{
 
             return memberCoinMapper.selectByPrimaryKey(Integer.valueOf(id));
         } catch (Exception e) {
-        logger.error("getMemberCoinById", e);
+            logger.error("getMemberCoinById", e);
         }
 
         return null;
@@ -74,7 +82,7 @@ public class MemberCoinServiceImpl implements MemberCoinService{
 
             return memberCoinMapper.queryMemberCoin(record);
         } catch (Exception e) {
-        logger.error("getMemberCoin", e);
+            logger.error("getMemberCoin", e);
         }
 
         return null;
@@ -89,7 +97,7 @@ public class MemberCoinServiceImpl implements MemberCoinService{
             int updates = memberCoinMapper.insertSelective(record);
 
             if (updates > 0) {
-                 return true;
+                return true;
             }
         } catch (Exception e) {
             logger.error("createMemberCoin", e);
@@ -104,13 +112,13 @@ public class MemberCoinServiceImpl implements MemberCoinService{
         logger.info("deleteMemberCoin");
         try {
 
-             int updates = memberCoinMapper.delete(record);
+            int updates = memberCoinMapper.delete(record);
 
             if (updates > 0) {
-                 return true;
+                return true;
             }
         } catch (Exception e) {
-             logger.error("deleteMemberCoin", e);
+            logger.error("deleteMemberCoin", e);
         }
 
         return false;
@@ -125,13 +133,53 @@ public class MemberCoinServiceImpl implements MemberCoinService{
             int updates = memberCoinMapper.updateByPrimaryKeySelective(record);
 
             if (updates > 0) {
-                 return true;
+                return true;
             }
         } catch (Exception e) {
-             logger.error("updateMemberCoin", e);
+            logger.error("updateMemberCoin", e);
         }
 
         return false;
     }
+
+    @Override
+    public int song(MemberCoin memberCoin) {
+
+        logger.info("song：送电子币  ");
+        try {
+
+            int key = 0;
+
+            double money = memberCoin.getMoney().doubleValue();
+
+
+            int userId = Integer.valueOf(memberCoin.getUserId());
+            UserInfo userInfo = userInfoService.getUserInfoById(userId + "");
+
+            UserInfo updateUser = new UserInfo();
+            updateUser.setId(userId);
+
+
+            double balance = userInfo.getMoneyCoin();
+            double moneyCoin = balance + money;
+
+            memberCoin.setCreateUser("管理员");
+            memberCoin.setBalance(BigDecimal.valueOf(moneyCoin));
+            memberCoin.setTypeFlag(AppConstant.CoinType.SONG);
+            memberCoin.setRemark("后台赠送：" + money + "余额");
+            key += memberCoinMapper.insertSelective(memberCoin);
+
+
+            updateUser.setMoneyCoin(moneyCoin);
+            userInfoService.updateUserInfo(updateUser);
+
+
+            return key;
+        } catch (Exception e) {
+            logger.error("song：送电子币异常  ", e);
+        }
+
+        return 0;
+    }
 }
 

src/main/java/com/izouma/awesomeadmin/util/MbappUtil.java

@@ -284,6 +284,18 @@ public class MbappUtil {
         return machineId + String.format("%015d", hashCodeV);
     }
 
+    public static String getCodeByUUId() {
+        int machineId = 1;//最大支持1-9个集群机器部署
+        int hashCodeV = UUID.randomUUID().toString().hashCode();
+        if (hashCodeV < 0) {//有可能是负数
+            hashCodeV = -hashCodeV;
+        }
+        // 0 代表前面补充0
+        // 4 代表长度为4
+        // d 代表参数为正数型
+        return machineId + String.format("%09d", hashCodeV);
+    }
+
     /**
      * <p>获取域名，如：http://f0rb.iteye.com/ 。</p>
      *

src/main/java/com/izouma/awesomeadmin/web/HouseInfoController.java

@@ -2,6 +2,7 @@ package com.izouma.awesomeadmin.web;
 
 import java.util.*;
 
+import com.izouma.awesomeadmin.model.PlayerInfo;
 import com.izouma.awesomeadmin.util.ExportExcelUtil;
 import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresAuthentication;
@@ -18,8 +19,8 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 /**
-*  controller类
-*/
+ * controller类
+ */
 @Controller
 @RequestMapping("/houseInfo")
 public class HouseInfoController {
@@ -28,8 +29,8 @@ public class HouseInfoController {
     private HouseInfoService houseInfoService;
 
     /**
-    * <p>获取全部记录。</p>
-    */
+     * <p>获取全部记录。</p>
+     */
     @RequiresAuthentication
     @RequestMapping(value = "/all", method = RequestMethod.GET)
     @ResponseBody
@@ -39,8 +40,8 @@ public class HouseInfoController {
     }
 
     /**
-    * <p>根据Id。</p>
-    */
+     * <p>根据Id。</p>
+     */
     @RequestMapping(value = "/getHouseInfo", method = RequestMethod.GET)
     @ResponseBody
     public Result getHouseInfo(@RequestParam(required = false, value = "id") String id) {
@@ -49,8 +50,8 @@ public class HouseInfoController {
     }
 
     /**
-    * <p>根据条件获取。</p>
-    */
+     * <p>根据条件获取。</p>
+     */
     @RequestMapping(value = "/getOne", method = RequestMethod.GET)
     @ResponseBody
     public Result getOne(HouseInfo record) {
@@ -60,14 +61,14 @@ public class HouseInfoController {
 
 
     /**
-    * <p>分页查询。</p>
-    */
+     * <p>分页查询。</p>
+     */
     @RequestMapping(value = "/page", method = RequestMethod.GET)
     @ResponseBody
     public Result page(Page page, HouseInfo record) {
         Map<String, Object> result = new HashMap<>();
 
-        List<HouseInfo> pp =houseInfoService.getHouseInfoByPage(page, record);
+        List<HouseInfo> pp = houseInfoService.getHouseInfoByPage(page, record);
 
         result.put(AppConstant.PAGE, page);
         result.put("pp", pp);
@@ -76,103 +77,121 @@ public class HouseInfoController {
 
 
     /**
-    * <p>保存。</p>
-    */
+     * <p>保存。</p>
+     */
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ResponseBody
     public Result save(HouseInfo record) {
+
         boolean num = houseInfoService.createHouseInfo(record);
         if (num) {
-        return new Result(true, record.getId());
+            return new Result(true, record.getId());
         }
         return new Result(false, "保存异常");
     }
 
     /**
-    * <p>更新信息。</p>
-    */
+     * <p>更新信息。</p>
+     */
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
     public Result updateHouseInfo(HouseInfo record) {
         boolean num = houseInfoService.updateHouseInfo(record);
         if (num) {
-        return new Result(true, "保存成功");
+            return new Result(true, "保存成功");
         }
         return new Result(false, "保存异常");
     }
 
+
     /**
-    * <p>删除。</p>
-    */
+     * <p>删除。</p>
+     */
     @RequestMapping(value = "/del", method = RequestMethod.POST)
     @ResponseBody
     public Result deleteHouseInfo(HouseInfo record) {
 
         boolean num = houseInfoService.deleteHouseInfo(record);
         if (num) {
-        return new Result(true, "删除成功");
+            return new Result(true, "删除成功");
         }
         return new Result(false, "删除异常");
     }
 
     /**
-    * 导出Excel
-    * @param request
-    * @param response
-    * @param record
-    * @throws Exception
-    */
+     * 导出Excel
+     *
+     * @param request
+     * @param response
+     * @param record
+     * @throws Exception
+     */
     @RequestMapping(value = "/exportExcel", method = RequestMethod.GET)
     @ResponseBody
     public void exportExcel(HttpServletRequest request, HttpServletResponse response, HouseInfo record) throws Exception {
 
-    List<HouseInfo> houseInfos = houseInfoService.getHouseInfoList(record);
+        List<HouseInfo> houseInfos = houseInfoService.getHouseInfoList(record);
 
 
         String sheetName = "house_info";
         String titleName = "房间信息数据表";
         String fileName = "房间信息表";
         int columnNumber = 27;
-        int[] columnWidth = { 20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20 };
-        String[] columnName = {  "" ,   "删除标识" ,   "更新时间" ,   "更新人" ,   "创建时间" ,   "创建人" ,   "名称" ,   "描述" ,   "头像" ,   "CODE" ,   "用户" ,   "类型" ,   "等级" ,   "游戏" ,   "状态" ,   "推荐" ,   "排序" ,   "可用" ,   "游戏房间号" ,   "游戏密码" ,   "开始时间" ,   "结束时间" ,   "比赛名称" ,   "参数人数" ,   "奖金" ,   "赛季ID" ,   "视频"  };
+        int[] columnWidth = {20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20};
+        String[] columnName = {"", "删除标识", "更新时间", "更新人", "创建时间", "创建人", "名称", "描述", "头像", "CODE", "用户", "类型", "等级", "游戏", "状态", "推荐", "排序", "可用", "游戏房间号", "游戏密码", "开始时间", "结束时间", "比赛名称", "参数人数", "奖金", "赛季ID", "视频"};
         String[][] dataList = new String[houseInfos.size()][27];
 
         for (int i = 0; i < houseInfos.size(); i++) {
 
-                        dataList[i][0] = String.valueOf(houseInfos.get(i).getId());
-                        dataList[i][1] = String.valueOf(houseInfos.get(i).getDelFlag());
-                        dataList[i][2] = String.valueOf(houseInfos.get(i).getUpdateTime());
-                        dataList[i][3] = String.valueOf(houseInfos.get(i).getUpdateUser());
-                        dataList[i][4] = String.valueOf(houseInfos.get(i).getCreateTime());
-                        dataList[i][5] = String.valueOf(houseInfos.get(i).getCreateUser());
-                        dataList[i][6] = String.valueOf(houseInfos.get(i).getHouseName());
-                        dataList[i][7] = String.valueOf(houseInfos.get(i).getHouseAbstract());
-                        dataList[i][8] = String.valueOf(houseInfos.get(i).getIcon());
-                        dataList[i][9] = String.valueOf(houseInfos.get(i).getHouseCode());
-                        dataList[i][10] = String.valueOf(houseInfos.get(i).getUserId());
-                        dataList[i][11] = String.valueOf(houseInfos.get(i).getHouseType());
-                        dataList[i][12] = String.valueOf(houseInfos.get(i).getHouseLevel());
-                        dataList[i][13] = String.valueOf(houseInfos.get(i).getGameId());
-                        dataList[i][14] = String.valueOf(houseInfos.get(i).getStatusFlag());
-                        dataList[i][15] = String.valueOf(houseInfos.get(i).getRecommendFlag());
-                        dataList[i][16] = String.valueOf(houseInfos.get(i).getRank());
-                        dataList[i][17] = String.valueOf(houseInfos.get(i).getUseFlag());
-                        dataList[i][18] = String.valueOf(houseInfos.get(i).getGameHouseId());
-                        dataList[i][19] = String.valueOf(houseInfos.get(i).getGameHousePassword());
-                        dataList[i][20] = String.valueOf(houseInfos.get(i).getBeginTime());
-                        dataList[i][21] = String.valueOf(houseInfos.get(i).getEndTime());
-                        dataList[i][22] = String.valueOf(houseInfos.get(i).getMatchName());
-                        dataList[i][23] = String.valueOf(houseInfos.get(i).getPlayerNumber());
-                        dataList[i][24] = String.valueOf(houseInfos.get(i).getBonus());
-                        dataList[i][25] = String.valueOf(houseInfos.get(i).getSeasonId());
-                        dataList[i][26] = String.valueOf(houseInfos.get(i).getVideo());
-                    }
+            dataList[i][0] = String.valueOf(houseInfos.get(i).getId());
+            dataList[i][1] = String.valueOf(houseInfos.get(i).getDelFlag());
+            dataList[i][2] = String.valueOf(houseInfos.get(i).getUpdateTime());
+            dataList[i][3] = String.valueOf(houseInfos.get(i).getUpdateUser());
+            dataList[i][4] = String.valueOf(houseInfos.get(i).getCreateTime());
+            dataList[i][5] = String.valueOf(houseInfos.get(i).getCreateUser());
+            dataList[i][6] = String.valueOf(houseInfos.get(i).getHouseName());
+            dataList[i][7] = String.valueOf(houseInfos.get(i).getHouseAbstract());
+            dataList[i][8] = String.valueOf(houseInfos.get(i).getIcon());
+            dataList[i][9] = String.valueOf(houseInfos.get(i).getHouseCode());
+            dataList[i][10] = String.valueOf(houseInfos.get(i).getUserId());
+            dataList[i][11] = String.valueOf(houseInfos.get(i).getHouseType());
+            dataList[i][12] = String.valueOf(houseInfos.get(i).getHouseLevel());
+            dataList[i][13] = String.valueOf(houseInfos.get(i).getGameId());
+            dataList[i][14] = String.valueOf(houseInfos.get(i).getStatusFlag());
+            dataList[i][15] = String.valueOf(houseInfos.get(i).getRecommendFlag());
+            dataList[i][16] = String.valueOf(houseInfos.get(i).getRank());
+            dataList[i][17] = String.valueOf(houseInfos.get(i).getUseFlag());
+            dataList[i][18] = String.valueOf(houseInfos.get(i).getGameHouseId());
+            dataList[i][19] = String.valueOf(houseInfos.get(i).getGameHousePassword());
+            dataList[i][20] = String.valueOf(houseInfos.get(i).getBeginTime());
+            dataList[i][21] = String.valueOf(houseInfos.get(i).getEndTime());
+            dataList[i][22] = String.valueOf(houseInfos.get(i).getMatchName());
+            dataList[i][23] = String.valueOf(houseInfos.get(i).getPlayerNumber());
+            dataList[i][24] = String.valueOf(houseInfos.get(i).getBonus());
+            dataList[i][25] = String.valueOf(houseInfos.get(i).getSeasonId());
+            dataList[i][26] = String.valueOf(houseInfos.get(i).getVideo());
+        }
 
 
         ExportExcelUtil.ExportWithResponse(sheetName, titleName, fileName,
-        columnNumber, columnWidth, columnName, dataList, response);
+                columnNumber, columnWidth, columnName, dataList, response);
+
+
+    }
 
 
+    /**
+     * <p>加入房间。</p>
+     */
+    @RequestMapping(value = "/join", method = RequestMethod.POST)
+    @ResponseBody
+    public Result joinHouseInfo(PlayerInfo record) {
+        boolean num = houseInfoService.joinHouseInfo(record);
+        if (num) {
+            return new Result(true, "保存成功");
         }
+        return new Result(false, "保存异常");
     }
 
+}
+

src/main/java/com/izouma/awesomeadmin/web/MemberCoinController.java

@@ -162,5 +162,18 @@ public class MemberCoinController {
 
 
         }
+
+    @RequestMapping(value = "/song", method = RequestMethod.POST)
+    @ResponseBody
+    public Result song(MemberCoin memberCoin) {
+
+        int num = memberCoinService.song(memberCoin);
+        if (num > 0) {
+            return new Result(true, "赠送成功");
+        }
+        return new Result(false, "赠送异常");
+
+    }
+
     }
 

src/main/vue/src/pages/HouseInfo.vue

@@ -14,7 +14,12 @@
                 <el-input v-model="formData.houseCode" :disabled="'houseCode'==subColumn"></el-input>
             </el-form-item>
             <el-form-item prop="userId" label="用户">
-                <el-input v-model="formData.userId" :disabled="'userId'==subColumn"></el-input>
+                <template>
+                    <el-select v-model="formData.userId" clearable placeholder="请选择" :disabled="'userId'==subColumn">
+                        <el-option v-for="item in userIdOptions" :key="item.value" :label="item.label" :value="item.value">
+                        </el-option>
+                    </el-select>
+                </template>
             </el-form-item>
             <el-form-item prop="houseType" label="类型">
                 <template>
@@ -134,6 +139,7 @@ export default {
                     this.formData.recommendFlag = this.formData.recommendFlag == 'Y' ? true : false;
                     this.formData.useFlag = this.formData.useFlag == 'Y' ? true : false;
 
+
                     if (this.$route.query.column) {
                         this.formData[this.subColumn] = this.subValue;
                     }
@@ -148,6 +154,21 @@ export default {
 
 
 
+        this.$http.get({
+            url: '/userInfo/all'
+        }).then(res => {
+            if (res.success) {
+
+                if (res.data.length > 0) {
+                    res.data.forEach(item => {
+                        this.userIdOptions.push({ label: item.username, value: item.id });
+                    })
+                }
+            }
+        });
+
+
+
         this.$http.get({
             url: '/houseLevel/all'
         }).then(res => {
@@ -155,7 +176,7 @@ export default {
 
                 if (res.data.length > 0) {
                     res.data.forEach(item => {
-                        this.houseLevelOptions.push({ label: item.levelName, value: String(item.id) });
+                        this.houseLevelOptions.push({ label: item.levelName, value: item.id });
                     })
                 }
             }
@@ -195,10 +216,16 @@ export default {
         return {
             saving: false,
             formData: {
-                useFlag: 'Y'
+                houseType: 0,
+                houseLevel: 1,
+                gameId: 1,
+                statusFlag: 0,
+                useFlag: true,
+
             },
             rules: {
             },
+            userIdOptions: [],
             houseTypeOptions: [{                value: 0,
                 label: '个人'
             }, {

src/main/vue/src/pages/HouseInfos.vue

@@ -47,7 +47,7 @@
                                             <el-table-column
                                 v-if="isColumnShow('id')"
                                 prop="id"
-                                label=""
+                                label="ID"
                                 min-width="100">
                         </el-table-column>
                                                                                                                                                                                                             
@@ -346,7 +346,7 @@
                 filter2: '',
                 tableColumns: [
                                                                         {
-                                label: '',
+                                label: 'ID',
                                 value: 'id',
                                 show: true
                             },
@@ -464,7 +464,7 @@
                 searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
                 advancedQueryColumns: [
                                                                         {
-                                label: '',
+                                label: 'ID',
                                 value: 'id'
                             },
                                                                                                                                                                                                                                                                                                                             {