diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxEnergyReadingCalcuteResultMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxEnergyReadingCalcuteResultMapper.java index 9d7fbae7e..39de19c94 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxEnergyReadingCalcuteResultMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxEnergyReadingCalcuteResultMapper.java @@ -18,4 +18,6 @@ public interface WxEnergyReadingCalcuteResultMapper extends CommonMapper resultList); + void deleteByCondition(WxEnergyReadingCalcuteResult wxBillRent); + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java index a8b3da2ba..769e3712a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java @@ -1344,7 +1344,6 @@ public class WxEnergyServiceImpl implements WxEnergyService { public void createBill(WxEnergyReadingCalcute record, MallUserInfo user) { WxEnergyReadingCalcute calcute = wxEnergyReadingCalcuteMapper.selectById(record.getId(), record.getTenantId()); - WxEnergyReadingCalcuteResult crq = new WxEnergyReadingCalcuteResult(); crq.updateTenantInfo(record); crq.setCalcuteId(calcute.getId()); @@ -1400,11 +1399,18 @@ public class WxEnergyServiceImpl implements WxEnergyService { @Override public void setReadingCalcuteIsDel(WxEnergyReadingCalcute record) { -// WxEnergyReadingCalcute calcute = this.getReadingCalcuteById(record); -// if (null == calcute) { -// throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "记录未查询到"); -// } -// wxEnergyReadingCalcuteMapper.setIsDel(record.getId(), record.getTenantId(), record.getIsDel()); + WxEnergyReadingCalcute calcute = wxEnergyReadingCalcuteMapper.selectById(record.getId(), record.getTenantId()); + if (null == calcute) { + throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "记录未查询到"); + } + if (calcute.getIsCalcuted() == EnumYesOrNo.YES.getCode()) { + throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "已生成账单,不允许删除"); + } + WxEnergyReadingCalcuteResult crq = new WxEnergyReadingCalcuteResult(); + crq.updateTenantInfo(crq); + crq.setCalcuteId(record.getId()); + wxEnergyReadingCalcuteResultMapper.deleteByCondition(crq); + wxEnergyReadingCalcuteMapper.deleteById(record.getId()); } @Override diff --git a/mallinkService/src/main/resources/mapper/WxEnergyReadingCalcuteResultMapper.xml b/mallinkService/src/main/resources/mapper/WxEnergyReadingCalcuteResultMapper.xml index 000cf3cf0..c048ccfda 100644 --- a/mallinkService/src/main/resources/mapper/WxEnergyReadingCalcuteResultMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxEnergyReadingCalcuteResultMapper.xml @@ -90,5 +90,9 @@ + + delete from wx_energy_reading_calcute_result where `calcute_id` = #{calcuteId} + +