1.优化修改

2.添加 一个 ComPlayerCultivateSeedVo

src/main/java/com/td/boss/game/commallseed/controller/ComMallSeedController.java

@@ -161,7 +161,11 @@ public class ComMallSeedController extends CommonController<ComMallSeedVo, ComMa
             //记录兑换id
             _snbTran.setTranId(itemType.toString());
             _snbTran.setUserId(userId);
-            _snbTran.setTranName("使用SNB购买种子");
+            if(seedVo.getMallType().equals(0)){
+                _snbTran.setTranName("使用SNB购买"+seedVo.getName()+"种子");
+            }else{
+                _snbTran.setTranName("使用SNB购买"+seedVo.getName());
+            }
             _snbTran.setTranType(3);
             _snbTran.setTranAmount(_paySeedAmount); //此数量会操作背包记录
             _snbTran.setTranPrice(payAmount);

src/main/java/com/td/boss/game/complayercultivate/serivce/ComPlayerCultivateSerivceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.util.StrUtil;
 import com.td.boss.common.pojo.CultivateKeys;
 import com.td.boss.common.pojo.Result;
 import com.td.boss.common.service.ComConfigService;
@@ -23,6 +24,7 @@ import com.td.boss.game.complayerland.service.ComPlayerLandService;
 import com.td.boss.game.complayerland.vo.ComPlayerLandAndPlantVo;
 import com.td.boss.game.complayerland.vo.ComPlayerLandSimpleVo;
 import com.td.boss.game.complayerland.vo.ComPlayerLandVo;
+import com.td.boss.game.comsnbtran.service.ComSnbTranService;
 import com.td.boss.game.comsnbtran.vo.ComSnbTranVo;
 import com.td.boss.game.comusers.service.ComUsersService;
 import com.td.boss.game.comusers.vo.ComUsersVo;
@@ -61,6 +63,10 @@ public class ComPlayerCultivateSerivceImpl implements ComPlayerCultivateSerivce
     @Autowired
     private RedisLock redisLock;
 
