diff --git a/serverlogic/src/main/java/com/ljsd/jieling/db/mongo/MongoUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/db/mongo/MongoUtil.java index 941bedded..eb7379ac7 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/db/mongo/MongoUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/db/mongo/MongoUtil.java @@ -248,6 +248,9 @@ public class MongoUtil { } else { if (!value.equals(o2.get(key))) { builder.append("type22222:o1 k-v= [" + key + ":" + value + "]\r\n"); + if(o2.get(key).toString().contains("expeditionManager")){ + break; + } builder2.append("type22222:o2 k-v= [" + key + ":" + o2.get(key) + "]\r\n"); is = false; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java index 7c3e8f01e..0aefe3bda 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java @@ -842,6 +842,16 @@ public class BuyGoodsLogic { if(ids.size()==0){ continue; } + } else if(sRechargeCommodityConfig.getType() == 8){ + if(rechargeInfo.getGoodsDurationMap().containsKey(78)||rechargeInfo.getGoodsDurationMap().containsKey(80)); + { + continue; + } + }else if(sRechargeCommodityConfig.getType() ==9){ + if(rechargeInfo.getGoodsDurationMap().containsKey(79)||rechargeInfo.getGoodsDurationMap().containsKey(81)); + { + continue; + } }