From de8ef51649b217ce4e7d01e523bb4588102fdbc7 Mon Sep 17 00:00:00 2001 From: hupeng Date: Thu, 21 Mar 2019 18:37:40 +0800 Subject: [PATCH 1/4] =?UTF-8?q?[=E5=A4=A7=E5=B1=8F][=E4=BF=AE=E5=A4=8D]:?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8B=BC=E5=86=99=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/service/impl/WxDeviceServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxDeviceServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxDeviceServiceImpl.java index 901570ab9..e1e57c510 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxDeviceServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxDeviceServiceImpl.java @@ -64,12 +64,12 @@ public class WxDeviceServiceImpl implements WxDeviceService { } if (type == EnumDeviceType.SCREEN.getCode()) { - Integer heartBeatIntervel = jConfig.getInteger("heartbeatInterval"); - Integer dataRefreshIntervel = jConfig.getInteger("dataRefreshInterval"); + Integer heartBeatInterval = jConfig.getInteger("heartbeatInterval"); + Integer dataRefreshInterval = jConfig.getInteger("dataRefreshInterval"); Integer pageChangeInterval = jConfig.getInteger("pageChangeInterval"); Integer animationTheme = jConfig.getInteger("animationTheme"); - if (heartBeatIntervel == null || - dataRefreshIntervel == null || + if (heartBeatInterval == null || + dataRefreshInterval == null || pageChangeInterval == null || animationTheme == null) { return false; From 40be60369356f5e7b792a50e4d581d58ce3d8a3f Mon Sep 17 00:00:00 2001 From: hupeng Date: Thu, 21 Mar 2019 20:10:20 +0800 Subject: [PATCH 2/4] =?UTF-8?q?[=E5=A4=A7=E5=B1=8F][=E4=BF=AE=E5=A4=8D]:?= =?UTF-8?q?=E7=94=9F=E6=88=90=E9=80=8F=E6=98=8E=E5=BA=95=E8=89=B2=E7=9A=84?= =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/service/impl/WxScreenAdServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxScreenAdServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxScreenAdServiceImpl.java index d6c61d953..7c513c58e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxScreenAdServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxScreenAdServiceImpl.java @@ -155,7 +155,7 @@ public class WxScreenAdServiceImpl implements WxScreenAdService { private static int QRCODE_WIDTH = 300; private static String QRCODE_PAGE_HOME = "pages/index/index"; private static boolean QRCODE_AUTO_COLOR = false; - private static boolean QRCODE_IS_HYALINE = false; + private static boolean QRCODE_IS_HYALINE = true; //private static int QRCODE_LINCOLOR =; private static String QRCODE_JUMP_CMD_HOME = "JH"; From c58ca1dedce01a4fd4d6b4f30d87cb24e72b55af Mon Sep 17 00:00:00 2001 From: hupeng Date: Thu, 21 Mar 2019 20:38:31 +0800 Subject: [PATCH 3/4] =?UTF-8?q?[=E5=A4=A7=E5=B1=8F][=E4=BF=AE=E5=A4=8D]:?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=94=9F=E6=88=90=E4=BA=8C=E7=BB=B4=E7=A0=81?= =?UTF-8?q?=E5=A4=A7=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/service/impl/WxScreenAdServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxScreenAdServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxScreenAdServiceImpl.java index 7c513c58e..dda1a7aa3 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxScreenAdServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxScreenAdServiceImpl.java @@ -152,7 +152,7 @@ public class WxScreenAdServiceImpl implements WxScreenAdService { } } - private static int QRCODE_WIDTH = 300; + private static int QRCODE_WIDTH = 280; private static String QRCODE_PAGE_HOME = "pages/index/index"; private static boolean QRCODE_AUTO_COLOR = false; private static boolean QRCODE_IS_HYALINE = true; From ca9c2867afb620057004b2c20a3672851f09afc9 Mon Sep 17 00:00:00 2001 From: luozukai Date: Fri, 22 Mar 2019 10:57:11 +0800 Subject: [PATCH 4/4] =?UTF-8?q?[=E8=90=A5=E9=94=80=E5=88=86=E6=9E=90][?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0][=E5=8D=A1=E8=90=A5=E9=94=80=E5=88=97?= =?UTF-8?q?=E8=A1=A8]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/service/impl/WxRentContractServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index dde99c724..544ccf628 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -256,7 +256,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { || !record.getLease().equals(dbRent.getLease()) || !record.getType().equals(dbRent.getType()) || !record.getPrice().equals(dbRent.getPrice()) - || !record.getAdjustRatio().equals(dbRent.getAdjustRatio()) + || !record.getAdjustRatio().replaceAll("\\s*","").equals(dbRent.getAdjustRatio().replaceAll("\\s*","")) ) { change = true; }