+    //交易表service
+    @Autowired
+    private ComSnbTranService comSnbTranService;
+
     /**
      * 解锁某个土地 【牧场养殖渔场】
      *
@@ -273,6 +279,33 @@ public class ComPlayerCultivateSerivceImpl implements ComPlayerCultivateSerivce
             cultivateRepository.save(comPlayerCultivate);
 
 
+            /**
+             * 喂养动物时候，记录操作
+             */
+            ComSnbTranVo snbTran = new ComSnbTranVo();
+            snbTran.setTranId(Convert.toStr(seedVo.getSeedId()));
+            snbTran.setUserId(userId);
+            snbTran.setTranName(StrUtil.format("喂养{}", seedVo.getSeedName()));
+            snbTran.setTranType(10);
+            snbTran.setTranAmount(buyAmount);
+            snbTran.setTranDescribe(StrUtil.format("user喂养动物消耗SNB：{},消耗：{}单价", _needPrice, seedVo.getSeedSNB()));
+            snbTran.setIsAdd(0);
+            snbTran.setBeforeSnb(_allSnbMaxInt);
+            snbTran.setBeforeSnbPart(DoubleUtil.sub(_allSnb, Math.floor(_allSnb)));
+
+            snbTran.setTranSnb((int) Math.floor(_needPrice));
+            snbTran.setTranSnbPart(DoubleUtil.sub(_needPrice, Math.floor(_needPrice)));
+
+            snbTran.setAfterSnb(Convert.toInt(_tranSnb));
+            snbTran.setAfterSnbPart(_SnbPart);
+
+            snbTran.setCreateTime(new Date());
+
+            snbTran.setTranAmountPart(0d);
+            snbTran.setTranPrice(0);
+            comSnbTranService.save(snbTran);
+
+
             return Result.of(getComPlayerLandAndPlantVo(comPlayerLand), true, "成功");
         } catch (Exception e) {
         } finally {
@@ -305,7 +338,7 @@ public class ComPlayerCultivateSerivceImpl implements ComPlayerCultivateSerivce
         long l = (days - times) * 2;
         //延期后的日期=成熟期+追加天数
         //当天也算一天。过了0点就是新的一天
-        return comPlayerLand.getPlantMature();// Convert.toInt(l, 0) + comPlayerLand.getPlantMature() - 1;
+        return  Convert.toInt(l, 0) + comPlayerLand.getPlantMature() - 1;
     }
 
     /**
@@ -367,6 +400,12 @@ public class ComPlayerCultivateSerivceImpl implements ComPlayerCultivateSerivce
                 Date end = cn.hutool.core.date.DateUtil.endOfDay(new Date());
                 boolean animalEat = isAnimalEat(comPlayerLandAndPlantVo.getUserId(), comPlayerLandAndPlantVo.getMallType(), comPlayerLandAndPlantVo.getConfigLandId(),comPlayerLandAndPlantVo.getPlantFlag(), begin, end);
                 comPlayerLandAndPlantVo.setAnimalEat(animalEat);
+
+                //新加一个养殖的信息
+                List<ComPlayerCultivateSeedVo> SeedList = comConfigService.selectListByKey(CultivateKeys.cultivateFood, ComPlayerCultivateSeedVo.class);
+                //养殖场部分价格信息
+                ComPlayerCultivateSeedVo seedVo = SeedList.stream().filter(a -> a.getSeedId().equals(comPlayerLandAndPlantVo.getMallType())).findFirst().orElse(null);
+                comPlayerLandAndPlantVo.setCultivateSeedVo(seedVo);
             }
             comPlayerLandAndPlantVo.setSeedInfo(comMallSeedVo);
             Date _harvestTime = com.td.boss.util.DateUtil.getNowDateMinusDay(comMallSeedVo.getMaturity());

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

@@ -15,6 +15,7 @@ import com.td.boss.game.comexplainland.vo.ComExplainLandVo;
 import com.td.boss.game.commallseed.service.ComMallSeedService;
 import com.td.boss.game.commallseed.vo.ComMallSeedVo;
 import com.td.boss.game.complayercultivate.serivce.ComPlayerCultivateSerivce;
+import com.td.boss.game.complayercultivate.vo.ComPlayerCultivateSeedVo;
 import com.td.boss.game.complayerland.pojo.ComPlayerDisasterLog;
 import com.td.boss.game.complayerland.pojo.ComPlayerDisasterProtected;
 import com.td.boss.game.complayerland.service.ComPlayerDisasterLogService;
@@ -98,6 +99,8 @@ public class ComPlayerLandController extends CommonController<ComPlayerLandVo, C
         List<ComPlayerLandAndPlantVo> _simpleVoList = CopyUtil.copyList(comPlayerLands, ComPlayerLandAndPlantVo.class);
         List<ComPlayerLandAndPlantVo> _list = new ArrayList<>();
 
+        //新加一个养殖的信息
+        List<ComPlayerCultivateSeedVo> SeedList = comConfigService.selectListByKey(CultivateKeys.cultivateFood, ComPlayerCultivateSeedVo.class);
 
         try {
             _simpleVoList.stream().map(e -> {
@@ -147,6 +150,10 @@ public class ComPlayerLandController extends CommonController<ComPlayerLandVo, C
                         Date end = cn.hutool.core.date.DateUtil.endOfDay(new Date());
                         boolean animalEat = comPlayerCultivateSerivce.isAnimalEat(userId, e.getMallType(), e.getConfigLandId(),e.getPlantFlag(), begin, end);
                         comPlayerLandAndPlantVo.setAnimalEat(animalEat);
+
+                        //养殖场部分价格信息
+                        ComPlayerCultivateSeedVo seedVo = SeedList.stream().filter(a -> a.getSeedId().equals(comPlayerLandAndPlantVo.getMallType())).findFirst().orElse(null);
+                        comPlayerLandAndPlantVo.setCultivateSeedVo(seedVo);
                     }
                     comPlayerLandAndPlantVo.setSeedInfo(comMallSeedVo);
                     //种子时间
@@ -174,7 +181,6 @@ public class ComPlayerLandController extends CommonController<ComPlayerLandVo, C
                             //生成第一次受灾 获取用户土地 getList
                             _InitFirstDisasterProfit(comPlayerLandAndPlantVo, comMallSeedVo);
                         }
-
                     } else {
                         comPlayerLandAndPlantVo.setPlantDaysRemaining(DateUtil.getDays(diff).intValue());
                         comPlayerLandAndPlantVo.setPlantHoursRemaining(DateUtil.getHours(diff).intValue());
@@ -495,6 +501,12 @@ public class ComPlayerLandController extends CommonController<ComPlayerLandVo, C
             if (ArrayUtil.contains(CultivateKeys.mallType,comPlayerLand.getMallType())) {
                 Integer days = comPlayerCultivateSerivce.getHarvestDays(userId, comPlayerLand.getConfigLandId());
                 comMallSeedVo.setMaturity(days);
+
+                //新加一个养殖的信息
+                List<ComPlayerCultivateSeedVo> SeedList = comConfigService.selectListByKey(CultivateKeys.cultivateFood, ComPlayerCultivateSeedVo.class);
+                //养殖场部分价格信息
+                ComPlayerCultivateSeedVo seedVo = SeedList.stream().filter(a -> a.getSeedId().equals(comPlayerLandAndPlantVo.getMallType())).findFirst().orElse(null);
+                comPlayerLandAndPlantVo.setCultivateSeedVo(seedVo);
             }
             //种子时间
             //当前时间 > 种植时间+成熟期  = 说明可以收获了

src/main/java/com/td/boss/game/complayerland/vo/ComPlayerLandAndPlantVo.java

@@ -1,6 +1,7 @@
 package com.td.boss.game.complayerland.vo;
 
 import com.td.boss.game.commallseed.vo.ComMallSeedVo;
+import com.td.boss.game.complayercultivate.vo.ComPlayerCultivateSeedVo;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -77,4 +78,9 @@ public class ComPlayerLandAndPlantVo implements Serializable {
      * 当土地类型是放牧、养殖、渔场其中一种时，该字段表达是否已经喂养
      */
     private boolean animalEat;
