销售订单贷款人确定

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

@@ -80,4 +80,16 @@ public interface BusSalesOrderBorrowerFeign {
     @PostMapping("/updateBusNo")
     @ResponseBody
     ResultBean updateBusNo(@RequestParam("busNo") String busNo, @RequestParam("saleOrderBorrowerSid") String saleOrderBorrowerSid);
+
+    @ApiOperation("点击贷款人确认时弹出的数量")
+    @GetMapping("/getOrderNum")
+    @ResponseBody
+    ResultBean<OrderNumVo> getOrderNum(@RequestParam("sid") String sid);
+
+    @ApiOperation("确认数量")
+    @PostMapping("/confirmBorrow")
+    @ResponseBody
+    ResultBean confirmBorrow(@RequestBody OrderBorrowQuery query);
+
+
 }

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

@@ -74,4 +74,14 @@ public class BusSalesOrderBorrowerFeignFallback implements BusSalesOrderBorrower
 	public ResultBean updateBusNo(String busNo, String saleOrderBorrowerSid) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<OrderNumVo> getOrderNum(String sid) {
+		return null;
+	}
+
+	@Override
+	public ResultBean confirmBorrow(OrderBorrowQuery query) {
+		return null;
+	}
 }

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

@@ -0,0 +1,25 @@
+package com.yxt.anrui.buscenter.api.bussalesorderborrower;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/9/7
+ **/
+@Data
+public class OrderBorrowQuery implements Query {
+    private static final long serialVersionUID = -4207473035489477666L;
+    @ApiModelProperty("销售订单sid")
+    private String sid;
+    @ApiModelProperty("贷款人sid")
+    private String customSid;
+    @ApiModelProperty("贷款人名称")
+    private String borrowerName;
+    @ApiModelProperty("贷款人手机号")
+    private String mobile;
+    @ApiModelProperty("台数")
+    private int vehCount;
+}

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

@@ -0,0 +1,22 @@
+package com.yxt.anrui.buscenter.api.bussalesorderborrower;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/9/7
+ **/
+@Data
+public class OrderNumVo implements Vo {
+    private static final long serialVersionUID = 6808159039047017010L;
+
+    @ApiModelProperty("订单总台数")
+    private String orderAllNum;
+    @ApiModelProperty("订单剩余台数")
+    private String orderYuNum;
+
+    
+}

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

@@ -66,4 +66,6 @@ public interface BusSalesOrderBorrowerMapper extends BaseMapper<BusSalesOrderBor
 
 	@Update("update bus_sales_order_borrower set busNo = #{busNo} where sid = #{saleOrderBorrowerSid}")
     void updateBusNo(@Param("busNo") String busNo,@Param("saleOrderBorrowerSid") String saleOrderBorrowerSid);
+
+    int selectBySalesOrderSid(String sid);
 }

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

@@ -10,4 +10,8 @@
 	<select id="selectListAllVo" resultType="com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerVo">
 		SELECT * FROM bus_sales_order_borrower <where> ${ew.sqlSegment} </where>
 	</select>
+
+	<select id="selectBySalesOrderSid" resultType="int">
+		select ifnull(sum(vehCount),0) from bus_sales_order_borrower where salesOrderSid = #{sid}
+    </select>
 </mapper>

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

@@ -25,6 +25,7 @@
  *********************************************************/
 package com.yxt.anrui.buscenter.biz.bussalesorderborrower;
 
