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"> 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; } 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());
