winter 1 год назад
Родитель
Сommit
6ea19ac5e3
3 измененных файлов: 18 добавлений и 6 удалений
  1. +2
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxEnergyReadingCalcuteResultMapper.java
  2. +12
    -6
      mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java
  3. +4
    -0
      mallinkService/src/main/resources/mapper/WxEnergyReadingCalcuteResultMapper.xml

+ 2
- 0
mallinkService/src/main/java/com/iformall/mapper/WxEnergyReadingCalcuteResultMapper.java Просмотреть файл

@@ -18,4 +18,6 @@ public interface WxEnergyReadingCalcuteResultMapper extends CommonMapper<WxEnerg
void insertResults(@Param("tenantId")String tenantId, @Param("list")List<WxEnergyReadingCalcuteResult> resultList); void insertResults(@Param("tenantId")String tenantId, @Param("list")List<WxEnergyReadingCalcuteResult> resultList);
void deleteByCondition(WxEnergyReadingCalcuteResult wxBillRent);
} }

+ 12
- 6
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) { public void createBill(WxEnergyReadingCalcute record, MallUserInfo user) {
WxEnergyReadingCalcute calcute = wxEnergyReadingCalcuteMapper.selectById(record.getId(), record.getTenantId()); WxEnergyReadingCalcute calcute = wxEnergyReadingCalcuteMapper.selectById(record.getId(), record.getTenantId());
WxEnergyReadingCalcuteResult crq = new WxEnergyReadingCalcuteResult(); WxEnergyReadingCalcuteResult crq = new WxEnergyReadingCalcuteResult();
crq.updateTenantInfo(record); crq.updateTenantInfo(record);
crq.setCalcuteId(calcute.getId()); crq.setCalcuteId(calcute.getId());
@@ -1400,11 +1399,18 @@ public class WxEnergyServiceImpl implements WxEnergyService {


@Override @Override
public void setReadingCalcuteIsDel(WxEnergyReadingCalcute record) { 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 @Override


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

@@ -90,5 +90,9 @@
</foreach> </foreach>
</insert> </insert>
<delete id="deleteByCondition" parameterType="com.iformall.domain.po.WxEnergyReadingCalcuteResult">
delete from wx_energy_reading_calcute_result where `calcute_id` = #{calcuteId}
</delete>
</mapper> </mapper>



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