+import com.yxt.anrui.buscenter.api.bussalesorderborrower.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -35,13 +36,6 @@ 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;
-import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerDetailsVo;
-import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerDto;
-import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerFeign;
-
 /**
  * Project: anrui-buscenter(销售订单) <br/>
  * File: BusSalesOrderBorrowerFeignFallback.java <br/>
@@ -103,4 +97,14 @@ public class BusSalesOrderBorrowerRest implements BusSalesOrderBorrowerFeign {
     public ResultBean updateBusNo(String busNo, String saleOrderBorrowerSid) {
         return busSalesOrderBorrowerService.updateBusNo(busNo, saleOrderBorrowerSid);
     }
+
+    @Override
+    public ResultBean<OrderNumVo> getOrderNum(String sid) {
+        return busSalesOrderBorrowerService.getOrderNum(sid);
+    }
+
+    @Override
+    public ResultBean confirmBorrow(OrderBorrowQuery query) {
+        return busSalesOrderBorrowerService.confirmBorrow(query);
+    }
 }

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

@@ -28,19 +28,17 @@ package com.yxt.anrui.buscenter.biz.bussalesorderborrower;
 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.buscenter.api.bussalesorderborrower.*;
+import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice;
+import com.yxt.anrui.buscenter.biz.bussalesorderprice.BusSalesOrderPriceService;
 import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrower;
-import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerQuery;
-import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerVo;
-import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerDetailsVo;
-import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerDto;
-import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerFeign;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -60,6 +58,11 @@ import java.util.List;
  */
 @Service
 public class BusSalesOrderBorrowerService extends MybatisBaseService<BusSalesOrderBorrowerMapper, BusSalesOrderBorrower> {
+
+    @Autowired
+    private BusSalesOrderPriceService busSalesOrderPriceService;
+
+
     private QueryWrapper<BusSalesOrderBorrower> createQueryWrapper(BusSalesOrderBorrowerQuery query) {
         // todo: 这里根据具体业务调整查询条件
         // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
@@ -113,4 +116,25 @@ public class BusSalesOrderBorrowerService extends MybatisBaseService<BusSalesOrd
         baseMapper.updateBusNo(busNo, saleOrderBorrowerSid);
         return rb.success();
     }
+
+    public ResultBean<OrderNumVo> getOrderNum(String sid) {
+        ResultBean<OrderNumVo> rb = ResultBean.fireFail();
+        OrderNumVo orderNumVo = new OrderNumVo();
+        BusSalesOrderPrice busSalesOrderPrice = busSalesOrderPriceService.selectBySalesOrderSid(sid);
+        if (busSalesOrderPrice != null) {
+            orderNumVo.setOrderAllNum(busSalesOrderPrice.getQuantity().toString());
+        }
+        //查询已使用多少
+        int num = baseMapper.selectBySalesOrderSid(sid);
+        //剩余台数
+        int yuNum = busSalesOrderPrice.getQuantity() - num;
+        orderNumVo.setOrderYuNum(String.valueOf(yuNum));
+        return rb.success().setData(orderNumVo);
+    }
+
+    public ResultBean confirmBorrow(OrderBorrowQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+
+        return null;
+    }
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyFeign.java

@@ -95,4 +95,5 @@ public interface LoanPreloanCreditApplyFeign {
     @GetMapping("/judgeIsLoan")
     @ResponseBody
     ResultBean<LoanOrderPreloanVo> judgeIsLoan(@RequestParam("sid") String sid);
+
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanQuery.java

@@ -19,6 +19,9 @@ public class LoanPreloanQuery implements Query {
     private String idCard;
     @ApiModelProperty("手机号码")
     private String phone;
-    @ApiModelProperty("用户sid")
+    @ApiModelProperty("用户sid,即销售专员的用户sid")
     private String userSid;
+
+    @ApiModelProperty("移动端：姓名、身份证、手机号")
+    private String name;
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyMapper.java

@@ -60,7 +60,7 @@ public interface LoanPreloanCreditApplyMapper extends BaseMapper<LoanPreloanCred
     @Update("update loan_preloan_credit_apply set state = #{state} where sid = #{sid}")
     void updateStateBySid(@Param("sid") String sid, @Param("state") Integer state);
 
-    IPage<LoanPreloanVo> getOrderLoanPagerList(IPage<LoanPreloanCreditApply> page, @Param(Constants.WRAPPER)QueryWrapper<LoanPreloanCreditApply> qw);
+    IPage<LoanPreloanVo> getOrderLoanPagerList(IPage<LoanPreloanCreditApply> page, @Param(Constants.WRAPPER)QueryWrapper<LoanPreloanCreditApply> qw,@Param("name") String name);
 
     LoanPreloanCreditApply judgeIsLoan(String sid);
 

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyMapper.xml

@@ -22,7 +22,25 @@
     </select>
 
     <select id="getOrderLoanPagerList" resultType="com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanVo">
-
+        select la.custSid,la.custName,DATE_FORMAT(la.createTime, '%Y-%m-%d') as createTime,la.phone,la.gsfkjg,la.capitalName,
+        la.zffkjg,
+        la.capitalName,
+        lp.peoName
+        from loan_preloan_credit_apply la
+        left join loan_preloan_credit_peo lp on la.sid = lp.mainSid
+        <where>
+            ${ew.sqlSegment}
+            <if test="name != null and name != ''">
+                and concat(IFNULL(la.custName
+                , '')
+                , ifnull(la.`phone`
+                , ''),
+                , ifnull(la.`idCard`
+                , '')) LIKE concat('%'
+                , #{name}
+                , '%')
+            </if>
+        </where>
     </select>
 
     <select id="judgeIsLoan" resultType="com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanCreditApply">

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java

@@ -545,10 +545,25 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService<LoanPreloa
         LoanPreloanQuery query = pagerQuery.getParams();
         QueryWrapper<LoanPreloanCreditApply> qw = new QueryWrapper<>();
         if (query != null) {
-
+            //资方信用审核通过的
+            qw.eq("la.zffkjgKey", "001");
+            //该销售专员下的客户
+            qw.eq("la.createBySid", query.getUserSid());
+            //姓名
+            if (StringUtils.isNotBlank(query.getCustName())) {
+                qw.like("la.custName", query.getCustName());
+            }
+            //电话
+            if (StringUtils.isNotBlank(query.getPhone())) {
+                qw.like("la.phone", query.getPhone());
+            }
+            //身份证号
+            if (StringUtils.isNotBlank(query.getIdCard())) {
+                qw.like("la.idCard", query.getIdCard());
+            }
         }
         IPage<LoanPreloanCreditApply> page = PagerUtil.queryToPage(pagerQuery);
-        IPage<LoanPreloanVo> pagging = baseMapper.getOrderLoanPagerList(page, qw);
+        IPage<LoanPreloanVo> pagging = baseMapper.getOrderLoanPagerList(page, qw,query.getName());
         PagerVo<LoanPreloanVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }