From c7e179ba55f5bb875b6fd66543f08075d65992ab Mon Sep 17 00:00:00 2001 From: zhangshanxue Date: Sun, 27 Sep 2020 18:03:38 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E9=A1=B5=E6=94=AF=E4=BB=98=E8=BF=87?= =?UTF-8?q?=E6=BB=A4=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ljsd/jieling/db/mongo/MongoUtil.java | 3 +++ .../com/ljsd/jieling/logic/store/BuyGoodsLogic.java | 10 ++++++++++ 2 files changed, 13 insertions(+) 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; + } }