diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java index 9a24f77df..ea76e4caa 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java @@ -581,13 +581,13 @@ public class EmisBaseService { // 增加 if("1".equals(emisSiteSettleRecord.getChangeType())){ - curMoney.add(emisSiteSettleRecord.getCurMoney()); - confirmMoney.add(emisSiteSettleRecord.getCurConfirmMoney()); + curMoney=curMoney.add(emisSiteSettleRecord.getCurMoney()); + confirmMoney=confirmMoney.add(emisSiteSettleRecord.getCurConfirmMoney()); } // 减少 else if("1".equals(emisSiteSettleRecord.getChangeType())){ - curMoney.subtract(emisSiteSettleRecord.getCurMoney()); - confirmMoney.subtract(emisSiteSettleRecord.getCurConfirmMoney()); + curMoney=curMoney.subtract(emisSiteSettleRecord.getCurMoney()); + confirmMoney=confirmMoney.subtract(emisSiteSettleRecord.getCurConfirmMoney()); } else{ throw new EmisBizError(EmisBizErrorType.FAIL, "费用增减类型错误!"); diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSitePrepaidRechargeService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSitePrepaidRechargeService.java index 5ae7f2727..bbde35269 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSitePrepaidRechargeService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSitePrepaidRechargeService.java @@ -79,6 +79,6 @@ public interface IEmisSitePrepaidRechargeService public int auditPass(EmisSitePrepaidRecharge emisSitePrepaidRecharge) throws EmisBizError; - public int auditNoPass(EmisSitePrepaidRecharge emisSitePrepaidRecharge); + public int auditNoPass(EmisSitePrepaidRecharge emisSitePrepaidRecharge) throws EmisBizError; } diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSitePrepaidRechargeServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSitePrepaidRechargeServiceImpl.java index 8f94fe72f..206ad2219 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSitePrepaidRechargeServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSitePrepaidRechargeServiceImpl.java @@ -15,6 +15,7 @@ import java.util.List; import com.xdadan.erp.emis.domain.EmisSite; import com.xdadan.erp.emis.domain.EmisSiteSettleRecord; +import com.xdadan.erp.emis.domain.enumtype.EmisBizErrorType; import com.xdadan.erp.emis.domain.exception.EmisBizError; import com.xdadan.erp.emis.service.EmisBaseService; import org.springframework.beans.factory.annotation.Autowired; @@ -129,6 +130,9 @@ public class EmisSitePrepaidRechargeServiceImpl extends EmisBaseService implemen // 重新从数据库取信息 emisSitePrepaidRecharge = emisSitePrepaidRechargeMapper.selectEmisSitePrepaidRechargeById(emisSitePrepaidRecharge.getId()); + if(!"0".equals(emisSitePrepaidRecharge.getAuditStatus()) ){ + throw new EmisBizError(EmisBizErrorType.FAIL,"已审核过,不允许再审核!"); + } // 增加结算账户额度,插入明细数据 EmisSiteSettleRecord emisSiteSettleRecord=new EmisSiteSettleRecord(); emisSiteSettleRecord.setAccCode(emisSitePrepaidRecharge.getRechargeSiteCode()+"001"); @@ -152,13 +156,31 @@ public class EmisSitePrepaidRechargeServiceImpl extends EmisBaseService implemen addSiteSettleRecord(emisSiteSettleRecord); + emisSitePrepaidRecharge.setAuditStatus("1"); + emisSitePrepaidRecharge.setAuditManCode(getCurrentUser().getEmpCode()); + emisSitePrepaidRecharge.setAuditSiteCode(getCurrentUser().getOwnerSiteCode()); + emisSitePrepaidRecharge.setAuditManName(getCurrentUser().getEmpName()); + emisSitePrepaidRecharge.setAuditSiteName(getCurrentUser().getOwnerSiteName()); + // 审核通过 return emisSitePrepaidRechargeMapper.auditPass(emisSitePrepaidRecharge); } @Override - public int auditNoPass(EmisSitePrepaidRecharge emisSitePrepaidRecharge){ + public int auditNoPass(EmisSitePrepaidRecharge emisSitePrepaidRecharge) throws EmisBizError { + emisSitePrepaidRecharge = emisSitePrepaidRechargeMapper.selectEmisSitePrepaidRechargeById(emisSitePrepaidRecharge.getId()); + + if(!"0".equals(emisSitePrepaidRecharge.getAuditStatus()) ){ + throw new EmisBizError(EmisBizErrorType.FAIL,"已审核过,不允许再审核!"); + } + + emisSitePrepaidRecharge.setAuditStatus("2"); + emisSitePrepaidRecharge.setAuditManCode(getCurrentUser().getEmpCode()); + emisSitePrepaidRecharge.setAuditSiteCode(getCurrentUser().getOwnerSiteCode()); + emisSitePrepaidRecharge.setAuditManName(getCurrentUser().getEmpName()); + emisSitePrepaidRecharge.setAuditSiteName(getCurrentUser().getOwnerSiteName()); + return emisSitePrepaidRechargeMapper.auditNoPass(emisSitePrepaidRecharge); } } diff --git a/emis-biz/src/main/resources/mapper/EmisSitePrepaidRechargeMapper.xml b/emis-biz/src/main/resources/mapper/EmisSitePrepaidRechargeMapper.xml index 78a73ba73..bcdc21fee 100644 --- a/emis-biz/src/main/resources/mapper/EmisSitePrepaidRechargeMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisSitePrepaidRechargeMapper.xml @@ -222,11 +222,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update emis_site_prepaid_recharge set audit_status='1',audit_date=now() where id = #{id} + update emis_site_prepaid_recharge + set audit_status='1',audit_date=now() , + audit_site_code = #{auditSiteCode}, + audit_man_code = #{auditManCode} + where id = #{id} - update emis_site_prepaid_recharge set audit_status='2',audit_desc = #{auditDesc},audit_date=now() where id = #{id} + update emis_site_prepaid_recharge + set audit_status='2',audit_desc = #{auditDesc},audit_date=now() , + audit_site_code = #{auditSiteCode}, + audit_man_code = #{auditManCode} + where id = #{id}