Merge branch 'feature-2022.07.29' of https://git.flowbb.cn/RK-Dev/fqgz-server into feature-2022.07.29

eladmin-system/src/main/java/me/zhengjie/application/admin/service/impl/AdminOrderServiceImpl.java

@@ -563,10 +563,7 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 	}
 
 	public OrderDetailDto getOrderDetail(String businessNo) {
-		ContractOrderEntity order = new ContractOrderEntity();
-		order.setBusinessNo(businessNo);
-		QueryWrapper<ContractOrderEntity> queryWrapper = QueryWrapperUtil.convertQuery(order);
-		order = contractOrderMapper.selectOne(queryWrapper);
+		ContractOrderEntity order = contractOrderRepository.getContractOrderWithBizNo(businessNo);
 		OrderDetailDto orderDetail = BeanCopyUtils.convertObj(order, OrderDetailDto.class);
 		if (OrderConstant.PROD_ID_CD.equals(order.getProdId())) {
 			CollateralInfoEntity collateralInfo = contractOrderRepository.getCollateralWithBizNo(businessNo);

eladmin-system/src/main/java/me/zhengjie/application/user/app/mq/WebSocketReceiver.java

@@ -87,6 +87,7 @@ public class WebSocketReceiver implements MessageListener {
 						obj.put("orderId", orderId);
 						obj.put("customerName", sysUser.getNickName());
 						obj.put("borrowerName", notaryOrder.getName());
+						obj.put("consultNo", notaryOrder.getConsultNo());
 						obj.put("bankName", notaryOrder.getBankName());
 						log.info("socket数据的推送给页面：" + notaryId);
 						AppSocketServer.sendInfo(webSocket, obj.toString(), userDto.getUsername());

eladmin-system/src/main/resources/config/application-prod.yml

@@ -175,12 +175,9 @@ tencent:
     secret: 34mhXRkury4DCFZpXCQ9E1fr7KUAPTiXTVac6H6e4pvxYMo5jl1m7sehQUqsmwsQ
     keyLicence: ZNjSJAs5nqb0OJR7SXGj8b8Jr8GZuhkIiLceBA1rp/UZ/X8nHbYzfNGkyhXLuTG82QzHIiNxixrzc7zWFcRyxiIIhglIxi0zZDD9nSQsXrHlMJMC3EUXarN9tp5QX0X2dS38gsi+F1TIigfHqxj39iX43wAO4KOfZekBIPNPA2Vb/AjlWnsTbOZCVwANXXwcKsCYiZJrbQlxGlxF9bfXEuhJgILJGQ2iT74wJ/Qn4qRraiyaYzi0Un44C24Y44pbYX4kEokvVQaPnClnAnMH98l8w0VIxPc2lH5io0ATpoPMoZGWKtICVPzrvpaMwjaPlyBzZ/qWwc5jeS+ySxwJyA==
   bank:
-    webankAppId: TIDAa18H
-    secret: vyzhltzExvtpU3O0wiSveww6DVxQ3EvV5RGdM5U8Jpp2BoL059ahJ4U76jMSvouT
-    keyLicence: Jpzb+BHO3aJ3FSjhsnXS43gHs20FSljKz0lthOlVhURvlePnisObmeO5EJjCXgZeZgo9KpJyADz4dcQREVAzuaxRPmhAx4ljpmZeVizNQWuxzLnDAGy8UgFzpAdCBemWrfTTt9f56JFRLdpmmMweyImHa4rDxLbdqqvXuiQLoaIvthbJLu3LO7mNscNkSn8xdhqqgIjX8DfroC99ykff8f7QTcK38iLjGQeI8sY79YY1a++Op5xpvfYZXm2Wdb6hI+rB+ndkWPNpPyP4f2m3/lkEvEMpoKOldQ7ebJQkTigDMvQ1pdBnYTrVVZKQgJ5nDSSVobYcxN2EZxeco9k/7A==
-  #ttlsig:
-  #  sdkappid: 1400696976
-  #  key: 6de92e8e066c2d28c5260f38a3abeb29840c9b2c6444d25f7b5c85de1c58b23b
+    webankAppId: IDAQVtYe
+    secret: pzFuoHgzUWHKw01XT0H7FIMDMf0a58JsTP31gE1hpP5T5uY1RfyAGftROvAiMery
+    keyLicence: CXBS6ZUHLqfjMWlJ8gK5qI9s/RCe+PTtWueoddT7VJol717t0cHdeKhRaocOw+bpzZUZmIcCCIJ/Vtjo0mSn20YalgSlhbw4y1sunC903hFewJfs1fd3EP3+5trx7gicdvUdCfXTbxRizh1wtTDN04W4pJx62g1sO98XyAWF5mWNTCECObvKiDJdNqcXJKl0Dht9jtc5JojGPFPXYBAuN0manuUxpSwl5wq1H/OOhZ9RrklAqFxie4Z5r4PhEbiBKE6FAgwCNcE4NKNbk7Tr1VgMnOn/R4IqYbKaNA2u7OYaGBmSKuBPG5hcRl72k6XMqTYZnP85CybfQ/fEthVkvA==
   ttlsig:
     sdkappid: 1400696976
     key: 6de92e8e066c2d28c5260f38a3abeb29840c9b2c6444d25f7b5c85de1c58b23b