优化

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationMapper.xml

@@ -96,6 +96,6 @@
             resultType="com.yxt.anrui.buscenter.api.busbillapplication.BusBillApplication">
         select ba.* from anrui_fin.fin_bill_application ba
         left join anrui_fin.fin_bill_vehicle bvv on ba.sid = bvv.billAppSid
-        where ba.contractNo = #{contractNo} and bvv.vehSid = #{vinSid} order by id desc limit 1
+        where ba.contractNo = #{contractNo} and bvv.vehSid = #{vinSid} and billStateKey = '003' order by id desc limit 1
     </select>
 </mapper>

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanHomevisitFileexamineFeign.java

@@ -77,4 +77,9 @@ public interface LoanHomevisitFileexamineFeign {
     @GetMapping("/fetchDetailsBySid/{sid}")
     @ResponseBody
     public ResultBean<LoanHomevisitFileexamineDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+
+    @ApiOperation("发送反馈给销售专员和销售外勤")
+    @GetMapping("/pushMessageToSale")
+    @ResponseBody
+    ResultBean pushMessageToSale(@RequestBody SaleOrderPushMessage saleOrderPushMessage);
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanHomevisitFileexamineFeignFallback.java

@@ -71,4 +71,9 @@ public class LoanHomevisitFileexamineFeignFallback implements LoanHomevisitFilee
 		ResultBean rb = ResultBean.fireFail();
 		return rb.setMsg("接口anrui-riskcenter/loanhomevisitfileexamine/fetchDetailsBySid无法访问");
 	}
+
+	@Override
+	public ResultBean pushMessageToSale(SaleOrderPushMessage saleOrderPushMessage) {
+		return null;
+	}
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/SaleOrderPushMessage.java

@@ -0,0 +1,18 @@
+package com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/10/24
+ **/
+@Data
+public class SaleOrderPushMessage {
+
+    private String homeVisitSid;
+    private String saleOrderSid;
+    @ApiModelProperty("问题描述")
+    private String problemRemarks;
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitfileexamine/LoanHomevisitFileexamineMapper.java

@@ -61,4 +61,6 @@ public interface LoanHomevisitFileexamineMapper extends BaseMapper<LoanHomevisit
 	
 	@Select("select * from loan_homevisit_fileexamine")
 	List<LoanHomevisitFileexamineVo> selectListVo();
+
+    String selectByOrderSid(String saleOrderSid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitfileexamine/LoanHomevisitFileexamineMapper.xml

@@ -38,4 +38,8 @@
             ${ew.sqlSegment}
         </where>
     </select>
+
+    <select id="selectByOrderSid" resultType="java.lang.String">
+        select createBySid from anrui_buscenter.bus_sales_order where sid = #{saleOrderSid}
+    </select>
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitfileexamine/LoanHomevisitFileexamineRest.java

@@ -25,6 +25,7 @@
  *********************************************************/
 package com.yxt.anrui.riskcenter.biz.loanhomevisitfileexamine;
 
+import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.*;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigateQuery;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigateVo;
 import com.yxt.common.core.query.PagerQuery;
@@ -36,12 +37,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
-import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamine;
-import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineQuery;
-import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineVo;
-import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineDetailsVo;
-import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineDto;
-import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineFeign;
 
 /**
  * Project: anrui-riskcenter(家访资料审核) <br/>
@@ -97,4 +92,9 @@ public class LoanHomevisitFileexamineRest implements LoanHomevisitFileexamineFei
 		LoanHomevisitFileexamineDetailsVo vo = loanHomevisitFileexamineService.fetchDetailsVoBySid(sid);
 		return rb.success().setData(vo);
 	}
+
+	@Override
+	public ResultBean pushMessageToSale(SaleOrderPushMessage saleOrderPushMessage) {
+		return loanHomevisitFileexamineService.pushMessageToSale(saleOrderPushMessage);
+	}
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitfileexamine/LoanHomevisitFileexamineService.java

@@ -28,6 +28,7 @@ package com.yxt.anrui.riskcenter.biz.loanhomevisitfileexamine;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerFeign;
 import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontract;
@@ -48,6 +49,8 @@ import com.yxt.anrui.riskcenter.biz.loancapitalcreditresult.LoanCapitalCreditRes
 import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigate.LoanHomevisitInvestigateService;
 import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileService;
 import com.yxt.common.base.config.component.FileUploadComponent;
+import com.yxt.messagecenter.api.message.MessageFeign;
+import com.yxt.messagecenter.api.message.PushMessageQuery;
 import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -55,11 +58,13 @@ import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 
+import org.apache.tomcat.util.threads.ThreadPoolExecutor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.*;
 
 /**
  * Project: anrui-riskcenter(家访资料审核) <br/>
@@ -91,6 +96,8 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService<LoanHome
     private BusSalesOrderLoancontractFeign busSalesOrderLoancontractFeign;
     @Autowired
     private BusSalesOrderBorrowerFeign busSalesOrderBorrowerFeign;
+    @Autowired
+    private MessageFeign messageFeign;
 
     public PagerVo<LoanHomevisitFileexamineVo> homeInforListPage(PagerQuery<LoanHomevisitFileexamineQuery> pq) {
         LoanHomevisitFileexamineQuery query = pq.getParams();
@@ -633,4 +640,35 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService<LoanHome
         vo.setCarProperty(carProperty);
         return vo;
     }
+
+    public ResultBean pushMessageToSale(SaleOrderPushMessage saleOrderPushMessage) {
+        ResultBean rb = ResultBean.fireFail();
+        String orderCreateBySid = baseMapper.selectByOrderSid(saleOrderPushMessage.getSaleOrderSid());
+        LoanHomevisitInvestigate loanHomevisitInvestigate = loanHomevisitInvestigateService.fetchBySid(saleOrderPushMessage.getHomeVisitSid());
+        List<String> receIveUserSidList = new ArrayList<>();
+        receIveUserSidList.add(orderCreateBySid);
+        receIveUserSidList.add(loanHomevisitInvestigate.getHomeVisUserSid());
+        //==================================添加线程
+        try {
+            ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
+                    .setNameFormat("demo-pool-%d").build();
+            ExecutorService pool = new ThreadPoolExecutor(1, 10,
+                    1000, TimeUnit.MILLISECONDS,
+                    new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
+            Future future1 = pool.submit(() -> {
+                PushMessageQuery pushMessageQuery = new PushMessageQuery();
+                pushMessageQuery.setReceivedSids(receIveUserSidList);
+                pushMessageQuery.setModuleName("风控");
+                pushMessageQuery.setMsgContent(saleOrderPushMessage.getProblemRemarks());
+                pushMessageQuery.setApp_type("2");
+                pushMessageQuery.setModuleSid("fec4e243-491a-11ec-94cd-fa163e0cb33c");
+                pushMessageQuery.setMsgTitle("问题反馈");
+                // 消息推送
+                messageFeign.pushNoUriMessage(pushMessageQuery);
+            });
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return rb.success();
+    }
 }