Browse Source

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

develop
release_toaliyun_real
gongbiao 6 years ago
parent
commit
c5b58841db
3 changed files with 7 additions and 4 deletions
  1. +4
    -1
      mallinkService/src/main/java/com/iformall/domain/dto/WxCUserBasicInfoDto.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/domain/po/KwBox.java
  3. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java

+ 4
- 1
mallinkService/src/main/java/com/iformall/domain/dto/WxCUserBasicInfoDto.java View File

@@ -1,6 +1,8 @@
package com.iformall.domain.dto;

import com.iformall.domain.po.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;

import java.io.Serializable;
import java.util.Date;
@@ -14,7 +16,8 @@ import javax.persistence.Transient;
*
*/
@Data
public class WxCUserBasicInfoDto implements Serializable{
@EqualsAndHashCode(callSuper = true)
public class WxCUserBasicInfoDto extends BaseEntity {

/**
*


+ 1
- 1
mallinkService/src/main/java/com/iformall/domain/po/KwBox.java View File

@@ -73,7 +73,7 @@ public class KwBox extends BaseEntity {
@io.swagger.annotations.ApiModelProperty(value = "最大目标数量", name = "maxTagNum")
private Integer maxTagNum;

@io.swagger.annotations.ApiModelProperty(value = "已连接电表数", name = "meterCount")
@Transient
private Integer meterCount;

@Transient


+ 2
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java View File

@@ -130,7 +130,7 @@ public class WxBillAllServiceImpl implements WxBillAllService {
@Override
public List<Map<String, Object>> listBillOweAndWaitPay(WxBillAll wxBillAll) {
//更新各账单状态
updateBillStatus(wxBillAll);
//updateBillStatus(wxBillAll);
ArrayList<Integer> statusList = new ArrayList<>();
statusList.add(EnumBillRentStatus.NOT_PAID.getCode());
statusList.add(EnumBillRentStatus.WAIT_PAY.getCode());
@@ -141,7 +141,7 @@ public class WxBillAllServiceImpl implements WxBillAllService {
@Override
public ResultData listBill(WxBillAll wxBillAll) {
//更新各账单状态
updateBillStatus(wxBillAll);
//updateBillStatus(wxBillAll);
//账单类型
if (wxBillAll.getBillTypeValue() != null) {
if (wxBillAll.getBillTypeValue().equals(EnumBillType.RENT.getCode())) {


Loading…
Cancel
Save