| @@ -492,4 +492,6 @@ public class WxMerchant extends TenantEntity { | |||||
| public String searchKey; | public String searchKey; | ||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| public String feesIdListStr; | public String feesIdListStr; | ||||
| @TableField(exist = false) | |||||
| public Integer advanceHasMoney; | |||||
| } | } | ||||
| @@ -103,6 +103,7 @@ public class WxBillAllHelper { | |||||
| bill.setIsPreview(wxMerchant.getIsPreview()); | bill.setIsPreview(wxMerchant.getIsPreview()); | ||||
| bill.setNeedPayNoDays(wxMerchant.getNeedPayNoDays()); | bill.setNeedPayNoDays(wxMerchant.getNeedPayNoDays()); | ||||
| bill.setEnergyFeesIds(wxMerchant.getEnergyFeesIdList()); | bill.setEnergyFeesIds(wxMerchant.getEnergyFeesIdList()); | ||||
| bill.setAdvanceHasMoney(wxMerchant.getAdvanceHasMoney()); | |||||
| } | } | ||||
| public WxBillSum getBillSum(WxMerchant wxMerchant,Date starttime, Date enttime) { | public WxBillSum getBillSum(WxMerchant wxMerchant,Date starttime, Date enttime) { | ||||
| @@ -536,7 +536,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { | |||||
| }); | }); | ||||
| //处理商户非租赁账单 | //处理商户非租赁账单 | ||||
| wxBillAllHelper.stopMerchantOtherBills(wxMerchant, userInfo); | |||||
| //wxBillAllHelper.stopMerchantOtherBills(wxMerchant, userInfo); | |||||
| } | } | ||||
| } | } | ||||
| @@ -75,7 +75,7 @@ | |||||
| <if test=" null != endtimeEqual">and `endtime` = #{endtimeEqual}</if> | <if test=" null != endtimeEqual">and `endtime` = #{endtimeEqual}</if> | ||||
| <if test=" null != extraCreateFrom">and `extra_create_from` = #{extraCreateFrom}</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 != noExtraCreateFrom">and `extra_create_from` is null</if> | ||||
| <if test=" null != advanceHasMoney">and IFNULL(`pay`,'0') - IFNULL(`use_money`,'0') > 0</if> | |||||
| <if test=" null != advanceHasMoney">and bill_type = 9 and IFNULL(`pay`,'0') - IFNULL(`use_money`,'0') > 0</if> | |||||
| <if test=" null != month and '' != month"> | <if test=" null != month and '' != month"> | ||||
| and date_format(starttime,'%Y-%m') <= #{month} and date_format(endtime,'%Y-%m') >= #{month} | and date_format(starttime,'%Y-%m') <= #{month} and date_format(endtime,'%Y-%m') >= #{month} | ||||
| </if> | </if> | ||||
| @@ -90,7 +90,7 @@ | |||||
| </update> | </update> | ||||
| <select id="findNumberSum" parameterType="com.iformall.domain.po.WxEnergyMeterReading" resultType="decimal"> | <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 | from wx_energy_meter_reading | ||||
| <include refid="dynamicWhereConditions"/> | <include refid="dynamicWhereConditions"/> | ||||
| </select> | </select> | ||||