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); } 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) { 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;