| @@ -129,7 +129,6 @@ public class KwMeterController extends BaseController { | |||||
| KwMeter kwMeter = kwMeterService.getById(id); | KwMeter kwMeter = kwMeterService.getById(id); | ||||
| if (kwMeter == null) | if (kwMeter == null) | ||||
| return new ResultData(ErrorCode.DEVICE_NOT_FOUND); | return new ResultData(ErrorCode.DEVICE_NOT_FOUND); | ||||
| kwMeter.setLatestRecord(kwMeterDataService.findLastRecord(id)); | |||||
| return new ResultData(kwMeter); | return new ResultData(kwMeter); | ||||
| } | } | ||||
| @@ -93,7 +93,4 @@ public class KwMeter extends BaseEntity { | |||||
| @Transient | @Transient | ||||
| private Integer merchantMeterStatus; | private Integer merchantMeterStatus; | ||||
| @Transient | |||||
| protected KwMeterData latestRecord; | |||||
| } | } | ||||
| @@ -415,10 +415,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { | |||||
| if (wxMerchant.getId() == null) { | if (wxMerchant.getId() == null) { | ||||
| return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND); | return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND); | ||||
| } | } | ||||
| //检查商户名称 | |||||
| if (hasMerchant(wxMerchant)) { | |||||
| return new ResultData(ErrorCode.MERCHANT_NAME_IS_FOUND); | |||||
| } | |||||
| if(wxMerchant.getIsDel() != null && wxMerchant.getIsDel().equals(EnumDelStatus.DEL.getCode())) { | if(wxMerchant.getIsDel() != null && wxMerchant.getIsDel().equals(EnumDelStatus.DEL.getCode())) { | ||||
| // 停用商户 | // 停用商户 | ||||
| WxMerchant oldMerchant = wxMerchantMapper.selectByPrimaryKey(wxMerchant.getId()); | WxMerchant oldMerchant = wxMerchantMapper.selectByPrimaryKey(wxMerchant.getId()); | ||||
| @@ -427,6 +424,11 @@ public class WxMerchantServiceImpl implements WxMerchantService { | |||||
| logger.error("停车商户不能被删除"); | logger.error("停车商户不能被删除"); | ||||
| return new ResultData(ErrorCode.MERCHANT_CAR_NOT_DEL); | return new ResultData(ErrorCode.MERCHANT_CAR_NOT_DEL); | ||||
| } | } | ||||
| } else { | |||||
| //检查商户名称 | |||||
| if (hasMerchant(wxMerchant)) { | |||||
| return new ResultData(ErrorCode.MERCHANT_NAME_IS_FOUND); | |||||
| } | |||||
| } | } | ||||
| Date date = new Date(); | Date date = new Date(); | ||||
| wxMerchant.setUpdateDate(date); | wxMerchant.setUpdateDate(date); | ||||
| @@ -237,6 +237,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService | |||||
| bill.setPay(0L); | bill.setPay(0L); | ||||
| bill.setIsDel(EnumDelStatus.NOT_DEL.getCode()); | bill.setIsDel(EnumDelStatus.NOT_DEL.getCode()); | ||||
| bill.setShopId(record.getShopId()); | bill.setShopId(record.getShopId()); | ||||
| bill.setExpiredDay(0L); | |||||
| setExpiredDay(bill,Calendar.MONTH,record.getReceivePeriod()); | setExpiredDay(bill,Calendar.MONTH,record.getReceivePeriod()); | ||||
| if (bill.getReceivePay().equals(0L)) { | if (bill.getReceivePay().equals(0L)) { | ||||
| bill.setStatus(EnumBillRentStatus.PAID.getCode()); | bill.setStatus(EnumBillRentStatus.PAID.getCode()); | ||||
| @@ -765,10 +766,13 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService | |||||
| public void setExpiredDay(WxBillProperty wxBillProperty,int dayType, int receivePeriod){ | public void setExpiredDay(WxBillProperty wxBillProperty,int dayType, int receivePeriod){ | ||||
| Date date = new Date(); | Date date = new Date(); | ||||
| wxBillProperty.setExpiredDay(0L); | |||||
| if (wxBillProperty.getReceiveDate().before(date)) { | if (wxBillProperty.getReceiveDate().before(date)) { | ||||
| long day = (wxBillProperty.getReceiveDate().getTime() - date.getTime()) / (24 * 60 * 60 * 1000); | |||||
| long day = (date.getTime() - wxBillProperty.getReceiveDate().getTime()) / (24 * 60 * 60 * 1000); | |||||
| wxBillProperty.setStatus(EnumBillRentStatus.NOT_PAID.getCode()); | wxBillProperty.setStatus(EnumBillRentStatus.NOT_PAID.getCode()); | ||||
| wxBillProperty.setExpiredDay(day); | |||||
| if (day > 0) { | |||||
| wxBillProperty.setExpiredDay(day); | |||||
| } | |||||
| } else {//截止收租日在当前时间之后 | } else {//截止收租日在当前时间之后 | ||||
| Calendar now = Calendar.getInstance(); | Calendar now = Calendar.getInstance(); | ||||
| now.add(dayType, receivePeriod); | now.add(dayType, receivePeriod); | ||||
| @@ -776,10 +780,8 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService | |||||
| //当前日期加上周期后小于截止收租日就是没有到期,否则当前待缴 | //当前日期加上周期后小于截止收租日就是没有到期,否则当前待缴 | ||||
| if (currenttime.before(wxBillProperty.getReceiveDate())) { | if (currenttime.before(wxBillProperty.getReceiveDate())) { | ||||
| wxBillProperty.setStatus(EnumBillRentStatus.NOT_EXPIRED.getCode()); | wxBillProperty.setStatus(EnumBillRentStatus.NOT_EXPIRED.getCode()); | ||||
| wxBillProperty.setExpiredDay(0L); | |||||
| } else { | } else { | ||||
| wxBillProperty.setStatus(EnumBillRentStatus.WAIT_PAY.getCode()); | wxBillProperty.setStatus(EnumBillRentStatus.WAIT_PAY.getCode()); | ||||
| wxBillProperty.setExpiredDay(0L); | |||||
| } | } | ||||
| } | } | ||||
| } | } | ||||
| @@ -1162,10 +1162,13 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| public void setExpiredDay(WxBillRent wxBillRent,int dayType, int receivePeriod){ | public void setExpiredDay(WxBillRent wxBillRent,int dayType, int receivePeriod){ | ||||
| //截止收租日在当前时间之前 | //截止收租日在当前时间之前 | ||||
| Date date = new Date(); | Date date = new Date(); | ||||
| wxBillRent.setExpiredDay(0L); | |||||
| if (wxBillRent.getReceiveDate().before(date)) { | if (wxBillRent.getReceiveDate().before(date)) { | ||||
| long day = (wxBillRent.getReceiveDate().getTime() - date.getTime()) / (24 * 60 * 60 * 1000); | |||||
| long day = (date.getTime() - wxBillRent.getReceiveDate().getTime()) / (24 * 60 * 60 * 1000); | |||||
| wxBillRent.setStatus(EnumBillRentStatus.NOT_PAID.getCode()); | wxBillRent.setStatus(EnumBillRentStatus.NOT_PAID.getCode()); | ||||
| wxBillRent.setExpiredDay(day); | |||||
| if (day > 0) { | |||||
| wxBillRent.setExpiredDay(day); | |||||
| } | |||||
| } else {//截止收租日在当前时间之后 | } else {//截止收租日在当前时间之后 | ||||
| Calendar now = Calendar.getInstance(); | Calendar now = Calendar.getInstance(); | ||||
| now.add(dayType, receivePeriod); | now.add(dayType, receivePeriod); | ||||
| @@ -1173,10 +1176,8 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| //当前日期加上周期后小于截止收租日就是没有到期,否则当前待缴 | //当前日期加上周期后小于截止收租日就是没有到期,否则当前待缴 | ||||
| if (currenttime.before(wxBillRent.getReceiveDate())) { | if (currenttime.before(wxBillRent.getReceiveDate())) { | ||||
| wxBillRent.setStatus(EnumBillRentStatus.NOT_EXPIRED.getCode()); | wxBillRent.setStatus(EnumBillRentStatus.NOT_EXPIRED.getCode()); | ||||
| wxBillRent.setExpiredDay(0L); | |||||
| } else { | } else { | ||||
| wxBillRent.setStatus(EnumBillRentStatus.WAIT_PAY.getCode()); | wxBillRent.setStatus(EnumBillRentStatus.WAIT_PAY.getCode()); | ||||
| wxBillRent.setExpiredDay(0L); | |||||
| } | } | ||||
| } | } | ||||
| } | } | ||||
| @@ -55,32 +55,8 @@ | |||||
| <include refid="dynamicWhereConditions"/> | <include refid="dynamicWhereConditions"/> | ||||
| </select> | </select> | ||||
| <resultMap id="MeterBaseResultMap" type="com.iformall.domain.po.KwMeter"> | |||||
| <id column="id" jdbcType="BIGINT" property="id"/> | |||||
| <result column="tenant_id" jdbcType="VARCHAR" property="tenantId"/> | |||||
| <result column="address" jdbcType="BIGINT" property="address"/> | |||||
| <result column="brand" jdbcType="VARCHAR" property="brand"/> | |||||
| <result column="place" jdbcType="VARCHAR" property="place"/> | |||||
| <result column="model" jdbcType="VARCHAR" property="model"/> | |||||
| <result column="last_online_time" jdbcType="TIMESTAMP" property="lastOnlineTime"/> | |||||
| <result column="total_power" jdbcType="INTEGER" property="totalPower"/> | |||||
| <result column="online_status" jdbcType="INTEGER" property="onlineStatus"/> | |||||
| <result column="config" jdbcType="VARCHAR" property="config"/> | |||||
| <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/> | |||||
| <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/> | |||||
| <result column="box_id" jdbcType="BIGINT" property="boxId"/> | |||||
| <result column="status" jdbcType="INTEGER" property="status"/> | |||||
| <result column="bind_status" jdbcType="INTEGER" property="bindStatus"/> | |||||
| <association column="{meterId=id}" property="latestRecord" | |||||
| select="com.iformall.mapper.KwMeterDataMapper.findLastRecordList"> | |||||
| </association > | |||||
| </resultMap> | |||||
| <select id="findSimpleMeterList" parameterType="java.util.Map" resultType="com.iformall.domain.po.KwMeter"> | <select id="findSimpleMeterList" parameterType="java.util.Map" resultType="com.iformall.domain.po.KwMeter"> | ||||
| select m.`id`, m.`last_total_power` from kw_merchant_meter mm | |||||
| select m.`id`, m.`total_power` from kw_merchant_meter mm | |||||
| left join kw_meter m on mm.`meter_id` = m.id | left join kw_meter m on mm.`meter_id` = m.id | ||||
| where mm.`status` = 0 | where mm.`status` = 0 | ||||
| <if test=" null != merchantId "> | <if test=" null != merchantId "> | ||||
| @@ -156,7 +132,7 @@ | |||||
| </select> | </select> | ||||
| <select id="findMeterList" parameterType="java.util.Map" resultMap="MeterBaseResultMap"> | |||||
| <select id="findMeterList" parameterType="java.util.Map" resultType="com.iformall.domain.po.KwMeter"> | |||||
| select m.* from kw_merchant_meter mm | select m.* from kw_merchant_meter mm | ||||
| left join kw_meter m on mm.`meter_id` = m.id | left join kw_meter m on mm.`meter_id` = m.id | ||||
| where mm.`status` = 0 | where mm.`status` = 0 | ||||
| @@ -20,7 +20,7 @@ | |||||
| </resultMap> | </resultMap> | ||||
| <sql id="allColumns"> | <sql id="allColumns"> | ||||
| `id`,`tenant_id`,`address`,`brand`,`model`,`place`,`last_online_time`,`last_total_power`,`online_status`,`config`,`create_time`,`update_time`,`box_id`,`status`,`bind_status` | |||||
| `id`,`tenant_id`,`address`,`brand`,`model`,`place`,`last_online_time`,`total_power`,`online_status`,`config`,`create_time`,`update_time`,`box_id`,`status`,`bind_status` | |||||
| </sql> | </sql> | ||||
| <sql id="dynamicWhereConditions"> | <sql id="dynamicWhereConditions"> | ||||
| @@ -297,7 +297,7 @@ | |||||
| <include refid="allMerchantVoColumns"/> | <include refid="allMerchantVoColumns"/> | ||||
| FROM wx_merchant m | FROM wx_merchant m | ||||
| left join wx_business bu on bu.id = m.business_id | left join wx_business bu on bu.id = m.business_id | ||||
| where 1=1 | |||||
| where 1=1 and m.is_del=0 | |||||
| <if test=" null != merchantName and ''!=merchantName "> | <if test=" null != merchantName and ''!=merchantName "> | ||||
| and m.`name` like concat('%', #{merchantName},'%') | and m.`name` like concat('%', #{merchantName},'%') | ||||
| </if> | </if> | ||||