Просмотр исходного кода

Merge tag 'refs/tags/jenkins-back-end-2219' into release

develop
release_toaliyun_real
Stormeye Wu 6 лет назад
Родитель
Сommit
2983a00151
5 измененных файлов: 13 добавлений и 15 удалений
  1. +0
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/device/KwBoxController.java
  2. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/device/KwMerchantMeterController.java
  3. +9
    -10
      mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java
  4. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/mem/ImportTemplateTask.java
  5. +1
    -1
      mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java

+ 0
- 2
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); return new ResultData(ErrorCode.SYS_PARAMETER_ERROR);
if (kwBox.getId() == null) if (kwBox.getId() == null)
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); return new ResultData(ErrorCode.SYS_PARAMETER_ERROR);
kwBox.setTenantId(getTenantId());
return kwBoxService.saveOrUpdate(kwBox); return kwBoxService.saveOrUpdate(kwBox);
} }


@@ -91,7 +90,6 @@ public class KwBoxController extends BaseController {
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); return new ResultData(ErrorCode.SYS_PARAMETER_ERROR);
KwBox kwBox = new KwBox(); KwBox kwBox = new KwBox();
kwBox.setId(id); kwBox.setId(id);
kwBox.setTenantId(getTenantId());
kwBox.setStatus(EnumBoxStatus.INVALID.getCode()); kwBox.setStatus(EnumBoxStatus.INVALID.getCode());
return kwBoxService.saveOrUpdate(kwBox); return kwBoxService.saveOrUpdate(kwBox);
} }


+ 2
- 1
mallinkAdmin/src/main/java/com/iformall/controller/device/KwMerchantMeterController.java Просмотреть файл

