From 8c4968ea3bd61c154c71d40f43a2cc22760fef49 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 25 十月 2023 18:29:54 +0800
Subject: [PATCH] zjh 2023/10/25--1
---
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TbTransitionServiceImpl.java | 5 ++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java | 12 ++++-
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java | 6 +-
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java | 9 ++++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITbTransitionService.java | 2 +
ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java | 13 +++++-
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 10 ++--
ltkj-hosp/src/main/resources/mapper/TjProjectMapper.xml | 2
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java | 4 +-
ltkj-admin/src/main/resources/application.yml | 8 ++--
10 files changed, 50 insertions(+), 21 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
index f92c423..f3b467c 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
@@ -1409,6 +1409,9 @@
* @return
*/
public static String hidePhoneNum(String phoneNum){
+ if(null==phoneNum){
+ return "";
+ }
if(phoneNum.contains("*")){
return phoneNum;
}
@@ -1435,6 +1438,9 @@
* @return
*/
public static String hideIdCardNum(String idCardNum){
+ if(null==idCardNum){
+ return "";
+ }
if(idCardNum.contains("*")){
return idCardNum;
}
@@ -1465,6 +1471,9 @@
* @return
*/
public static String hideCusName(String cusName){
+ if(null==cusName){
+ return "";
+ }
if(!cusName.contains("*")){
String realname=null;
char[] r = cusName.toCharArray();
@@ -1486,8 +1495,8 @@
//涓存椂琛ㄦ坊鍔犲崟椤�
public void saveRedisTransitionByProId(String cusId, List<Long> proIds) {
for (Long proId : proIds) {
- if (null != transitionService.getTbTransitionListByCusIdAndPacIdAndProId(cusId, String.valueOf(proId)) &&
- transitionService.getTbTransitionListByCusIdAndPacIdAndProId(cusId, String.valueOf(proId)).size() > 0) {
+ List<TbTransition> transitionList = transitionService.getTbTransitionListByCusIdAndPacIdAndProId(cusId, String.valueOf(proId));
+ if (null != transitionList && transitionList.size() > 0) {
continue;
}
transitionService.saveRedisTransitionByProId(cusId,proId);
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
index 4f1ebc2..bd6ff4f 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
@@ -539,7 +539,7 @@
if (null != tjProjectList && tjProjectList.size() > 0) {
for (TjProject project : tjProjectList) {
if (project.getProParentId() == 0) {
- // LambdaQueryWrapper<TbTransition> wqq1 = new LambdaQueryWrapper<>();
+ //LambdaQueryWrapper<TbTransition> wqq1 = new LambdaQueryWrapper<>();
// wqq1.eq(TbTransition::getCusId, customerService.getById(order.getUserId()).getCusIdcard());
// wqq1.eq(TbTransition::getParentProId, project.getProId());
// List<TbTransition> tbTransitionList = transitionService.list(wqq1);
@@ -558,8 +558,14 @@
project.setProPrice(decimal.setScale(2));
project.setProOrdPrice(decimal.multiply(new BigDecimal(s)).setScale(2));
}else {
- project.setProPrice(new BigDecimal("0.00"));
- project.setProOrdPrice(new BigDecimal("0.00"));
+ BigDecimal decimal1 = transitionService.getTbTransitionDxPriceAndOrdPrice(String.valueOf(order.getUserId()),project.getProId());
+ if(null !=decimal1){
+ project.setProPrice(decimal1.setScale(2));
+ project.setProOrdPrice(decimal1.multiply(new BigDecimal(s)).setScale(2));
+ }else {
+ project.setProPrice(new BigDecimal("0.00").setScale(2));
+ project.setProOrdPrice(new BigDecimal("0.00").setScale(2));
+ }
}
}
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
index 2dd1583..a6cf3b9 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -991,7 +991,7 @@
if (null != ppList && ppList.size() > 0) {
//寮傛淇濆瓨鏁版嵁搴�
// asyncService.addRedisTransitionPac(cusId, pacId, ppList);
- asyncService.saveRedisTransitionByPacId(cusId, pacId, proIds);
+ asyncService.saveRedisTransitionByPacId(cusId, pacId, null);
for (TjPackageProject tjPackageProject : ppList) {
TjProject project = projectService.getTjProjectById(String.valueOf(tjPackageProject.getProId()));
if (null != project) {
@@ -1030,9 +1030,7 @@
//鍗曢」
if (null != proIds && proIds.size() > 0) {
//寮傛淇濆瓨鏁版嵁搴撹〃
-// asyncService.addRedisTransitionPro(cusId, proIds);
asyncService.saveRedisTransitionByPacId(cusId, null, proIds);
-
for (Long proId : proIds) {
List<TbTransition> transitions = transitionService.getTbTransitionListByCusIdAndPacIdAndProId(cusId, String.valueOf(proId));
if (null != transitions && transitions.size() > 0) {
@@ -1059,8 +1057,10 @@
}
tbTransition.setParentProId(tjProject.getProParentId());
if (tjProject.getProParentId() != null) {
- final TjProject byId = projectService.getById(tjProject.getProParentId());
- tbTransition.setParentProName(byId.getProName());
+ TjProject byId = projectService.getById(tjProject.getProParentId());
+ if(null !=byId){
+ tbTransition.setParentProName(byId.getProName());
+ }
}
tbTransition.setParentProName("");
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
index 4f4c2c0..fca4429 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
@@ -547,21 +547,21 @@
// TODO: 2023/3/29 鏌ヨ闄勪欢pdf 濡傚績鐢靛浘銆侀檮浠�
LambdaQueryWrapper<TjReport> rtwq1 = new LambdaQueryWrapper<>();
rtwq1.eq(TjReport::getType, "鍖诲鍚嶈瘝");
- rtwq1.eq(TjReport::getTjNumber, tjNumber);
+// rtwq1.eq(TjReport::getTjNumber, tjNumber);
TjReport one11111 = tjReportService.getOne(rtwq1);
String report1 = one11111.getReport();
PDFBinaryUtil.base64StringToPDF(report1, FileUtil.mkdir(value).getPath() + "\\" + userId + "鍖诲鍚嶈瘝.pdf");
LambdaQueryWrapper<TjReport> rtwq = new LambdaQueryWrapper<>();
rtwq.eq(TjReport::getType, "蹇冪數鍥�");
- rtwq.eq(TjReport::getTjNumber, tjNumber);
+// rtwq.eq(TjReport::getTjNumber, tjNumber);
TjReport one1111 = tjReportService.getOne(rtwq);
String report = one1111.getReport();
PDFBinaryUtil.base64StringToPDF(report, FileUtil.mkdir(value).getPath() + "\\" + userId + "蹇冪數鍥�.pdf");
LambdaQueryWrapper<TjReport> rtwq12 = new LambdaQueryWrapper<>();
rtwq12.eq(TjReport::getType, "闄勪欢");
- rtwq12.eq(TjReport::getTjNumber, tjNumber);
+// rtwq12.eq(TjReport::getTjNumber, tjNumber);
TjReport one111112 = tjReportService.getOne(rtwq12);
String report12 = one111112.getReport();
PDFBinaryUtil.base64StringToPDF(report12, FileUtil.mkdir(value).getPath() + "\\" + userId + "闄勪欢.pdf");
diff --git a/ltkj-admin/src/main/resources/application.yml b/ltkj-admin/src/main/resources/application.yml
index f8c9c22..d22de27 100644
--- a/ltkj-admin/src/main/resources/application.yml
+++ b/ltkj-admin/src/main/resources/application.yml
@@ -73,8 +73,8 @@
# redis 閰嶇疆
redis:
# 鍦板潃
- host: 101.42.27.146
-# host: localhost
+# host: 101.42.27.146
+ host: localhost
# 绔彛锛岄粯璁や负6379
port: 6379
# 鏁版嵁搴撶储寮�
@@ -203,8 +203,8 @@
mch-key: Xianlutaikeji666888999shijihongL #瀵嗛挜
#key-path: E:\mycode\apppwd\1643225121_20230427_cert\apiclient_cert.p12 #鏈湴璇佷功璺緞锛屽湪寰俊鍟嗘埛鍚庡彴涓嬭浇
key-path: D:\WXCertUtil\tjcert\apiclient_cert.p12 #鏈嶅姟鍣ㄨ瘉涔﹁矾寰勶紝鍦ㄥ井淇″晢鎴峰悗鍙颁笅杞�
-# pay-score-notify-url: http://192.168.0.101:5011/cus/order/pay-notify #寰俊鏀粯鍥炶皟鍦板潃
- pay-score-notify-url: https://ltpeis.xaltjdkj.cn:5011/ltkj-admin/cus/order/pay-notify #寰俊鏀粯鍥炶皟鍦板潃
+ pay-score-notify-url: http://192.168.0.101:5011/cus/order/pay-notify #寰俊鏀粯鍥炶皟鍦板潃
+# pay-score-notify-url: https://ltpeis.xaltjdkj.cn:5011/ltkj-admin/cus/order/pay-notify #寰俊鏀粯鍥炶皟鍦板潃
#绉湪鎶ヨ〃璁块棶鍦板潃
jimu:
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java
index 3ea2c4c..4711fcf 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java
@@ -79,7 +79,7 @@
public boolean deletedTbTransitionListByCusIdAndPac(String cusId);
//鏍规嵁韬唤璇佸彿鍜屽椁恑d鏌ヨ鍜岄」鐩甶d
- @Select("SELECT * FROM tb_transition WHERE cus_id=#{cusId} AND pro_id =#{proId}")
+ @Select("SELECT * FROM tb_transition WHERE cus_id=#{cusId} AND ISNULL(pac_id) AND pro_id =#{proId}")
public List<TbTransition> getTbTransitionListByCusIdAndPacIdAndProId(@Param("cusId") String cusId,@Param("proId") String proId);
@Select("SELECT DISTINCT pac_id FROM tb_transition WHERE cus_id=#{cusId} AND !ISNULL(pac_id)")
@@ -191,4 +191,11 @@
"LEFT JOIN tj_package_project b\n" +
"\tON aa.pac_id=b.pac_id WHERE b.pro_id=#{proId} ")
BigDecimal getTbTransitionPriceAndOrdPrice(@Param("cusId")String cusId,@Param("proId")Long proId);
+
+
+ @Select("SELECT SUM(c.pro_price) FROM tj_project c WHERE c.pro_id IN " +
+ "(SELECT b.pro_id FROM tb_transition b WHERE" +
+ " b.cus_id=(SELECT a.cus_idcard FROM tj_customer a " +
+ "WHERE a.cus_id=#{cusId}) AND b.parent_pro_id=#{proId}) ")
+ BigDecimal getTbTransitionDxPriceAndOrdPrice(@Param("cusId")String cusId,@Param("proId")Long proId);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java
index 5d55e82..c596924 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java
@@ -118,11 +118,11 @@
" create_id,\n" +
" pro_type) \n" +
" \n" +
- " SELECT #{orderId},a.pro_id,IFNULL(b.pro_default,''),'0',SYSDATE(),#{userName},b.is_sampling,#{userId},IFNULL(a.pac_id,0) FROM tb_transition a LEFT JOIN tj_project b ON a.pro_id=b.pro_id WHERE a.cus_id=#{cusId} \n" +
+ " SELECT #{orderId},a.pro_id,IFNULL(b.pro_default,''),'0',SYSDATE(),#{userName},b.is_sampling,#{userId},IFNULL(a.pac_id,0) FROM tb_transition a LEFT JOIN tj_project b ON a.pro_id=b.pro_id WHERE a.cus_id=#{cusId} \n" +
"\t\t\n" +
"\tUNION\n" +
" \n" +
- "\tSELECT #{orderId},a.parent_pro_id,IFNULL(b.pro_default,''),'0',SYSDATE(),#{userName},b.is_sampling,#{userId},IFNULL(a.pac_id,0) FROM tb_transition a LEFT JOIN tj_project b ON a.parent_pro_id=b.pro_id WHERE a.cus_id=#{cusId}")
+ "\tSELECT #{orderId},a.parent_pro_id,IFNULL(b.pro_default,''),'0',SYSDATE(),#{userName},b.is_sampling,#{userId},IFNULL(a.pac_id,0) FROM tb_transition a LEFT JOIN tj_project b ON a.parent_pro_id=b.pro_id WHERE a.cus_id=#{cusId} GROUP BY a.parent_pro_id")
boolean saveTjOrderDetailsByCusId(@Param("cusId")String cusId,@Param("orderId")String orderId,@Param("userName")String userName,@Param("userId") String userId);
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITbTransitionService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITbTransitionService.java
index f749a1e..4faa75c 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITbTransitionService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITbTransitionService.java
@@ -101,4 +101,6 @@
boolean saveTemoTransitionByGroupingId(String cusId,String groupingId);
BigDecimal getTbTransitionPriceAndOrdPrice(String cusId,Long proId);
+
+ BigDecimal getTbTransitionDxPriceAndOrdPrice(String cusId,Long proId);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TbTransitionServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TbTransitionServiceImpl.java
index e640e4f..26bfd07 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TbTransitionServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TbTransitionServiceImpl.java
@@ -155,4 +155,9 @@
public BigDecimal getTbTransitionPriceAndOrdPrice(String cusId, Long proId) {
return tbTransitionMapper.getTbTransitionPriceAndOrdPrice(cusId,proId);
}
+
+ @Override
+ public BigDecimal getTbTransitionDxPriceAndOrdPrice(String cusId, Long proId) {
+ return tbTransitionMapper.getTbTransitionDxPriceAndOrdPrice(cusId,proId);
+ }
}
diff --git a/ltkj-hosp/src/main/resources/mapper/TjProjectMapper.xml b/ltkj-hosp/src/main/resources/mapper/TjProjectMapper.xml
index 8063ec1..1ae621b 100644
--- a/ltkj-hosp/src/main/resources/mapper/TjProjectMapper.xml
+++ b/ltkj-hosp/src/main/resources/mapper/TjProjectMapper.xml
@@ -77,7 +77,7 @@
<select id="selectTjProjectByProId" parameterType="Long" resultMap="TjProjectResult">
<include refid="selectTjProjectVo"/>
- where pro_id = #{proId} and deleted='0'
+ where pro_id = #{proId} and deleted=0
</select>
<insert id="insertTjProject" parameterType="TjProject" useGeneratedKeys="true" keyProperty="proId">
--
Gitblit v1.8.0