1.更新调整部分问题

src/main/java/com/td/boss/config/enums/ResultEnum.java

@@ -82,7 +82,9 @@ public enum ResultEnum {
     LAND_LAND_LEVELUPPING(715,"该土地正在升级中！"),
 
     //土地受灾中，稍后重试！
-    LAND_DISATER_LOCK(715,"土地正在遭受灾害，稍后重试！"),
+    LAND_DISATER_LOCK(716,"土地正在遭受灾害，稍后重试！"),
+
+    LAND_MALL_TYPE_ERROR(717,"种植或养殖类型不对！"),
 
 
     //种子数据不能存在

src/main/java/com/td/boss/game/commallfood/pojo/ComMallFood.java

@@ -13,7 +13,7 @@ public class ComMallFood implements Serializable {
     @GeneratedValue(strategy= GenerationType.IDENTITY)
     private Integer id;//
 
-    private String mallType;//商城类型，默认是狗粮0
+    private Integer mallType;//商城类型，默认是狗粮0
 
     private String picture;//图片名字，前端存储
 

src/main/java/com/td/boss/game/commallfood/vo/ComMallFoodSimpleVo.java

@@ -10,7 +10,7 @@ import java.util.Date;
 public class ComMallFoodSimpleVo implements Serializable {
     private Integer id;//
 
-    private String mallType;//商城类型，默认是狗粮0
+    private Integer mallType;//商城类型，默认是狗粮0
 
     private String picture;//图片名字，前端存储
 

src/main/java/com/td/boss/game/commallfood/vo/ComMallFoodVo.java

@@ -8,7 +8,7 @@ import java.util.Date;
 public class ComMallFoodVo extends PageCondition implements Serializable {
     private Integer id;//
 
-    private String mallType;//商城类型，默认是狗粮0
+    private Integer mallType;//商城类型，默认是狗粮0
 
     private String picture;//图片名字，前端存储
 

src/main/java/com/td/boss/game/commallseed/pojo/ComMallSeed.java

@@ -12,7 +12,7 @@ public class ComMallSeed implements Serializable {
     @Id
     private Integer id;//
 
-    private String mallType;//商城类型，默认是种子0
+    private Integer mallType;//商城类型，默认是种子0
 
     private String picture;
 

src/main/java/com/td/boss/game/commallseed/vo/ComMallSeedVo.java

@@ -8,7 +8,7 @@ import java.util.Date;
 public class ComMallSeedVo  implements Serializable {
     private Integer id;//
 
-    private String mallType;//商城类型，默认是种子0
+    private Integer mallType;//商城类型，默认是种子0
 
     private String picture;
 

src/main/java/com/td/boss/game/complayerland/controller/ComPlayerLandController.java

@@ -380,8 +380,8 @@ public class ComPlayerLandController extends CommonController<ComPlayerLandVo, C
             }
 
             //todo [牧场养殖渔场需求] 判断种子类型和种子土地是否一样
-            if (comMallSeedVo.getMallType().equals(comPlayerLand.getMallType())) {
-                return Result.of(null, false, ResultEnum.LAND_NOT_LEASE.getMessage(), ResultEnum.LAND_NOT_LEASE.getCode());
+            if (!comMallSeedVo.getMallType().equals(comPlayerLand.getMallType())) {
+                return Result.of(null, false, ResultEnum.LAND_MALL_TYPE_ERROR.getMessage(), ResultEnum.LAND_MALL_TYPE_ERROR.getCode());
             }
             //todo [牧场养殖渔场需求] 特有业务
             if (ArrayUtil.contains(CultivateKeys.mallType,comPlayerLand.getMallType())) {

src/main/java/com/td/boss/game/complayers/controller/ComPlayersController.java

@@ -7,9 +7,11 @@ import com.td.boss.config.enums.ResultEnum;
 import com.td.boss.game.comcntorder.pojo.ComCntOrder;
 import com.td.boss.game.comcntorder.service.ComCntOrderService;
 import com.td.boss.game.complayers.pojo.ComPlayers;
+import com.td.boss.game.complayers.vo.ComPlayersSimpleVo;
 import com.td.boss.game.complayers.vo.ComPlayersVo;
 import com.td.boss.game.complayers.service.ComPlayersService;
 import com.td.boss.util.CopyUtil;
+import com.td.boss.util.DateUtil;
 import lombok.extern.slf4j.Slf4j;
 import net.bytebuddy.asm.Advice;
 import org.apache.commons.lang3.StringUtils;
@@ -38,28 +40,28 @@ public class ComPlayersController extends CommonController<ComPlayersVo, ComPlay
      * @param userId
      * @return
      */
-    @PostMapping("createPlayer")
-    public Result<Map> createPlayer(@RequestParam(value = "userId") String userId,
-                                    @RequestParam(value = "name") String name,
-                                    @RequestParam(value = "avatar") String avatar) {
-        //todo 疑问avatar获取渠道？
-        ComPlayers player = comPlayersService.findByUserId(userId);
-        if (player == null) {
-            //player 不存在
-            player = new ComPlayers();
-            player.setUserId(userId);
-            player.setAttributeType(0);
-        }
-        player.setAvatar(avatar);
-        player.setName(name);
-        ComPlayers addPlayer = comPlayersService.addComPlayers(player);
-
-        Map map = new HashMap();
-        map.put("avatar", addPlayer.getAvatar());
-        map.put("name", addPlayer.getName());
-        map.put("attributeType", addPlayer.getAttributeType());
-        return Result.of(map);
-    }
+    //@PostMapping("createPlayer")
+    //public Result<Map> createPlayer(@RequestParam(value = "userId") String userId,
+    //                                @RequestParam(value = "name") String name,
+    //                                @RequestParam(value = "avatar") String avatar) {
+    //    //todo 疑问avatar获取渠道？
+    //    ComPlayers player = comPlayersService.findByUserId(userId);
+    //    if (player == null) {
+    //        //player 不存在
+    //        player = new ComPlayers();
+    //        player.setUserId(userId);
+    //        player.setAttributeType(0);
+    //    }
+    //    player.setAvatar(avatar);
+    //    player.setName(name);
+    //    ComPlayers addPlayer = comPlayersService.addComPlayers(player);
+    //
+    //    Map map = new HashMap();
+    //    map.put("avatar", addPlayer.getAvatar());
+    //    map.put("name", addPlayer.getName());
+    //    map.put("attributeType", addPlayer.getAttributeType());
+    //    return Result.of(map);
+    //}
 
     /**
      * 获取玩家是否租赁过的信息
@@ -89,20 +91,20 @@ public class ComPlayersController extends CommonController<ComPlayersVo, ComPlay
      * @param userId
      * @return
      */
-    @GetMapping("getPlayer")
-    public Result<Map> getPlayer(@RequestParam(value = "userId") String userId) {
-        ComPlayers player = comPlayersService.findByUserId(userId);
-        if (player == null) {
-            //player 不存在
-            return Result.of(null, false, ResultEnum.PLAYER_DOES_NOT_EXIST.getMessage(), ResultEnum.PLAYER_DOES_NOT_EXIST.getCode());
-        }
-        Map map = new HashMap();
-        map.put("playerId", player.getId());
-        map.put("avatar", player.getAvatar());
-        map.put("name", player.getName());
-        map.put("attributeType", player.getAttributeType());
-        return Result.of(map);
-    }
+    //@GetMapping("getPlayer")
+    //public Result<Map> getPlayer(@RequestParam(value = "userId") String userId) {
+    //    ComPlayers player = comPlayersService.findByUserId(userId);
+    //    if (player == null) {
+    //        //player 不存在
+    //        return Result.of(null, false, ResultEnum.PLAYER_DOES_NOT_EXIST.getMessage(), ResultEnum.PLAYER_DOES_NOT_EXIST.getCode());
+    //    }
+    //    Map map = new HashMap();
+    //    map.put("playerId", player.getId());
+    //    map.put("avatar", player.getAvatar());
+    //    map.put("name", player.getName());
+    //    map.put("attributeType", player.getAttributeType());
+    //    return Result.of(map);
+    //}
 
     /**
      * 获取玩家信息并且携带属性
@@ -110,52 +112,52 @@ public class ComPlayersController extends CommonController<ComPlayersVo, ComPlay
      * @param userId
      * @return
      */
-    @GetMapping("getPlayerAndBattleAttribute")
-    public Result<Map> getPlayerAndBattleAttribute(@RequestParam(value = "userId") String userId,
-                                                   @RequestParam(value = "name") String name,
-                                                   @RequestParam(value = "avatar") String avatar) {
-        ComPlayers player = comPlayersService.findByUserId(userId);
-        if (player == null) {
-            // todo player 如果角色不存在的话，直接创建一个。
-            player = new ComPlayers();
-            player.setUserId(userId);
-            player.setAttributeType(0);
-            player.setAvatar(avatar);
-            player.setName(name);
-            player = comPlayersService.addComPlayers(player);
-        }
-        Map map = new HashMap();
-        map.put("playerId", player.getId());
-        map.put("avatar", player.getAvatar());
-        map.put("name", player.getName());
-        return Result.of(map);
-    }
+    //@GetMapping("getPlayerAndBattleAttribute")
+    //public Result<Map> getPlayerAndBattleAttribute(@RequestParam(value = "userId") String userId,
+    //                                               @RequestParam(value = "name") String name,
+    //                                               @RequestParam(value = "avatar") String avatar) {
+    //    ComPlayers player = comPlayersService.findByUserId(userId);
+    //    if (player == null) {
+    //        // todo player 如果角色不存在的话，直接创建一个。
+    //        player = new ComPlayers();
+    //        player.setUserId(userId);
+    //        player.setAttributeType(0);
+    //        player.setAvatar(avatar);
+    //        player.setName(name);
+    //        player = comPlayersService.addComPlayers(player);
+    //    }
+    //    Map map = new HashMap();
+    //    map.put("playerId", player.getId());
+    //    map.put("avatar", player.getAvatar());
+    //    map.put("name", player.getName());
+    //    return Result.of(map);
+    //}
 
 
-    @PostMapping("playerPushInfo")
-    public Result<Map> playerPushInfoFun(@RequestParam(value = "userId") String userId,
-                                         @RequestParam(value = "playerData") String playerData) {
-        ComPlayers player = comPlayersService.findByUserId(userId);
-        if (player == null) {
-            // todo player 如果角色不存在的话，直接创建一个。
-            player = new ComPlayers();
-            player.setUserId(userId);
-            player.setAttributeType(0);
-            player.setName("");
-            player.setData(playerData);
-            player.setIsExchange(0);
-            player.setCreateTime(new Date());
-            player = comPlayersService.addComPlayers(player);
-        } else {
-            player.setData(playerData);
-            player = comPlayersService.addComPlayers(player);
-        }
-        player.setUpdateTime(new Date());
-        //log.info(playerData);
-        Map map = new HashMap();
-        map.put("playerData", player.getData());
-        return Result.of(map);
-    }
+    //@PostMapping("playerPushInfo")
+    //public Result<Map> playerPushInfoFun(@RequestParam(value = "userId") String userId,
+    //                                     @RequestParam(value = "playerData") String playerData) {
+    //    ComPlayers player = comPlayersService.findByUserId(userId);
+    //    if (player == null) {
+    //        // todo player 如果角色不存在的话，直接创建一个。
+    //        player = new ComPlayers();
+    //        player.setUserId(userId);
+    //        player.setAttributeType(0);
+    //        player.setName("");
+    //        player.setData(playerData);
+    //        player.setIsExchange(0);
+    //        player.setCreateTime(new Date());
+    //        player = comPlayersService.addComPlayers(player);
+    //    } else {
+    //        player.setData(playerData);
+    //        player = comPlayersService.addComPlayers(player);
+    //    }
+    //    player.setUpdateTime(new Date());
+    //    //log.info(playerData);
+    //    Map map = new HashMap();
+    //    map.put("playerData", player.getData());
+    //    return Result.of(map);
+    //}
 
     /**
      * 拉取数据
@@ -164,25 +166,24 @@ public class ComPlayersController extends CommonController<ComPlayersVo, ComPlay
      * @return
      */
     @GetMapping("playerPullInfo")
-    public Result<Map> playerPullInfoFun(@RequestParam(value = "userId") String userId) {
-
+    public Result<?> playerPullInfoFun(@RequestParam(value = "userId") String userId) {
 
         ComPlayers player = comPlayersService.findByUserId(userId);
         //判断是否为空，初始化一个基础数据
         if (player == null) {
+            Date _nowDate = DateUtil.getNowDate();
             player = new ComPlayers();
             player.setUserId(userId);
             player.setName("");
             player.setAvatar("");
             player.setAttributeType(0);
-
-            //这里比较关键了。初始化一个前端默认的游戏数据，后续修改需要联合前端游戏修改
-            player.setData(PlayerData());
+            player.setDiamond(0d);
+            player.setIsExchange(0);
+            player.setCreateTime(_nowDate);
+            player.setUpdateTime(_nowDate);
+            comPlayersService.addComPlayers(player);
         }
-        //log.info(playerData);
-        Map map = new HashMap();
-        map.put("playerData", player.getData());
-        return Result.of(map);
+        return Result.of(CopyUtil.copy(player, ComPlayersSimpleVo.class));
     }
 
     /**

src/main/java/com/td/boss/game/complayers/pojo/ComPlayers.java

@@ -29,6 +29,9 @@ public class ComPlayers implements Serializable {
 
     private String data;//暂时存储用户数据
 
+
+    private Double diamond;
+
     private Date createTime;
 
     private Date updateTime;

src/main/java/com/td/boss/game/complayers/vo/ComPlayersSimpleVo.java

@@ -0,0 +1,33 @@
+package com.td.boss.game.complayers.vo;
+
+import com.td.boss.common.pojo.PageCondition;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class ComPlayersSimpleVo implements Serializable {
+
+    private Integer id;//该角色的id
+
+    private String avatar; //玩家头像，画像
+
+    private String name;//角色名词
+
+    private Integer attributeType;//属性表类型，默认0为player
+
+    /**
+     * 新增一个是否领取的
+     */
+    private Integer isExchange;// 0 未领取，1 领取
+
+    private String data;//暂时存储用户数据
+
+    private Double diamond;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+}

src/main/java/com/td/boss/game/complayers/vo/ComPlayersVo.java

@@ -6,10 +6,28 @@ import java.util.Date;
 
 @Data
 public class ComPlayersVo extends PageCondition implements Serializable {
+
     private Integer id;//该角色的id
 
     private String userId;//创建该角色的用户id
 
+    private String avatar; //玩家头像，画像
+
     private String name;//角色名词
 
+    private Integer attributeType;//属性表类型，默认0为player
+
+    /**
+     * 新增一个是否领取的
+     */
+    private Integer isExchange;// 0 未领取，1 领取
+
+    private String data;//暂时存储用户数据
+
+    private Double diamond;
+
+    private Date createTime;
+
+    private Date updateTime;
+
 }