款项确认出纳驳回和确认接口开发

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接口 ---------------------*/
 

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;
 	}
 

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedVo.java

@@ -48,6 +48,8 @@ import lombok.Data;
 @Data
 public class FinSelectedReceivablesDetailedVo implements Vo {
 
+    @ApiModelProperty("已选应收款项sid")
+    private String sid; // 已选应收款项sid
 
 	@ApiModelProperty("创建人接口")
     private String createByName; // 创建人接口

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<FinCollectio
      * @return
      */
     AppFinCollectionConfirmationInitVo initCollectionConfirm(@Param("collectionBillSid") String collectionBillSid, @Param("useOrgSid") String useOrgSid);
+
+    @Update("update fin_collection_confirmation set auditState = 2 where sid = #{sid}")
+    void cashierReject(String sid);
+
+    @Update("update fin_collection_confirmation set auditState = 3 where sid = #{sid}")
+    void cashierConfirm(String sid);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java

@@ -88,8 +88,13 @@ public class FinCollectionConfirmationRest implements FinCollectionConfirmationF
     }
 
     @Override
-    public ResultBean cashierConfirm() {
-        return null;
+    public ResultBean cashierConfirm(String sid) {
+        return finCollectionConfirmationService.cashierConfirm(sid);
+    }
+
+    @Override
+    public ResultBean cashierReject(String sid) {
+        return finCollectionConfirmationService.cashierReject(sid);
     }
 
     /**

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -125,7 +125,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
             if (!s.contains("3")) {
                 record.setSubscriptionState(1);
             } else if (s.contains("3")) {
-                List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos1 = finSelectedReceivablesDetailedService.fetchByAuditState();
+                int auditState = 3;
+                List<FinSelectedReceivablesDetailedVo> 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<FinColl
         }
         return qw;
     }
+
+    public ResultBean cashierReject(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        baseMapper.cashierReject(sid);
+        int auditState = 1;
+        List<FinSelectedReceivablesDetailedVo> 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<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByAuditState(sid,auditState);
+        for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos) {
+            String sid1 = finSelectedReceivablesDetailedVo.getSid();
+            finSelectedReceivablesDetailedService.cashierConfirm(sid1);
+        }
+        return rb.success().setMsg("款项确认成功");
+    }
 }

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<FinSele
     IPage<AppFinSelectedReceivablesPaymentDetailsVo> getPaymentDetailsList(@Param("sidList") List<String> sidList, IPage<AppFinSelectedReceivablesPaymentDetailsQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppFinSelectedReceivablesPaymentDetailsVo> qw);
 
 
-    @Select("select * from fin_selected_receivables_detailed where auditState = #{auditState}")
-    List<FinSelectedReceivablesDetailedVo> fetchByAuditState(int auditState);
+    @Select("select * from fin_selected_receivables_detailed where collSid = #{sid} and auditState = #{auditState}")
+    List<FinSelectedReceivablesDetailedVo> 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);
 }

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<Fi
         return baseMapper.getPaymentDetailsList(sidList, page, qw);
     }
 
-    public List<FinSelectedReceivablesDetailedVo> fetchByAuditState() {
-        int auditState = 3;
-        return baseMapper.fetchByAuditState(auditState);
+    public List<FinSelectedReceivablesDetailedVo> fetchByAuditState(String sid,Integer auditState) {
+        return baseMapper.fetchByAuditState(sid,auditState);
+    }
+
+    public void cashierConfirm(String sid) {
+        baseMapper.cashierConfirm(sid);
     }
 }

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<FinU
 	List<FinUncollectedReceivablesDetailedVo> 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);
 }

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);
+	}
 }