+
+    /**
+     * 增加一个养殖信息
+     */
+    private ComPlayerCultivateSeedVo cultivateSeedVo;
 }

src/main/java/com/td/boss/game/complayersattri/service/ComPlayersLuckyServiceImpl.java

@@ -102,7 +102,8 @@ public class ComPlayersLuckyServiceImpl extends CommonServiceImpl<ComPlayersLuck
         if (lastComPlayersLuckyLog.isPresent()) {
             DateTime nextTime = DateUtil.offset(lastComPlayersLuckyLog.get().getCreateTime(), DateField.HOUR_OF_DAY, tools.getUseHour());
             if (nextTime.isAfter(new Date())) {
-                return Result.of(null, false, "请在" + nextTime.toDateStr() + "后使用工具");
+                redisLock.unlock(_redisKey, String.valueOf(time));
+                return Result.of(null, false, "请在" + nextTime.toString() + "后使用工具");
             }
         }
         int afterLucky = playersAttri.getLucky() + tools.getToolLucky();
@@ -127,6 +128,7 @@ public class ComPlayersLuckyServiceImpl extends CommonServiceImpl<ComPlayersLuck
         ComPlayersAttriSimpleVo comPlayersAttriSimpleVo = CopyUtil.copy(playersAttri, ComPlayersAttriSimpleVo.class);
         map.put("playerAttribute", comPlayersAttriSimpleVo);
 
+        redisLock.unlock(_redisKey, String.valueOf(time));
         return Result.of(map, true, "使用工具成功");
     }
 
@@ -201,7 +203,12 @@ public class ComPlayersLuckyServiceImpl extends CommonServiceImpl<ComPlayersLuck
         //更新土地级别
         comPlayerLand.setLandLevel(levelId);
         comPlayerLandRepository.save(comPlayerLand);
