winter 1 год назад
Родитель
Сommit
e59c5b6673
5 измененных файлов: 6 добавлений и 3 удалений
  1. +2
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java
  2. +1
    -0
      mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java
  4. +1
    -1
      mallinkService/src/main/resources/mapper/WxAllBillMapper.xml
  5. +1
    -1
      mallinkService/src/main/resources/mapper/WxEnergyMeterReadingMapper.xml

+ 2
- 0
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;
}

+ 1
- 0
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) {


+ 1
- 1
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);
}
}



+ 1
- 1
mallinkService/src/main/resources/mapper/WxAllBillMapper.xml Просмотреть файл

@@ -75,7 +75,7 @@
<if test=" null != endtimeEqual">and `endtime` = #{endtimeEqual}</if>
<if test=" null != extraCreateFrom">and `extra_create_from` = #{extraCreateFrom}</if>
<if test=" null != noExtraCreateFrom">and `extra_create_from` is null</if>
<if test=" null != advanceHasMoney">and IFNULL(`pay`,'0') - IFNULL(`use_money`,'0') &gt; 0</if>
<if test=" null != advanceHasMoney">and bill_type = 9 and IFNULL(`pay`,'0') - IFNULL(`use_money`,'0') &gt; 0</if>
<if test=" null != month and '' != month">
and date_format(starttime,'%Y-%m') &lt;= #{month} and date_format(endtime,'%Y-%m') &gt;= #{month}
</if>


+ 1
- 1
mallinkService/src/main/resources/mapper/WxEnergyMeterReadingMapper.xml Просмотреть файл

@@ -90,7 +90,7 @@
</update>
<select id="findNumberSum" parameterType="com.iformall.domain.po.WxEnergyMeterReading" resultType="decimal">
select sum((CAST(ifnull(cur_number,'0') AS DECIMAL(20,4)) - CAST(ifnull(pre_number,'0') AS DECIMAL(20,4)))/CAST(ifnull(meter_rate,'1') AS DECIMAL(20,4))) total_number
select sum((CAST(ifnull(cur_number,'0') AS DECIMAL(20,4)) - CAST(ifnull(pre_number,'0') AS DECIMAL(20,4)))*CAST(ifnull(meter_rate,'1') AS DECIMAL(20,4))) total_number
from wx_energy_meter_reading
<include refid="dynamicWhereConditions"/>
</select>


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