@@ -44,6 +44,8 @@ public class KwMerchantMeterController extends BaseController {
@SystemControllerLog(description = "电表设备-设备列表") @SystemControllerLog(description = "电表设备-设备列表")
public Result list(@ModelAttribute KwMerchantMeter kwMerchantMeter, Integer pageNum, Integer pageSize) { public Result list(@ModelAttribute KwMerchantMeter kwMerchantMeter, Integer pageNum, Integer pageSize) {
if (kwMerchantMeter == null) kwMerchantMeter = new KwMerchantMeter(); if (kwMerchantMeter == null) kwMerchantMeter = new KwMerchantMeter();
kwMerchantMeter.setTenantId(getTenantId());
kwMerchantMeter.setStatus(EnumMerchantMeterStatus.VALID.getCode());
return new ResultData(kwMerchantMeterService.listAsPage(kwMerchantMeter, pageNum, pageSize)); return new ResultData(kwMerchantMeterService.listAsPage(kwMerchantMeter, pageNum, pageSize));
} }


@@ -65,7 +67,6 @@ public class KwMerchantMeterController extends BaseController {
if (kwMerchantMeterService.selectCount(record) > 0) if (kwMerchantMeterService.selectCount(record) > 0)
return new ResultData(ErrorCode.DEVICE_HAS_BEEN_BOUND); return new ResultData(ErrorCode.DEVICE_HAS_BEEN_BOUND);


kwMerchantMeter.setTenantId(getTenantId());
kwMerchantMeter.setStatus(EnumMerchantMeterStatus.VALID.getCode()); kwMerchantMeter.setStatus(EnumMerchantMeterStatus.VALID.getCode());
kwMerchantMeterService.saveOrUpdate(kwMerchantMeter); kwMerchantMeterService.saveOrUpdate(kwMerchantMeter);




+ 9
- 10
mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java Просмотреть файл

@@ -62,6 +62,7 @@ public class KwMeterController extends BaseController {
KwMeter record = new KwMeter(); KwMeter record = new KwMeter();
record.setTenantId(getTenantId()); record.setTenantId(getTenantId());
record.setAddress(kwMeter.getAddress()); record.setAddress(kwMeter.getAddress());
record.setStatus(EnumMeterStatus.VALID.getCode());
List<KwMeter> KwMeters = kwMeterService.findList(record); List<KwMeter> KwMeters = kwMeterService.findList(record);
if (KwMeters.size() > 0) if (KwMeters.size() > 0)
return new ResultData(ErrorCode.DEVICE_ALREADY_EXIST); return new ResultData(ErrorCode.DEVICE_ALREADY_EXIST);
@@ -85,21 +86,22 @@ public class KwMeterController extends BaseController {
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); return new ResultData(ErrorCode.SYS_PARAMETER_ERROR);


KwBox kwBox = kwBoxService.getById(kwMeter.getBoxId()); 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); return new ResultData(ErrorCode.DEVICE_NOT_FOUND);


KwMeter record = new KwMeter(); KwMeter record = new KwMeter();
record.setBoxId(kwMeter.getBoxId()); record.setBoxId(kwMeter.getBoxId());
record.setStatus(EnumMeterStatus.VALID.getCode());
List<KwMeter> KwMeters = kwMeterService.findList(record); List<KwMeter> KwMeters = kwMeterService.findList(record);
if (KwMeters.size() > kwBox.getMaxTagNum())
if (KwMeters.size() >= kwBox.getMaxTagNum())
return new ResultData(ErrorCode.DEVICE_REACHED_MAX_NUMBER); 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); return new ResultData(ErrorCode.DEVICE_ALREADY_EXIST);
kwMeter.setTenantId(getTenantId());
kwMeter.setBindStatus(EnumMeterBindStatus.BIND.getCode()); kwMeter.setBindStatus(EnumMeterBindStatus.BIND.getCode());
return kwMeterService.saveOrUpdate(kwMeter); return kwMeterService.saveOrUpdate(kwMeter);
} }
@@ -123,7 +125,6 @@ public class KwMeterController extends BaseController {
KwMeter record = kwMeterService.getById(kwMeter.getId()); KwMeter record = kwMeterService.getById(kwMeter.getId());
if (record == null) if (record == null)
return new ResultData(ErrorCode.DEVICE_NOT_FOUND); return new ResultData(ErrorCode.DEVICE_NOT_FOUND);
kwMeter.setTenantId(getTenantId());
kwMeter.setBoxId(0L); kwMeter.setBoxId(0L);
kwMeter.setBindStatus(EnumMeterBindStatus.UNBIND.getCode()); kwMeter.setBindStatus(EnumMeterBindStatus.UNBIND.getCode());
return kwMeterService.saveOrUpdate(kwMeter); return kwMeterService.saveOrUpdate(kwMeter);
@@ -137,7 +138,6 @@ public class KwMeterController extends BaseController {
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); return new ResultData(ErrorCode.SYS_PARAMETER_ERROR);
if (kwMeter.getId() == null) if (kwMeter.getId() == null)
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); return new ResultData(ErrorCode.SYS_PARAMETER_ERROR);
kwMeter.setTenantId(getTenantId());
return kwMeterService.saveOrUpdate(kwMeter); return kwMeterService.saveOrUpdate(kwMeter);
} }


@@ -162,7 +162,6 @@ public class KwMeterController extends BaseController {
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); return new ResultData(ErrorCode.SYS_PARAMETER_ERROR);
KwMeter kwMeter = new KwMeter(); KwMeter kwMeter = new KwMeter();
kwMeter.setId(id); kwMeter.setId(id);
kwMeter.setTenantId(getTenantId());
kwMeter.setStatus(EnumBoxStatus.INVALID.getCode()); kwMeter.setStatus(EnumBoxStatus.INVALID.getCode());
return kwMeterService.saveOrUpdate(kwMeter); return kwMeterService.saveOrUpdate(kwMeter);
} }


+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/mem/ImportTemplateTask.java Просмотреть файл

@@ -136,7 +136,7 @@ public class ImportTemplateTask {


if (billSuccessSize > 0) { if (billSuccessSize > 0) {
try { try {
billSuccessList.parallelStream().forEach(bill -> {
billSuccessList.stream().forEach(bill -> {
try { try {
wxBillAllService.importBill(tenantId, importKey, bill, user); wxBillAllService.importBill(tenantId, importKey, bill, user);
} catch (UnknownSessionException ue) { } catch (UnknownSessionException ue) {


+ 1
- 1
mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java Просмотреть файл

@@ -170,7 +170,7 @@ public class WxCouponOrderBVo extends WxCouponOrder{
@Transient @Transient
private Long couponId; 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 @Transient
private Integer couponType; private Integer couponType;




Загрузка…
Отмена
Сохранить