-        return Result.of(landLevelUpVo, true, "升级成功");
+
+        Map map = new HashMap();
+        ComPlayersAttriSimpleVo comPlayersAttriSimpleVo = CopyUtil.copy(playersAttri, ComPlayersAttriSimpleVo.class);
+        map.put("playerAttribute", comPlayersAttriSimpleVo);
+        map.put("landLevel", landLevelUpVo);
+        return Result.of(map, true, "升级成功");
     }
 
     /**

src/main/java/com/td/boss/util/DappUtil.java

@@ -137,7 +137,8 @@ public class DappUtil {
         MultiValueMap<String, Object> form = new LinkedMultiValueMap<>();
         form.add("id", userId);
         //验证地址
-        String DAppChildrenCountOnlineUrl = "https://yt.landownership.live/api/game/getChildrenBuyLandCount";
+        //String DAppChildrenCountOnlineUrl = "https://yt.landownership.live/api/game/getChildrenBuyLandCount";
+        String DAppChildrenCountOnlineUrl = "http://192.168.20.251/api/game/getChildrenBuyLandCount";
         String DAppChildrenCountTestUrl = "https://wp.landownership.live/api/game/getChildrenBuyLandCount";
         String DAppUrl = DappUtil.getEnv().equals("prod") ? DAppChildrenCountOnlineUrl : DAppChildrenCountTestUrl;
         log.info("获取用户直推且有消费土地的人数量：" + DAppUrl);
@@ -154,7 +155,7 @@ public class DappUtil {
             HttpEntity<MultiValueMap<String, Object>> files = new HttpEntity<>(form, headers);
             Map response = restTemplate.postForObject(DAppUrl, files, Map.class);
             log.info("response={}", response);
-            return 100;// (Integer) response.get("data");
+            return (Integer) response.get("data");
         } catch (Exception e) {
             log.error(e.getMessage());
             return 0;
@@ -175,7 +176,8 @@ public class DappUtil {
         MultiValueMap<String, Object> form = new LinkedMultiValueMap<>();
         form.add("id", userId);
         //验证地址
-        String DAppChildrenCountOnlineUrl = "https://yt.landownership.live/api/game/getChildrenBuyLandAmount";
+        //String DAppChildrenCountOnlineUrl = "https://yt.landownership.live/api/game/getChildrenBuyLandAmount";
+        String DAppChildrenCountOnlineUrl = "http://192.168.20.251/api/game/getChildrenBuyLandAmount";
         String DAppChildrenCountTestUrl = "https://wp.landownership.live/api/game/getChildrenBuyLandAmount";
         String DAppUrl = DappUtil.getEnv().equals("prod") ? DAppChildrenCountOnlineUrl : DAppChildrenCountTestUrl;
         log.info("获取用户直推下级的消费土地的总cnt数额：" + DAppUrl);
@@ -192,7 +194,7 @@ public class DappUtil {
             HttpEntity<MultiValueMap<String, Object>> files = new HttpEntity<>(form, headers);
             Map response = restTemplate.postForObject(DAppUrl, files, Map.class);
             log.info("response={}", response);
-            return 10000;// (Integer) response.get("data");
+            return (Integer) response.get("data");
         } catch (Exception e) {
             log.error(e.getMessage());
             return 0;

src/main/resources/static/sys/aComConfig/js/landConfig.js

@@ -45,14 +45,30 @@ layui.use(['element', 'form', 'table', 'layer', 'laydate', 'tree', 'util'], func
             , {
                 field: 'initMultiple', title: '初始化租赁倍数', templet: function (d) {
                     if (d.initMultiple == 0) {
-                        return '<span style="color: red">固定倍数1</span>';
+                        if (0 !== d.mallType) {
+                            return '<span style="color: red">---</span>';
+                        } else {
+                            return '<span style="color: red">固定倍数1</span>';
+                        }
                     } else {
-                        return d.initMultiple;
+                       return  d.initMultiple;
                     }
                 }
             }
-            , {field: 'rental2', title: '租赁1年消费CNT'}
-            , {field: 'rental3', title: '租赁5年消费CNT'}
+            , {field: 'rental2', title: '租赁1年消费CNT', templet: function (d) {
+                    if (0 !== d.mallType) {
+                        return '<span style="color: red">---</span>';
+                    } else {
+                        return d.rental2;
+                    }
+                }}
+            , {field: 'rental3', title: '租赁5年消费CNT', templet: function (d) {
+                    if (0 !== d.mallType) {
+                        return '<span style="color: red">---</span>';
+                    } else {
+                        return d.rental3;
+                    }
+                }}
             , {field: 'landDescribe', title: '土地描述'}
             , {field: 'createTime', title: '创建时间', hide: true}
             , {field: 'updateTime', title: '更新时间', hide: true}

src/main/resources/static/sys/aComConfig/js/seedConfig.js

@@ -1,17 +1,18 @@
 let tableIns;
 let tree;
+let mallType = 0;
 layui.use(['element', 'form', 'table', 'layer', 'laydate', 'tree', 'util'], function () {
     let table = layui.table;
     let form = layui.form;//select、单选、复选等依赖form
     //form自定义校验,使用在标签上lay-verify="phoneRequiredFalse"      非必填项验证：新增部分：(^$)|
     form.verify({
-        positiveNumberRequiredTrue:[/^(([0-9]+[\.]?[0-9]+)|[1-9])$/,'只能填写正数'],//必填，且只能输入正数
-        positiveWholeNumberRequiredTrue:[/^[+]{0,1}(\d+)$/,'只能填写正整数'],//必填，且只能输入正整数
+        positiveNumberRequiredTrue: [/^(([0-9]+[\.]?[0-9]+)|[1-9])$/, '只能填写正数'],//必填，且只能输入正数
+        positiveWholeNumberRequiredTrue: [/^[+]{0,1}(\d+)$/, '只能填写正整数'],//必填，且只能输入正整数
     });
     let element = layui.element; //导航的hover效果、二级菜单等功能，需要依赖element模块
     let laydate = layui.laydate;
     tree = layui.tree;
-    let height = document.documentElement.clientHeight*0.8; //随便设置下，和操作表单大概一样
+    let height = document.documentElement.clientHeight * 0.8; //随便设置下，和操作表单大概一样
     //用户列表
     tableIns = table.render({
         elem: '#seedConfigTable'
@@ -38,24 +39,48 @@ layui.use(['element', 'form', 'table', 'layer', 'laydate', 'tree', 'util'], func
         , toolbar: '#seedConfigTableToolbarDemo'
         , title: '种子列表'
         , cols: [[
-             {field: 'id', title: 'ID', hide: true}
-            ,{field: 'mallType', title: '商品类型', hide: true}
+            {field: 'id', title: 'ID', hide: true}
+            , {field: 'mallType', title: '商品类型', hide: true}
             , {field: 'picture', title: '图片名字', hide: true}
             , {field: 'name', title: '种子名字'}
             , {field: 'maturity', title: '成熟期(天)'}
             , {field: 'planting', title: '种植时间', hide: true}
             , {field: 'harvestId', title: '果实id', hide: true}
-            , {field: 'harvestQuantity', title: '收获数量', hide: true}
+            , {
+                field: 'harvestQuantity', title: '养殖场收获数量', templet: function (d) {
+                    if (0 === d.mallType) {  // 自定义内容
+                        return '<span style="color: red">---</span>';
+                    } else {
+                        return d.harvestQuantity;
+                    }
+                }
+            }
             , {field: 'harvestCount', title: '收获次数', hide: true}
             , {field: 'harvest1', title: '3个月收获', hide: true}
-            , {field: 'harvest2', title: '1年收获量'}
-            , {field: 'harvest3', title: '5年收获量'}
-            , {field: 'harvestName', title: '收获名字',hide:true}
+            , {
+                field: 'harvest2', title: '1年收获量', templet: function (d) {
+                    if (0 !== d.mallType) {  // 自定义内容
+                        return '<span style="color: red">---</span>';
+                    } else {
+                        return d.harvest2;
+                    }
+                }
+            }
+            , {
+                field: 'harvest3', title: '5年收获量', templet: function (d) {
+                    if (0 !== d.mallType) {  // 自定义内容
+                        return '<span style="color: red">---</span>';
+                    } else {
+                        return d.harvest3;
+                    }
+                }
+            }
+            , {field: 'harvestName', title: '收获名字', hide: true}
             , {field: 'priceCnt', title: '售价(CNT)'}
             , {field: 'priceSnb', title: '售价(SNB)'}
             , {field: 'seedDescribe', title: '种子描述'}
             , {field: 'amount', title: '库存'}
-            , {field: 'withered', title: '枯萎期',hide:true}
+            , {field: 'withered', title: '枯萎期', hide: true}
             , {field: 'createTime', title: '创建时间', hide: true}
             , {field: 'updateTime', title: '更新时间', hide: true}
             , {fixed: 'right', title: '操作', toolbar: '#seedConfigTableBarDemo'}
@@ -73,6 +98,21 @@ layui.use(['element', 'form', 'table', 'layer', 'laydate', 'tree', 'util'], func
         if (obj.event === 'edit') {
             // console.log("edit");
             //回显操作表单
+            if (0 === data.mallType) {
+                $("#animalId").css("display", "none");
+                $("#seedId").css("display", "block");
+                $("input[name='harvest2']").attr("lay-verify", "positiveNumberRequiredTrue|positiveWholeNumberRequiredTrue");
+                $("input[name='harvest3']").attr("lay-verify", "positiveNumberRequiredTrue|positiveWholeNumberRequiredTrue");
+                $("input[name='harvestQuantity']").attr("lay-verify", "");
+
+            } else {
+                $("#animalId").css("display", "block");
+                $("#seedId").css("display", "none");
+                $("input[name='harvest2']").attr("lay-verify", "");
+                $("input[name='harvest3']").attr("lay-verify", "");
+                $("input[name='harvestQuantity']").attr("lay-verify", "positiveNumberRequiredTrue|positiveWholeNumberRequiredTrue");
+            }
+
             $("#seedConfigForm").form(data);
             form.render();
         }

src/main/resources/static/sys/aComUser/js/user.js

@@ -277,9 +277,11 @@ function initSNBTable(table, data) {
                     }
                 }
             }
-            , {field: 'tranAmount', title: '交易数量',templet: function (d) {
+            , {
+                field: 'tranAmount', title: '交易数量', templet: function (d) {
                     return (d.tranAmount + d.tranAmountPart).toFixed(5);
-                }}
+                }
+            }
             , {field: 'tranPrice', title: '交易价格'}
             , {field: 'tranDescribe', title: '交易描述'}
             , {
@@ -291,15 +293,21 @@ function initSNBTable(table, data) {
                     }
                 }
             }
-            , {field: 'beforeSnb', title: '交易之前的snb',templet: function (d) {
+            , {
+                field: 'beforeSnb', title: '交易之前的snb', templet: function (d) {
                     return (d.beforeSnb + d.beforeSnbPart).toFixed(5);
-                }}
-            , {field: 'tranSnb', title: '交易的snb', templet: function (d) {
+                }
+            }
+            , {
+                field: 'tranSnb', title: '交易的snb', templet: function (d) {
                     return (d.tranSnb + d.tranSnbPart).toFixed(5);
-                }}
-            , {field: 'afterSnb', title: '交易完成后的snb',templet: function (d) {
+                }
+            }
+            , {
+                field: 'afterSnb', title: '交易完成后的snb', templet: function (d) {
                     return (d.afterSnb + d.afterSnbPart).toFixed(5);
-                }}
+                }
+            }
             , {field: 'createTime', title: '创建时间'}
             , {field: 'updateTime', title: '更新时间', hide: true}
         ]]
@@ -373,6 +381,10 @@ function initCNTTable(table, data) {
                         return '<span style="color: green">土地租赁</span>';
                     } else if (d.payType == 4) {
                         return '<span style="color: green">购买种子</span>';
+                    } else if (d.payType == 2) {
+                        return '<span style="color: green">自然防护包</span>';
+                    } else if (d.payType == 3) {
+                        return '<span style="color: green">野兽防护包</span>';
                     } else {
                         return '<span style="color: green">待添加：</span>' + d.payType;
                     }
@@ -386,9 +398,7 @@ function initCNTTable(table, data) {
                     // Integer playCycle = Integer.parseInt(itemArray[0]); //土地周期，比如3个月，1年,5年等
                     // Integer configLandId = Integer.parseInt(itemArray[1]); //itemType
                     let _itemType = d.itemType;
-                    if (_itemType.indexOf('or') === -1) {
-                        return '购买种子:id=' + '<span style="color: red">' + _itemType + '</span>';
-                    } else {
+                    if (d.payType == 1) {  // 自定义内容
                         let _itemArray = _itemType.split("or")
                         let _configLandId = parseInt(_itemArray[1]); //itemType
                         let _landCycle = "3个月";
@@ -400,6 +410,12 @@ function initCNTTable(table, data) {
                         }
                         return '租赁土地' + '<span style="color: red">' + _configLandId + '</span>' + '号,周期:'
                             + '<span style="color: red">' + _landCycle + '</span>';
+                    } else if (d.payType == 4) {
+                        return '购买种子:id=' + '<span style="color: red">' + _itemType + '</span>';
+                    } else if (d.payType == 2) {
+                        return '<span style="color: green">自然防护包：' + _itemType + '</span>';
+                    } else if (d.payType == 3) {
+                        return '<span style="color: green">野兽防护包：' + _itemType + '</span>';
                     }
                 }
             }
@@ -493,8 +509,7 @@ function initPlayerLog(table, data) {
                         return '<span style="color: red">出售果实</span>';
                     } else if (d.tType == 6) {
                         return '<span style="color: green">偷取果实</span>';
-                    }
-                    else {
+                    } else {
                         return '<span style="color: green">待添加：</span>' + d.tType;
                     }
                 }
@@ -502,15 +517,19 @@ function initPlayerLog(table, data) {
             , {field: 'tName', title: '物品名字', width: 120}
             , {
                 field: 'tAmount', title: '交易数量', width: 150, templet: function (d) {
-                  return (d.tAmount + d.tPart).toFixed(5);
+                    return (d.tAmount + d.tPart).toFixed(5);
                 }
             }
-            , {field: 'beforeAmount', title: '交易前数量', templet: function (d) {
+            , {
+                field: 'beforeAmount', title: '交易前数量', templet: function (d) {
                     return (d.beforeAmount + d.beforePart).toFixed(5);
-                }}
-            , {field: 'afterAmount', title: '交易后数量', templet: function (d) {
+                }
+            }
+            , {
+                field: 'afterAmount', title: '交易后数量', templet: function (d) {
                     return (d.afterAmount + d.afterPart).toFixed(5);
-                }}
+                }
+            }
             , {field: 'tLoss', title: '系统扣除部分'}
             , {field: 'lMultiple', title: 'land倍数', width: 80}
             , {field: 'createTime', title: '创建时间'}

src/main/resources/static/sys/aComUser/js/userPlayerGoods.js

@@ -334,7 +334,9 @@ function initPlayerProfit(table, data) {
                         return '<span style="color: red">1年</span>';
                     } else if (d.leaseDate == 3) {
                         return '<span style="color: red">5年</span>';
-                    } else {
+                    } else if (d.leaseDate == 4) {
+                        return '<span style="color: red">养殖场</span>';
+                    }  else {
                         return '<span style="color: green">待添加：</span>' + d.leaseDate;
                     }
                 }

src/main/resources/view/sys/aComConfig/landConfig.html

@@ -18,7 +18,9 @@
                 <!-- 表格主体 -->
                 <table class="layui-hide" id="landConfigTable" lay-filter="test"></table>
                 <script type="text/html" id="landConfigTableBarDemo">
+                    {{#  if(0 === d.mallType){ }}
                     <a class="layui-btn layui-btn-xs" lay-event="edit">编辑<i class="layui-icon layui-icon-edit"></i></a>
+                    {{#  } }}
                 </script>
             </div>
         </div>

src/main/resources/view/sys/aComConfig/seedConfig.html

@@ -44,17 +44,27 @@
                                    class="layui-input" lay-verify="positiveWholeNumberRequiredTrue">
                         </div>
                     </div>
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">1年收获量</label>
-                        <div class="layui-input-block">
-                            <input type="text" name="harvest2" autocomplete="off" placeholder="输入收获量"
-                                   class="layui-input" lay-verify="positiveNumberRequiredTrue|positiveWholeNumberRequiredTrue" >
+                    <div id="seedId">
+                        <div class="layui-form-item" >
+                            <label class="layui-form-label">1年收获量</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="harvest2" autocomplete="off" placeholder="输入收获量"
+                                       class="layui-input" lay-verify="positiveNumberRequiredTrue|positiveWholeNumberRequiredTrue" >
+                            </div>
+                        </div>
+                        <div class="layui-form-item">
+                            <label class="layui-form-label">5年收获量</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="harvest3" autocomplete="off" placeholder="输入收获量"
+                                       class="layui-input" lay-verify="positiveNumberRequiredTrue|positiveWholeNumberRequiredTrue" >
+                            </div>
                         </div>
                     </div>
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">5年收获量</label>
+
+                    <div class="layui-form-item" id="animalId">
+                        <label class="layui-form-label">养殖场收获量</label>
                         <div class="layui-input-block">
-                            <input type="text" name="harvest3" autocomplete="off" placeholder="输入收获量"
+                            <input type="text" name="harvestQuantity" autocomplete="off" placeholder="输入收获量"
                                    class="layui-input" lay-verify="positiveNumberRequiredTrue|positiveWholeNumberRequiredTrue" >
                         </div>
                     </div>