diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java index b2c10fc025..31f10fea22 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java @@ -72,7 +72,11 @@ public interface FinCollectionConfirmationFeign { @ApiOperation("出纳确认") @PostMapping("/cashierConfirm") - public ResultBean cashierConfirm(); + public ResultBean cashierConfirm(@RequestParam("sid") String sid); + + @ApiOperation("出纳驳回") + @PutMapping("/cashierReject") + public ResultBean cashierReject(@RequestParam("sid") String sid); /*---------------------App接口 ---------------------*/ diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java index 680218db38..ebb2deabd7 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java @@ -69,7 +69,12 @@ public class FinCollectionConfirmationFeignFallback implements FinCollectionConf } @Override - public ResultBean cashierConfirm() { + public ResultBean cashierConfirm(String sid) { + return null; + } + + @Override + public ResultBean cashierReject(String sid) { return null; } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedVo.java index 66bd9fb16a..d4a345bb6f 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedVo.java @@ -48,7 +48,9 @@ import lombok.Data; @Data public class FinSelectedReceivablesDetailedVo implements Vo { - + @ApiModelProperty("已选应收款项sid") + private String sid; // 已选应收款项sid + @ApiModelProperty("创建人接口") private String createByName; // 创建人接口 diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java index 3c8604ddee..f544a70b8e 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java @@ -31,9 +31,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.anrui.fin.api.fincollectionconfirmation.*; +import com.yxt.common.core.result.ResultBean; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.Update; import java.util.List; @@ -77,4 +79,10 @@ public interface FinCollectionConfirmationMapper extends BaseMapper finSelectedReceivablesDetailedVos1 = finSelectedReceivablesDetailedService.fetchByAuditState(); + int auditState = 3; + List finSelectedReceivablesDetailedVos1 = finSelectedReceivablesDetailedService.fetchByAuditState(sid,auditState); for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos1) { BigDecimal subscriptionMoney1 = new BigDecimal(finSelectedReceivablesDetailedVo.getSubscriptionMoney()); subscriptionMoney = subscriptionMoney.add(subscriptionMoney1); @@ -389,4 +390,40 @@ public class FinCollectionConfirmationService extends MybatisBaseService finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByAuditState(sid,auditState); + for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos) { + String vin = finSelectedReceivablesDetailedVo.getVIN(); + String receivablesName = finSelectedReceivablesDetailedVo.getReceivablesName(); + BigDecimal subscriptionMoney = new BigDecimal(finSelectedReceivablesDetailedVo.getSubscriptionMoney()); + FinUncollectedReceivablesDetailedVo finUncollectedReceivablesDetailedVo = finUncollectedReceivablesDetailedService.fetchByVinAndRecName(vin, receivablesName); + String sid1 = finUncollectedReceivablesDetailedVo.getSid(); + BigDecimal currentReceivableMoney = new BigDecimal(finUncollectedReceivablesDetailedVo.getCurrentReceivableMoney()); + String curRecMoney = String.valueOf(currentReceivableMoney.add(subscriptionMoney)); + finUncollectedReceivablesDetailedService.updateCurRecMoneyBySid(curRecMoney,sid1); + } + FinCollectionConfirmation finCollectionConfirmation = fetchBySid(sid); + BigDecimal collectionMoney = finCollectionConfirmation.getCollectionMoney(); + finCollectionConfirmation.setBalance(collectionMoney); + FinCollectionConfirmationDto finCollectionConfirmationDto = new FinCollectionConfirmationDto(); + BeanUtil.copyProperties(finCollectionConfirmation,finCollectionConfirmationDto); + updateBySid(finCollectionConfirmationDto,finCollectionConfirmationDto.getSid()); + return rb.success().setMsg("驳回成功"); + } + + public ResultBean cashierConfirm(String sid) { + ResultBean rb = ResultBean.fireFail(); + baseMapper.cashierConfirm(sid); + int auditState = 1; + List finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByAuditState(sid,auditState); + for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos) { + String sid1 = finSelectedReceivablesDetailedVo.getSid(); + finSelectedReceivablesDetailedService.cashierConfirm(sid1); + } + return rb.success().setMsg("款项确认成功"); + } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java index fc0535ca08..dad0dd1bec 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java @@ -34,10 +34,7 @@ import com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinSelectedReceivables import com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinSelectedReceivablesPaymentDetailsVo; import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed; import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo; -import org.apache.ibatis.annotations.Delete; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.*; import java.util.List; @@ -84,6 +81,9 @@ public interface FinSelectedReceivablesDetailedMapper extends BaseMapper getPaymentDetailsList(@Param("sidList") List sidList, IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - @Select("select * from fin_selected_receivables_detailed where auditState = #{auditState}") - List fetchByAuditState(int auditState); + @Select("select * from fin_selected_receivables_detailed where collSid = #{sid} and auditState = #{auditState}") + List fetchByAuditState(@Param("sid") String sid,@Param("auditState") Integer auditState); + + @Update("update fin_selected_receivables_detailed set auditState = 3 where sid = #{sid}") + void cashierConfirm(String sid); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java index abc9067042..0ed4f64904 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java @@ -182,8 +182,11 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService fetchByAuditState() { - int auditState = 3; - return baseMapper.fetchByAuditState(auditState); + public List fetchByAuditState(String sid,Integer auditState) { + return baseMapper.fetchByAuditState(sid,auditState); + } + + public void cashierConfirm(String sid) { + baseMapper.cashierConfirm(sid); } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java index 0f96557347..28620965ab 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java @@ -34,7 +34,9 @@ import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedRec import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.Update; +import java.math.BigDecimal; import java.util.List; /** @@ -64,4 +66,7 @@ public interface FinUncollectedReceivablesDetailedMapper extends BaseMapper selectListVo(); FinUncollectedReceivablesDetailedVo fetchByVinAndRecName(@Param("vin") String vin, @Param("receivablesName") String receivablesName); + + @Update("update fin_uncollected_receivables_detailed set currentReceivableMoney = #{curRecMoney} where sid = #{sid}") + void updateCurRecMoneyBySid(String curRecMoney, String sid); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java index b47fdcaab7..e4a36ffea0 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java @@ -36,6 +36,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; +import java.math.BigDecimal; import java.util.List; /** @@ -93,4 +94,8 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService public FinUncollectedReceivablesDetailedVo fetchByVinAndRecName(String vin, String receivablesName) { return baseMapper.fetchByVinAndRecName(vin,receivablesName); } + + public void updateCurRecMoneyBySid(String curRecMoney, String sid) { + baseMapper.updateCurRecMoneyBySid(curRecMoney,sid); + } } \ No newline at end of file