From b411d29d1b54670d06f3a0dadb090d12663a6592 Mon Sep 17 00:00:00 2001 From: hupeng Date: Thu, 11 Jul 2019 22:25:13 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[=E7=94=B5=E8=A1=A8][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E7=94=B5=E8=A1=A8=E7=BB=91=E5=AE=9A=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/device/KwBoxController.java | 2 -- .../device/KwMerchantMeterController.java | 3 ++- .../controller/device/KwMeterController.java | 19 +++++++++---------- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/device/KwBoxController.java b/mallinkAdmin/src/main/java/com/iformall/controller/device/KwBoxController.java index 8dc3ae5a1..129a46cf0 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/device/KwBoxController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/device/KwBoxController.java @@ -65,7 +65,6 @@ public class KwBoxController extends BaseController { return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); if (kwBox.getId() == null) return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); - kwBox.setTenantId(getTenantId()); return kwBoxService.saveOrUpdate(kwBox); } @@ -91,7 +90,6 @@ public class KwBoxController extends BaseController { return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); KwBox kwBox = new KwBox(); kwBox.setId(id); - kwBox.setTenantId(getTenantId()); kwBox.setStatus(EnumBoxStatus.INVALID.getCode()); return kwBoxService.saveOrUpdate(kwBox); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMerchantMeterController.java b/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMerchantMeterController.java index d4fea89bb..1f2e103ab 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMerchantMeterController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMerchantMeterController.java @@ -44,6 +44,8 @@ public class KwMerchantMeterController extends BaseController { @SystemControllerLog(description = "电表设备-设备列表") public Result list(@ModelAttribute KwMerchantMeter kwMerchantMeter, Integer pageNum, Integer pageSize) { if (kwMerchantMeter == null) kwMerchantMeter = new KwMerchantMeter(); + kwMerchantMeter.setTenantId(getTenantId()); + kwMerchantMeter.setStatus(EnumMerchantMeterStatus.VALID.getCode()); return new ResultData(kwMerchantMeterService.listAsPage(kwMerchantMeter, pageNum, pageSize)); } @@ -65,7 +67,6 @@ public class KwMerchantMeterController extends BaseController { if (kwMerchantMeterService.selectCount(record) > 0) return new ResultData(ErrorCode.DEVICE_HAS_BEEN_BOUND); - kwMerchantMeter.setTenantId(getTenantId()); kwMerchantMeter.setStatus(EnumMerchantMeterStatus.VALID.getCode()); kwMerchantMeterService.saveOrUpdate(kwMerchantMeter); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java b/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java index 12a1a50eb..a1289c551 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java @@ -62,6 +62,7 @@ public class KwMeterController extends BaseController { KwMeter record = new KwMeter(); record.setTenantId(getTenantId()); record.setAddress(kwMeter.getAddress()); + record.setStatus(EnumMeterStatus.VALID.getCode()); List KwMeters = kwMeterService.findList(record); if (KwMeters.size() > 0) return new ResultData(ErrorCode.DEVICE_ALREADY_EXIST); @@ -85,21 +86,22 @@ public class KwMeterController extends BaseController { return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); KwBox kwBox = kwBoxService.getById(kwMeter.getBoxId()); - if (kwBox == null) + if (kwBox == null || kwBox.getStatus().equals(EnumBoxStatus.INVALID.getCode())) return new ResultData(ErrorCode.DEVICE_NOT_FOUND); KwMeter record = new KwMeter(); record.setBoxId(kwMeter.getBoxId()); + record.setStatus(EnumMeterStatus.VALID.getCode()); List KwMeters = kwMeterService.findList(record); - if (KwMeters.size() > kwBox.getMaxTagNum()) + if (KwMeters.size() >= kwBox.getMaxTagNum()) return new ResultData(ErrorCode.DEVICE_REACHED_MAX_NUMBER); - record.setBoxId(kwMeter.getBoxId()); - record.setAddress(kwMeter.getAddress()); - KwMeters = kwMeterService.findList(record); - if (KwMeters.size() > 0) + record = kwMeterService.getById(kwMeter.getId()); + if (record == null) + return new ResultData(ErrorCode.DEVICE_NOT_FOUND); + if (record.getBoxId() != 0) return new ResultData(ErrorCode.DEVICE_ALREADY_EXIST); - kwMeter.setTenantId(getTenantId()); + kwMeter.setBindStatus(EnumMeterBindStatus.BIND.getCode()); return kwMeterService.saveOrUpdate(kwMeter); } @@ -123,7 +125,6 @@ public class KwMeterController extends BaseController { KwMeter record = kwMeterService.getById(kwMeter.getId()); if (record == null) return new ResultData(ErrorCode.DEVICE_NOT_FOUND); - kwMeter.setTenantId(getTenantId()); kwMeter.setBoxId(0L); kwMeter.setBindStatus(EnumMeterBindStatus.UNBIND.getCode()); return kwMeterService.saveOrUpdate(kwMeter); @@ -137,7 +138,6 @@ public class KwMeterController extends BaseController { return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); if (kwMeter.getId() == null) return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); - kwMeter.setTenantId(getTenantId()); return kwMeterService.saveOrUpdate(kwMeter); } @@ -162,7 +162,6 @@ public class KwMeterController extends BaseController { return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); KwMeter kwMeter = new KwMeter(); kwMeter.setId(id); - kwMeter.setTenantId(getTenantId()); kwMeter.setStatus(EnumBoxStatus.INVALID.getCode()); return kwMeterService.saveOrUpdate(kwMeter); } From 6b882b981b996a7511b56b136700902bc2c98d3a Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 11 Jul 2019 23:33:41 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[=E5=88=B8=E8=AE=A2=E5=8D=95][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9][=E5=AF=BC=E5=87=BA=E5=88=B8=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java index 75517e14f..bc6d5098f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java @@ -170,7 +170,7 @@ public class WxCouponOrderBVo extends WxCouponOrder{ @Transient private Long couponId; - @Excel(name = "券类型", width = 50, orderNum = "15", replace = {"满减券_1", "代金券_2", "团购券_3", "礼品券_4", "停车券_5", "通用券_6", "砍价券_8", "团购券_9", "积分券_50", "家积分停车券_51", "消费卡_100"}) + @Excel(name = "券类型", width = 50, orderNum = "15", replace = {"满减券_1", "代金券_2", "团购券_3", "礼品券_4", "停车券_5", "通用券_6", "砍价券_8", "团购券_9", "积分券_50", "积分停车券_51", "消费卡_100"}) @Transient private Integer couponType; From 05324132b230022c33f10bd5e81fc4e20858a7bc Mon Sep 17 00:00:00 2001 From: gongbiao Date: Fri, 12 Jul 2019 00:41:41 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[=E5=85=B6=E4=BB=96=E8=B4=A6=E5=8D=95][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E5=AF=BC=E5=85=A5=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=97=AE=E9=A2=98]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/controller/mem/ImportTemplateTask.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/ImportTemplateTask.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/ImportTemplateTask.java index 3e8f1d985..1052e6566 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/ImportTemplateTask.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/ImportTemplateTask.java @@ -136,7 +136,7 @@ public class ImportTemplateTask { if (billSuccessSize > 0) { try { - billSuccessList.parallelStream().forEach(bill -> { + billSuccessList.stream().forEach(bill -> { try { wxBillAllService.importBill(tenantId, importKey, bill, user); } catch (UnknownSessionException ue) {