Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/AppBusDepositBuscenterDetailVo.java

@@ -92,6 +92,9 @@ public class AppBusDepositBuscenterDetailVo implements Vo {
     @ApiModelProperty("开户银行")
     private String depositBank;
 
+    @ApiModelProperty("审核结果")
+    private String confirmDetail;
+
 
 
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositService.java

@@ -8,12 +8,12 @@ import com.yxt.anrui.buscenter.api.busdepositcustomer.AppBusDepositCustomerListV
 import com.yxt.anrui.buscenter.api.busmaindeposit.BusMainDeposit;
 import com.yxt.anrui.buscenter.biz.busdepositcustomer.BusDepositCustomerService;
 import com.yxt.anrui.buscenter.biz.busmaindeposit.BusMainDepositService;
+import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmation;
+import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationFeign;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
-import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
-import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.common.base.config.component.FileUploadComponent;
@@ -21,7 +21,6 @@ import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.result.ResultBean;
 import lombok.extern.slf4j.Slf4j;
-import org.bouncycastle.voms.VOMSAttribute;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -61,6 +60,8 @@ public class BusDepositService extends MybatisBaseService<BusDepositMapper, BusD
     private SysStaffOrgFeign sysStaffOrgFeign;
     @Autowired
     SysOrganizationFeign sysOrganizationFeign;
+    @Autowired
+    private FinCollectionConfirmationFeign finCollectionConfirmationFeign;
 
     /**
      * 根据billSid查询虚拟订单订金信息
@@ -200,6 +201,29 @@ public class BusDepositService extends MybatisBaseService<BusDepositMapper, BusD
             vo.setCustomerList(new ArrayList<>());
         }
         vo.setCustomerList(customerList);
+        //查询审核结果
+        //判断财务是否已审核
+        if ("已办结".equals(busMainDeposit.getNodeState())) {
+            //查询款项确认的busSid是否存在该申请的sid
+            ResultBean<FinCollectionConfirmation> finCollectionConfirmationResultBean = finCollectionConfirmationFeign.selectByBusSid(busMainDeposit.getSid());
+            //审核状态（1待审核/2已驳回/3已审核）
+            FinCollectionConfirmation finCollectionConfirmation = finCollectionConfirmationResultBean.getData();
+            if (finCollectionConfirmation != null) {
+                if(finCollectionConfirmation.getAuditState() != null){
+                    if(finCollectionConfirmation.getAuditState() ==1){
+                        vo.setConfirmDetail("待确认");
+                    }else if(finCollectionConfirmation.getAuditState() ==2){
+                        String confirmationDetails = finCollectionConfirmation.getConfirmName()+"于"+finCollectionConfirmation.getConfirmDate()+"已驳回，驳回原因是："+finCollectionConfirmation.getReason();
+                        vo.setConfirmDetail(confirmationDetails);
+                    }else{
+                        String confirmationDetails = finCollectionConfirmation.getConfirmName()+"于"+finCollectionConfirmation.getConfirmDate()+"已确认";
+                        vo.setConfirmDetail(confirmationDetails);
+                    }
+                }else{
+                    vo.setConfirmDetail("待确认");
+                }
+            }
+        }
         return vo;
     }
 

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java

@@ -844,14 +844,23 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
     public BusDeposit setBusDeposit(BusDeposit busDeposit, AppBusDepositBuscenterDto dto) {
         BeanUtils.copyProperties(dto, busDeposit, "sid");
         busDeposit.setDraweeName(dto.getPayName());
-        busDeposit.setProBankAccKey(dto.getCollectionNumberKey());
-        busDeposit.setProBankAccValue(dto.getCollectionNumber());
-        busDeposit.setProBankValue(dto.getCollectionBank());
-        busDeposit.setProBankKey(dto.getCollectionBankKey());
-        busDeposit.setPayBankAcc(dto.getPayNumber());
         busDeposit.setPaymentDate(dto.getPayDate());
         busDeposit.setVehicleNum(dto.getCarNumber());
         busDeposit.setDraweeMobile(dto.getMobile());
+        if("03".equals(dto.getPayTypeKey())){
+            busDeposit.setProBankAccKey(dto.getCollectionNumberKey());
+            busDeposit.setProBankAccValue(dto.getCollectionNumber());
+            busDeposit.setProBankValue(dto.getCollectionBank());
+            busDeposit.setProBankKey(dto.getCollectionBankKey());
+            busDeposit.setPayBankAcc(dto.getPayNumber());
+        }else{
+            busDeposit.setProBankAccKey("");
+            busDeposit.setProBankAccValue("");
+            busDeposit.setProBankValue("");
+            busDeposit.setProBankKey("");
+            busDeposit.setPayBankAcc("");
+            busDeposit.setCollectionAccountName("");
+        }
         return busDeposit;
     }
 

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -1480,7 +1480,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             //金融方案状态
             vo.setFinanceInfoState(0);
             //补充说明状态
-            if (StringUtils.isNotBlank(busSalesOrder.getNotes()) && StringUtils.isNotBlank(busSalesOrder.getImagesFile())) {
+            if (StringUtils.isNotBlank(busSalesOrder.getNotes()) || StringUtils.isNotBlank(busSalesOrder.getImagesFile())) {
                 vo.setRemarksStete(1);
                 vo.setRemarks(busSalesOrder.getNotes());
             } else {
@@ -2793,7 +2793,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         vo.setRemarksState(StringUtils.isNotBlank(busSalesOrder.getNotes()));
         String imagesFile = vo.getImagesFile();
         if (StringUtils.isNotBlank(imagesFile)) {
-            List<String> imagess = Arrays.asList(imagesFile);
+            List<String> imagess = Arrays.asList(imagesFile.split(","));
             imagess.removeAll(Collections.singleton(null));
             if (!imagess.isEmpty()) {
                 for (int i = 0; i < imagess.size(); i++) {

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmation.java

@@ -113,4 +113,10 @@ public class FinCollectionConfirmation extends BaseEntity {
 
     @ApiModelProperty("驳回原因")
     private String reason;
+    @ApiModelProperty("审核人")
+    private String confirmName;
+    @ApiModelProperty("审核人sid")
+    private String confirmNameSid;
+    @ApiModelProperty("审核")
+    private String confirmDate;
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java

@@ -78,7 +78,7 @@ public interface FinCollectionConfirmationFeign {
 
     @ApiOperation("出纳确认")
     @PostMapping("/cashierConfirm")
-    public ResultBean cashierConfirm(@RequestParam("sid") String sid);
+    public ResultBean cashierConfirm(@RequestParam("sid") String sid,@RequestParam("userSid")String userSid);
 
     @ApiOperation("出纳驳回")
     @PostMapping("/cashierReject")

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java

@@ -74,7 +74,7 @@ public class FinCollectionConfirmationFeignFallback implements FinCollectionConf
     }
 
     @Override
-    public ResultBean cashierConfirm(String sid) {
+    public ResultBean cashierConfirm(String sid,String userSid) {
         return null;
     }
 

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionRejectQuery.java

@@ -14,4 +14,6 @@ public class FinCollectionRejectQuery {
     private String sid;
     @ApiModelProperty("驳回原因")
     private String reason;
+    @ApiModelProperty("当前登录人用户sid")
+    private String userSid;
 }

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

@@ -94,8 +94,8 @@ public class FinCollectionConfirmationRest implements FinCollectionConfirmationF
     }
 
     @Override
-    public ResultBean cashierConfirm(String sid) {
-        return finCollectionConfirmationService.cashierConfirm(sid);
+    public ResultBean cashierConfirm(String sid,String userSid) {
+        return finCollectionConfirmationService.cashierConfirm(sid,userSid);
     }
 
     @Override

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

@@ -1245,6 +1245,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         ResultBean rb = ResultBean.fireFail();
         String sid = finCollectionRejectQuery.getSid();
         String reason = finCollectionRejectQuery.getReason();
+        String userSid = finCollectionRejectQuery.getUserSid();
         FinCollectionConfirmation confirmation = fetchBySid(sid);
         if (confirmation == null) {
             return rb.setMsg("该申请不存在");
@@ -1263,6 +1264,12 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         confirmation.setAuditState(2);
         //更新驳回原因
         confirmation.setReason(reason);
+        ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(userSid);
+        if(userVoResultBean.getData() != null){
+            confirmation.setConfirmName(userVoResultBean.getData().getName());
+        }
+        confirmation.setConfirmDate(DateUtil.today());
+        confirmation.setConfirmNameSid(userSid);
         baseMapper.updateById(confirmation);
         //删除临时表的数据
         ResultBean deleteResult = baseVehicleTempstateFeign.delByBusSid(sid);
@@ -1293,7 +1300,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         return rb.success().setMsg("驳回成功");
     }
 
-    public ResultBean cashierConfirm(String sid) {
+    public ResultBean cashierConfirm(String sid,String userSid) {
         ResultBean rb = ResultBean.fireFail();
         FinCollectionConfirmation confirmation = fetchBySid(sid);
         if (confirmation == null) {
@@ -1752,6 +1759,13 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         BigDecimal balanceBigDecimal = confirmation.getCollectionMoney().subtract(subscriptionMoneyAll);
         confirmation.setBalance(balanceBigDecimal);
         confirmation.setAuditState(3);
+        //查询当前登录人信息并更新审核人和审核时间
+        ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(userSid);
+        if(userVoResultBean.getData() != null){
+            confirmation.setConfirmName(userVoResultBean.getData().getName());
+        }
+        confirmation.setConfirmDate(DateUtil.today());
+        confirmation.setConfirmNameSid(userSid);
         baseMapper.updateById(confirmation);
         //删除临时表的数据
         ResultBean deleteResult = baseVehicleTempstateFeign.delByBusSid(sid);

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/deposit/DepositBuscenterDetailVo.java

@@ -86,4 +86,7 @@ public class DepositBuscenterDetailVo implements Vo {
     @ApiModelProperty("开户银行")
     private String depositBank;
 
+    @ApiModelProperty("财务审核结果")
+    private String confirmDetail;
+
 }