diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java
index 5c59b0f59..b560b38f8 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java
@@ -492,4 +492,6 @@ public class WxMerchant extends TenantEntity {
public String searchKey;
@TableField(exist = false)
public String feesIdListStr;
+ @TableField(exist = false)
+ public Integer advanceHasMoney;
}
diff --git a/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java b/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java
index 7dd8595c2..0f5174aba 100644
--- a/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java
+++ b/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java
@@ -103,6 +103,7 @@ public class WxBillAllHelper {
bill.setIsPreview(wxMerchant.getIsPreview());
bill.setNeedPayNoDays(wxMerchant.getNeedPayNoDays());
bill.setEnergyFeesIds(wxMerchant.getEnergyFeesIdList());
+ bill.setAdvanceHasMoney(wxMerchant.getAdvanceHasMoney());
}
public WxBillSum getBillSum(WxMerchant wxMerchant,Date starttime, Date enttime) {
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java
index 53861603a..dbbc5cb5a 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java
@@ -536,7 +536,7 @@ public class WxMerchantServiceImpl implements WxMerchantService {
});
//处理商户非租赁账单
- wxBillAllHelper.stopMerchantOtherBills(wxMerchant, userInfo);
+ //wxBillAllHelper.stopMerchantOtherBills(wxMerchant, userInfo);
}
}
diff --git a/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml b/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml
index 10980a2dd..1e56049a4 100644
--- a/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml
@@ -75,7 +75,7 @@
and `endtime` = #{endtimeEqual}
and `extra_create_from` = #{extraCreateFrom}
and `extra_create_from` is null
- and IFNULL(`pay`,'0') - IFNULL(`use_money`,'0') > 0
+ and bill_type = 9 and IFNULL(`pay`,'0') - IFNULL(`use_money`,'0') > 0
and date_format(starttime,'%Y-%m') <= #{month} and date_format(endtime,'%Y-%m') >= #{month}
diff --git a/mallinkService/src/main/resources/mapper/WxEnergyMeterReadingMapper.xml b/mallinkService/src/main/resources/mapper/WxEnergyMeterReadingMapper.xml
index c15f754b9..7327eeaa3 100644
--- a/mallinkService/src/main/resources/mapper/WxEnergyMeterReadingMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxEnergyMeterReadingMapper.xml
@@ -90,7 +90,7 @@