Browse Source

[电表][修复]:电表商户接口优化

release_toaliyun_real
hupeng 6 years ago
parent
commit
a8d5676246
4 changed files with 8 additions and 1 deletions
  1. +1
    -0
      mallinkService/src/main/java/com/iformall/domain/po/KwMerchantMeter.java
  2. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java
  3. +1
    -1
      mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml
  4. +3
    -0
      mallinkService/src/main/resources/mapper/KwMeterMapper.xml

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

@@ -50,6 +50,7 @@ public class KwMerchantMeter extends BaseEntity {
@io.swagger.annotations.ApiModelProperty(value = "修改时间", name = "updateTime")
private Date updateTime;


public static enum Field {
Id_ASC("`id` ASC"),
Id_DESC("`id` DESC"),


+ 3
- 0
mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java View File

@@ -77,6 +77,9 @@ public class KwMeter extends BaseEntity {
@io.swagger.annotations.ApiModelProperty(value = "状态0绑定1未绑定", name = "bindStatus")
private Integer bindStatus;

@Transient
private Integer merchantMeterStatus;

@Transient
protected KwMeterData latestRecord;



+ 1
- 1
mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml View File

@@ -78,7 +78,7 @@
<select id="findMeterList" parameterType="java.util.Map" resultMap="MeterBaseResultMap">
select m.* from kw_merchant_meter mm
left join kw_meter m on mm.`meter_id` = m.id
where mm.`status` = 0 and m.`bind_status` = 0
where mm.`status` = 0
<if test=" null != merchantId ">
and mm.`merchant_id` = #{merchantId}
</if>


+ 3
- 0
mallinkService/src/main/resources/mapper/KwMeterMapper.xml View File

@@ -80,6 +80,9 @@
select
<include refid="allColumns"/>
from kw_meter
<if test=" null != merchantMeterStatus ">
inner join kw_merchant_meter mm on mm.meter_id = id and mm.status = #{merchantMeterStatus}
</if>
<include refid="dynamicWhereConditions"/>
</select>



Loading…
Cancel
Save