注册赠送

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

@@ -276,8 +276,8 @@ public class HouseInfoServiceImpl implements HouseInfoService {
                                         + "，比赛超时，无法获得奖励。";
                                 typeFlag = AppConstant.NoticeType.RESULT;
                             } else {
-                                if (houseInfo.getScoreType() == 0) {//吃鸡模式
-                                    if (playerInfo.getRanking() != null && i < 3) {//只有吃鸡才能获得奖励
+                                if (houseInfo.getScoreType() == 0) {//评分模式
+                                    if (playerInfo.getRanking() != null && i < 3) {//只有成绩才能获得奖励
 
                                         if (i == 0) {//第一名 金牌
                                             playerInfo.setMedal(AppConstant.Medals.GOLD);

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

@@ -4,10 +4,7 @@ import com.izouma.awesomeadmin.constant.AppConstant;
 import com.izouma.awesomeadmin.dao.*;
 import com.izouma.awesomeadmin.dto.Page;
 import com.izouma.awesomeadmin.dto.Result;
-import com.izouma.awesomeadmin.model.AlipayTemp;
-import com.izouma.awesomeadmin.model.MemberCoin;
-import com.izouma.awesomeadmin.model.RecommenderLog;
-import com.izouma.awesomeadmin.model.UserInfo;
+import com.izouma.awesomeadmin.model.*;
 import com.izouma.awesomeadmin.service.OSSFileService;
 import com.izouma.awesomeadmin.service.SystemVariableService;
 import com.izouma.awesomeadmin.service.UserInfoService;
@@ -59,7 +56,7 @@ public class UserInfoServiceImpl implements UserInfoService {
     private AlipayTempMapper alipayTempMapper;
 
     @Autowired
-    private MemberCoinMapper memberCoinMapper;
+    private MemberTicketMapper memberTicketMapper;
 
     @Autowired
     private RecommenderLogMapper recommenderLogMapper;
@@ -192,39 +189,86 @@ public class UserInfoServiceImpl implements UserInfoService {
 
                 int song = Integer.valueOf(registerSong);
                 if (song > 0) {
-                    MemberCoin memberCoin = new MemberCoin();
-                    memberCoin.setMoney(BigDecimal.valueOf(song));
-                    memberCoin.setUserId(record.getId());
-                    double money = memberCoin.getMoney().doubleValue();
+                    MemberTicket memberTicket = new MemberTicket();
+                    memberTicket.setMoney(BigDecimal.valueOf(song));
+                    memberTicket.setUserId(record.getId());
+                    int money = memberTicket.getMoney().intValue();
 
 
-                    int userId = Integer.valueOf(memberCoin.getUserId());
+                    int userId = Integer.valueOf(memberTicket.getUserId());
                     UserInfo userInfo = userInfoMapper.selectByPrimaryKey(record.getId());
 
                     UserInfo updateUser = new UserInfo();
                     updateUser.setId(userId);
 
 
-                    double balance = userInfo.getMoneyCoin();
-                    double moneyCoin = balance + money;
+                    int balance = userInfo.getMoneyTicket();
+                    int moneyTicket = balance + money;
 
-                    memberCoin.setCreateUser("管理员");
-                    memberCoin.setBalance(BigDecimal.valueOf(moneyCoin));
-                    memberCoin.setTypeFlag(AppConstant.CoinType.SONG);
-                    memberCoin.setRemark("新用户注册，后台赠送：" + money + "余额");
-                    memberCoinMapper.insertSelective(memberCoin);
+                    memberTicket.setCreateUser("管理员");
+                    memberTicket.setBalance(BigDecimal.valueOf(moneyTicket));
+                    memberTicket.setTypeFlag(AppConstant.CoinType.SONG);
+                    memberTicket.setRemark("新用户注册，后台赠送：" + money + "门票");
+                    memberTicketMapper.insertSelective(memberTicket);
 
-                    updateUser.setMoneyCoin(moneyCoin);
+                    updateUser.setMoneyTicket(moneyTicket);
                     this.updateUserInfo(updateUser);
                 }
             }
 
         } catch (Exception e) {
-            logger.error("新用户注册赠送余额异常", e);
+            logger.error("新用户注册赠送门票异常", e);
         }
 
 
     }
+//    /**
+//     * 用户注册赠送余额
+//     *
+//     * @param record
+//     */
+//    private void songMoney(UserInfo record) {
+//
+//        try {
+//
+//            String registerSong = systemVariableService.get("registerSong");
+//            if (StringUtils.isNotEmpty(registerSong)) {
+//
+//                int song = Integer.valueOf(registerSong);
+//                if (song > 0) {
+//                    MemberCoin memberCoin = new MemberCoin();
+//                    memberCoin.setMoney(BigDecimal.valueOf(song));
+//                    memberCoin.setUserId(record.getId());
+//                    double money = memberCoin.getMoney().doubleValue();
+//
+//
+//                    int userId = Integer.valueOf(memberCoin.getUserId());
+//                    UserInfo userInfo = userInfoMapper.selectByPrimaryKey(record.getId());
+//
+//                    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 + "余额");
+//                    memberCoinMapper.insertSelective(memberCoin);
+//
+//                    updateUser.setMoneyCoin(moneyCoin);
+//                    this.updateUserInfo(updateUser);
+//                }
+//            }
+//
+//        } catch (Exception e) {
+//            logger.error("新用户注册赠送余额异常", e);
+//        }
+//
+//
+//    }
 
     private boolean updateUserRolesAndDeparts(UserInfo record, int updates) {
         if (updates > 0) {