家访

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateEnum.java

@@ -15,6 +15,7 @@ public class BaseVehicleStateEnum {
          * 车辆业务阶段序号
          */
         DDBA("200", "订单备案"),
+        JF("300", "家访"),
         CKKP("400", "出库开票"),
         JC("500", "交车"),
         YWJS("600", "业务结束"),
@@ -35,6 +36,9 @@ public class BaseVehicleStateEnum {
         /**
          * 车辆阶段状态
          */
+        JFZB("301", "家访准备"),
+        JFKC("302", "家访考察"),
+        JFZLSH("303", "家访资料审核"),
         CKKP_STATE_1("401", "待出库"),
         CKKP_STATE_2("402", "出库中"),
         CKKP_STATE_3("403", "出库申请保存"),
@@ -84,6 +88,9 @@ public class BaseVehicleStateEnum {
         CKKP_DELETE("18", "出库申请修改"),
         QKKPTJ("19","欠款开票提交"),
         QKKPZZ("20","欠款开票终止"),
+        JFZB("21","家访准备"),
+        JFKC("22","家访考察"),
+        JFZLSH("23","家访资料审核"),
         ;
 
         private String typeKey;

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java

@@ -99,6 +99,13 @@ public class BaseVehicleStateService extends MybatisBaseService<BaseVehicleState
                     baseVehicleState.setCarryInvoiceState("1");
                 }else if(BaseVehicleStateEnum.OperateTypeEnum.QKKPZZ.getTypeKey().equals(operateType)){
                     baseVehicleState.setCarryInvoiceState("0");
+                }else if (BaseVehicleStateEnum.OperateTypeEnum.JFZB.getTypeKey().equals(operateType)){
+                    baseVehicleState.setBusNo(BaseVehicleStateEnum.BusNoEnum.JF.getBusNoKey());
+                    baseVehicleState.setBusState(BaseVehicleStateEnum.BusStateEnum.JFZB.getStateKey());
+                }else if (BaseVehicleStateEnum.OperateTypeEnum.JFKC.getTypeKey().equals(operateType)){
+                    baseVehicleState.setBusState(BaseVehicleStateEnum.BusStateEnum.JFKC.getStateKey());
+                }else if (BaseVehicleStateEnum.OperateTypeEnum.JFZLSH.getTypeKey().equals(operateType)){
+                    baseVehicleState.setBusState(BaseVehicleStateEnum.BusStateEnum.JFZLSH.getStateKey());
                 }
                 baseMapper.updateById(baseVehicleState);
             }else{

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerFeign.java

@@ -75,4 +75,9 @@ public interface BusSalesOrderBorrowerFeign {
     @GetMapping("/fetchDetailsBySid/{sid}")
     @ResponseBody
     public ResultBean<BusSalesOrderBorrowerDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+
+    @ApiOperation("修改家访状态")
+    @PostMapping("/updateBusNo")
+    @ResponseBody
+    ResultBean updateBusNo(@RequestParam("busNo") String busNo, @RequestParam("saleOrderBorrowerSid") String saleOrderBorrowerSid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerMapper.java

@@ -34,6 +34,7 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrower;
 import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerVo;
+import org.apache.ibatis.annotations.Update;
 
 import java.util.List;
 
@@ -62,4 +63,7 @@ public interface BusSalesOrderBorrowerMapper extends BaseMapper<BusSalesOrderBor
 	
 	@Select("select * from bus_sales_order_borrower")
 	List<BusSalesOrderBorrowerVo> selectListVo();
+
+	@Update("update bus_sales_order_borrower set busNo = #{busNo} where sid = #{saleOrderBorrowerSid}")
+    void updateBusNo(@Param("busNo") String busNo,@Param("saleOrderBorrowerSid") String saleOrderBorrowerSid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerRest.java

@@ -34,6 +34,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+
 import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrower;
 import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerQuery;
 import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerVo;
@@ -65,7 +66,7 @@ public class BusSalesOrderBorrowerRest implements BusSalesOrderBorrowerFeign {
     @Override
     @ApiOperation("根据条件分页查询数据的列表")
     @PostMapping("/listPage")
-	public ResultBean<PagerVo<BusSalesOrderBorrowerVo>> listPage(@RequestBody PagerQuery<BusSalesOrderBorrowerQuery> pq){
+    public ResultBean<PagerVo<BusSalesOrderBorrowerVo>> listPage(@RequestBody PagerQuery<BusSalesOrderBorrowerQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
         PagerVo<BusSalesOrderBorrowerVo> pv = busSalesOrderBorrowerService.listPageVo(pq);
         return rb.success().setData(pv);
@@ -74,7 +75,7 @@ public class BusSalesOrderBorrowerRest implements BusSalesOrderBorrowerFeign {
     @Override
     @ApiOperation("新增或修改")
     @PostMapping("/save")
-	public ResultBean save(@RequestBody BusSalesOrderBorrowerDto dto){
+    public ResultBean save(@RequestBody BusSalesOrderBorrowerDto dto) {
         ResultBean rb = ResultBean.fireFail();
         busSalesOrderBorrowerService.saveOrUpdateDto(dto);
         return rb.success();
@@ -83,7 +84,7 @@ public class BusSalesOrderBorrowerRest implements BusSalesOrderBorrowerFeign {
     @Override
     @ApiOperation("根据sid批量删除")
     @PostMapping("/delBySids")
-    public ResultBean delBySids(@RequestBody String[] sids){
+    public ResultBean delBySids(@RequestBody String[] sids) {
         ResultBean rb = ResultBean.fireFail();
         busSalesOrderBorrowerService.delBySids(sids);
         return rb.success();
@@ -92,9 +93,14 @@ public class BusSalesOrderBorrowerRest implements BusSalesOrderBorrowerFeign {
     @Override
     @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
-    public ResultBean<BusSalesOrderBorrowerDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+    public ResultBean<BusSalesOrderBorrowerDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
         ResultBean rb = ResultBean.fireFail();
         BusSalesOrderBorrowerDetailsVo vo = busSalesOrderBorrowerService.fetchDetailsVoBySid(sid);
         return rb.success().setData(vo);
     }
+
+    @Override
+    public ResultBean updateBusNo(String busNo, String saleOrderBorrowerSid) {
+        return busSalesOrderBorrowerService.updateBusNo(busNo, saleOrderBorrowerSid);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerService.java

@@ -76,7 +76,7 @@ public class BusSalesOrderBorrowerService extends MybatisBaseService<BusSalesOrd
         return p;
     }
 
-	public void saveOrUpdateDto(BusSalesOrderBorrowerDto dto){
+    public void saveOrUpdateDto(BusSalesOrderBorrowerDto dto) {
         String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
             this.insertByDto(dto);
@@ -85,13 +85,13 @@ public class BusSalesOrderBorrowerService extends MybatisBaseService<BusSalesOrd
         this.updateByDto(dto);
     }
 
-	public void insertByDto(BusSalesOrderBorrowerDto dto){
+    public void insertByDto(BusSalesOrderBorrowerDto dto) {
         BusSalesOrderBorrower entity = new BusSalesOrderBorrower();
         BeanUtil.copyProperties(dto, entity, "id", "sid");
         baseMapper.insert(entity);
     }
 
-	public void updateByDto(BusSalesOrderBorrowerDto dto){
+    public void updateByDto(BusSalesOrderBorrowerDto dto) {
         String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
             return;
@@ -101,10 +101,16 @@ public class BusSalesOrderBorrowerService extends MybatisBaseService<BusSalesOrd
         baseMapper.updateById(entity);
     }
 
-	public BusSalesOrderBorrowerDetailsVo fetchDetailsVoBySid(String sid){
+    public BusSalesOrderBorrowerDetailsVo fetchDetailsVoBySid(String sid) {
         BusSalesOrderBorrower entity = fetchBySid(sid);
         BusSalesOrderBorrowerDetailsVo vo = new BusSalesOrderBorrowerDetailsVo();
         BeanUtil.copyProperties(entity, vo);
         return vo;
     }
+
+    public ResultBean updateBusNo(String busNo, String saleOrderBorrowerSid) {
+        ResultBean rb = ResultBean.fireFail();
+        baseMapper.updateBusNo(busNo, saleOrderBorrowerSid);
+        return rb.success();
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java

@@ -28,8 +28,12 @@ package com.yxt.anrui.riskcenter.biz.loanhomevisitprep;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateDto;
+import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateEnum;
+import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateFeign;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
+import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerFeign;
 import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontractDto;
 import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontractFeign;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
@@ -37,7 +41,9 @@ import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeig
 import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrderFeign;
 import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigate;
 import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanCreditApplyVo;
+import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigate.LoanHomevisitInvestigateService;
 import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -54,6 +60,7 @@ import com.yxt.anrui.riskcenter.api.loanhomevisitprep.LoanHomevisitPrepFeign;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -75,17 +82,23 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
     @Autowired
     private SysUserFeign sysUserFeign;
     @Autowired
+    private BaseVehicleStateFeign baseVehicleStateFeign;
+    @Autowired
     private BusSalesOrderFeign busSalesOrderFeign;
     @Autowired
     private BusSalesOrderVehicleFeign busSalesOrderVehicleFeign;
     @Autowired
     private BusSalesOrderLoancontractFeign busSalesOrderLoancontractFeign;
+    @Autowired
+    private BusSalesOrderBorrowerFeign busSalesOrderBorrowerFeign;
+    @Autowired
+    private LoanHomevisitInvestigateService loanHomevisitInvestigateService;
 
     public PagerVo<LoanHomevisitPrepVo> listPageVo(PagerQuery<LoanHomevisitPrepQuery> pq) {
         LoanHomevisitPrepQuery query = pq.getParams();
         QueryWrapper<LoanHomevisitPrep> qw = new QueryWrapper<>();
         qw.eq("lp.state", query.getType());
-        if ("1".equals(query.getType())){
+        if ("1".equals(query.getType())) {
             qw.eq("bb.busNo", 301);
         }
         if (StringUtils.isNotBlank(query.getMenuUrl())) {
@@ -194,6 +207,24 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
     public ResultBean visit(String sid) {
         ResultBean rb = ResultBean.fireFail();
         baseMapper.visit(sid);
+        LoanHomevisitPrep loanHomevisitPrep = fetchBySid(sid);
+        //推送家访考察
+        LoanHomevisitInvestigate loanHomevisitInvestigate = new LoanHomevisitInvestigate();
+        loanHomevisitInvestigate.setSaleOrderSid(loanHomevisitPrep.getSaleOrderSid());
+        loanHomevisitInvestigate.setSaleOrderBorrowerSid(loanHomevisitPrep.getSaleOrderBorrowerSid());
+        loanHomevisitInvestigateService.save(loanHomevisitInvestigate);
+        //修改销售订单贷款人家访状态
+        busSalesOrderBorrowerFeign.updateBusNo("302",loanHomevisitPrep.getSaleOrderBorrowerSid());
+        //修改车辆状态表家访状态
+        List<BusSalesOrderVehicle> busSalesOrderVehicles = busSalesOrderVehicleFeign.selectListByOrderSid(loanHomevisitPrep.getSaleOrderSid()).getData();
+        List<BaseVehicleStateDto> baseVehicleStateDtoArrayList = new ArrayList<>();
+        for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) {
+            BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
+            baseVehicleStateDto.setBusSid(busSalesOrderVehicle.getSid());
+            baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.JFKC.getTypeKey());
+            baseVehicleStateDtoArrayList.add(baseVehicleStateDto);
+        }
+        baseVehicleStateFeign.saveOrUpdate(baseVehicleStateDtoArrayList);
         return rb.success();
     }
 
@@ -217,7 +248,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
                 busSalesOrderLoancontractDto.setVehCount(loanHomevisitPrepVo.getVehCount());
                 BusSalesOrder busSalesOrder = busSalesOrderFeign.fetchBySid(loanHomevisitPrepVo.getSaleOrderSid()).getData();
                 String num = String.format("%02d", i);
-                busSalesOrderLoancontractDto.setLoanCotractNo(busSalesOrder.getContractNo() + num);
+                busSalesOrderLoancontractDto.setLoanCotractNo(busSalesOrder.getContractNo() + "-" + num);
                 i = i + 1;
                 busSalesOrderLoancontractDto.setBankName(loanHomevisitPrepVo.getBankName());
                 busSalesOrderLoancontractDto.setPolicyName(loanHomevisitPrepVo.getPolicyName());

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java

@@ -518,7 +518,7 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
                     // 判断是否是调入 调出
                     if (internalPurchaseDetailsVo.getBuyerOrgSid().equals(vehicleDetailsVo.getFreightUndertakerSid())) {
                         // 是 获取运费
-                        if(StringUtils.isNotBlank(vehicleDetailsVo.getFreight())){
+                        if (StringUtils.isNotBlank(vehicleDetailsVo.getFreight())) {
                             baseVehicleDto.setFreight(Integer.valueOf(vehicleDetailsVo.getFreight()));
                         }
                     } else {
@@ -539,10 +539,10 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
                     }
                     baseVehicleDto.setVehMark(baseVehicle.getVehMark());
                     baseVehicleDto.setInsideCode(baseVehicle.getInsideCode());
-                    if (StringUtils.isBlank(vehicleDetailsVo.getWitPinMoney())){
+                    if (StringUtils.isNotBlank(vehicleDetailsVo.getWitPinMoney())) {
-                        baseVehicleDto.setCostPrice(0);
-                    }else {
                         baseVehicleDto.setCostPrice(Integer.valueOf(vehicleDetailsVo.getWitPinMoney()));
+                        baseVehicleDto.setSalePrice(Integer.valueOf(vehicleDetailsVo.getWitPinMoney()));
+                        baseVehicleDto.setContractPrice(Integer.valueOf(vehicleDetailsVo.getWitPinMoney()));
                     }
                     baseVehicleDto.setVinNo(scmVehicleEnterlibrary.getVinNo());
                     baseVehicleDto.setModelSid(scmVehicleEnterlibrary.getModelSid());//车型sid
@@ -565,8 +565,6 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
                     baseVehicleDto.setSpecialInstructions(scmVehicleEnterlibrary.getSpecialInstructions()); // 特殊差异说明 验车
                     baseVehicleDto.setManPurOrderTypeKey(scmVehicleEnterlibrary.getPurchaseTypeKey());
                     baseVehicleDto.setManPurOrderTypeValue(scmVehicleEnterlibrary.getPurchaseType());
-                    baseVehicleDto.setSalePrice(Integer.valueOf(vehicleDetailsVo.getWitPinMoney()));
-                    baseVehicleDto.setContractPrice(Integer.valueOf(vehicleDetailsVo.getWitPinMoney()));
                     //公司入库日期
                     baseVehicleDto.setOrgPriceDate(scmVehicleEnterlibrary.getInboundDate());
                     //根据车型sid查询品牌及名称及厂商sid