From fc127750a0fb5433cc4bf12700ffe0482ce819c9 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 25 十月 2024 10:33:33 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml | 28 ++++++++++++++++++++++++----
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/wechatpay/PaymentCtrl.java | 14 +++++++-------
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/intake/qo/QoOpenClose.java | 5 +++++
3 files changed, 36 insertions(+), 11 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml
index 9d8fc5e..42a788f 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml
@@ -1270,7 +1270,12 @@
SELECT COUNT(*) AS recordCount
FROM rm_open_close_valve_history his
LEFT JOIN pr_intake inta ON inta.id = his.intake_id
- WHERE op_type = 1
+ <where>
+ AND op_type = 1
+ <if test = "clientId != null">
+ AND his.client_id = #{clientId}
+ </if>
+ </where>
</select>
<!--鑾峰彇鐗╃悊鍗″紑鍏抽榾璁板綍锛屽井淇″皬绋嬪簭浣跨敤-->
@@ -1286,7 +1291,12 @@
'鍒峰崱寮�闃�' AS openType
FROM rm_open_close_valve_history his
LEFT JOIN pr_intake inta ON inta.id = his.intake_id
- WHERE op_type = 1
+ <where>
+ AND op_type = 1
+ <if test = "clientId != null">
+ AND his.client_id = #{clientId}
+ </if>
+ </where>
ORDER BY open_dt DESC
<trim prefix="limit " >
<if test="start != null and count != null">
@@ -1300,7 +1310,12 @@
SELECT COUNT(*) AS recordCount
FROM rm_open_close_valve_history his
LEFT JOIN pr_intake inta ON inta.id = his.intake_id
- WHERE op_type = 8
+ <where>
+ AND op_type = 8
+ <if test = "clientId != null">
+ AND his.client_id = #{clientId}
+ </if>
+ </where>
</select>
<!--鑾峰彇铏氭嫙鍗″紑鍏抽榾璁板綍锛屽井淇″皬绋嬪簭浣跨敤-->
@@ -1320,7 +1335,12 @@
END AS openType
FROM rm_open_close_valve_history his
LEFT JOIN pr_intake inta ON inta.id = his.intake_id
- WHERE op_type = 8
+ <where>
+ AND op_type = 8
+ <if test = "clientId != null">
+ AND his.client_id = #{clientId}
+ </if>
+ </where>
ORDER BY open_dt DESC
<trim prefix="limit " >
<if test="start != null and count != null">
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/intake/qo/QoOpenClose.java b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/intake/qo/QoOpenClose.java
index 9755ea8..5531d5e 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/intake/qo/QoOpenClose.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/intake/qo/QoOpenClose.java
@@ -14,4 +14,9 @@
@EqualsAndHashCode(callSuper = false)
public class QoOpenClose extends QueryConditionVo {
+ /**
+ * 鍐滄埛缂栧彿
+ */
+ private Long clientId;
+
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/wechatpay/PaymentCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/wechatpay/PaymentCtrl.java
index a0132be..e31f197 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/wechatpay/PaymentCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/wechatpay/PaymentCtrl.java
@@ -66,9 +66,9 @@
private final RestTemplateUtil restTemplateUtil;
private final PayHelper payHelper;
private final VirtualCardSv virtualCardSv;
- private final String appid = com.dy.pipIrrWechat.wechatpay.PayInfo.appid;
- private final String secret = com.dy.pipIrrWechat.wechatpay.PayInfo.secret;
- private final String mchid = com.dy.pipIrrWechat.wechatpay.PayInfo.mchid;
+ //private final String appid = com.dy.pipIrrWechat.wechatpay.PayInfo.appid;
+ //private final String secret = com.dy.pipIrrWechat.wechatpay.PayInfo.secret;
+ //private final String mchid = com.dy.pipIrrWechat.wechatpay.PayInfo.mchid;
private final String schema = com.dy.pipIrrWechat.wechatpay.PayInfo.schema;
private final String signType = com.dy.pipIrrWechat.wechatpay.PayInfo.signType;
private final String description = com.dy.pipIrrWechat.wechatpay.PayInfo.description;
@@ -106,8 +106,8 @@
String jsCode = code2Session.getJs_code();
Map<String, Object> queryParams = new HashMap<>();
- queryParams.put("appid", appid);
- queryParams.put("secret", secret);
+ queryParams.put("appid", PayInfo.appid);
+ queryParams.put("secret", PayInfo.secret);
queryParams.put("js_code", jsCode);
queryParams.put("grant_type", grantType);
Map<String, String> headerParams = new HashMap<>();
@@ -258,8 +258,8 @@
}
JSONObject job_body = new JSONObject();
- job_body.put("appid", appid);
- job_body.put("mchid", mchid);
+ job_body.put("appid", PayInfo.appid);
+ job_body.put("mchid", PayInfo.mchid);
job_body.put("description", description);
job_body.put("out_trade_no", orderNumber);
job_body.put("attach", DataSourceContext.get());
--
Gitblit v1.8.0