|
@@ -538,6 +538,10 @@ public class ComPlayerGoodsController extends CommonController<ComPlayerGoodsVo,
|
|
|
}
|
|
}
|
|
|
// 判断是否成熟
|
|
// 判断是否成熟
|
|
|
Date _harvestTime = DateUtil.getNowDateMinusDay(comMallSeedVo.getMaturity());
|
|
Date _harvestTime = DateUtil.getNowDateMinusDay(comMallSeedVo.getMaturity());
|
|
|
|
|
+ //todo [牧场养殖渔场需求] 如果是养殖类的,成熟期需要单独计算
|
|
|
|
|
+ if (otherPlayerLand.getMallType() > 0) {
|
|
|
|
|
+ _harvestTime = comPlayerCultivateSerivce.getHarvestTime(userId, otherPlayerLand.getConfigLandId());
|
|
|
|
|
+ }
|
|
|
// 两个时间差, 逻辑是_harvestTime 时间慢慢接近种植时间
|
|
// 两个时间差, 逻辑是_harvestTime 时间慢慢接近种植时间
|
|
|
long diff = otherPlayerLand.getPlantStart().getTime() - _harvestTime.getTime();
|
|
long diff = otherPlayerLand.getPlantStart().getTime() - _harvestTime.getTime();
|
|
|
if (diff > 0) {
|
|
if (diff > 0) {
|