feat(mall): 新增商品标签筛选功能并优化支付相关代码- 在商品搜索接口中添加标签筛选参数

- 更新数据库查询以支持标签筛选
- 移除冗余的支付相关代码
- 更新拉卡拉SDK的调用方式

ruoyi-common/ruoyi-common-pay/src/main/java/com/lakala/zf/laop/java/sdk/demo/BaseCommonDemo.java

@@ -16,24 +16,24 @@ public class BaseCommonDemo {
     // 你的证书序列号
 	private static final String serialNo = "0195119ac8ac";
 
-    /*//商户私钥信息地址
+    //商户私钥信息地址
 	private static final String priKeyPath = "D:\\manage\\jcs\\OP10000499商户私钥.txt";
 
     //拉卡拉支付平台证书地址
 	private static final String lklCerPath = "D:\\manage\\jcs\\平台公钥生产.cer";
 
     //拉卡拉支付平台证书地址2(用于拉卡拉通知验签)
-	private static final String lklNotifyCerPath = "D:\\manage\\jcs\\平台公钥生产.cer";*/
+	private static final String lklNotifyCerPath = "D:\\manage\\jcs\\平台公钥生产.cer";
 
 
     //商户私钥信息地址
-    private static final String priKeyPath = "/home/manage/jcs/OP10000499商户私钥.txt";
+    /*private static final String priKeyPath = "/home/manage/jcs/OP10000499商户私钥.txt";
 
     //拉卡拉支付平台证书地址
     private static final String lklCerPath = "/home/manage/jcs/平台公钥生产.cer";
 
     //拉卡拉支付平台证书地址2(用于拉卡拉通知验签)
-    private static final String lklNotifyCerPath = "/home/manage/jcs/平台公钥生产.cer";
+    private static final String lklNotifyCerPath = "/home/manage/jcs/平台公钥生产.cer";*/
 
 	/**
 	 * 拉卡拉报文加密对称性密钥

ruoyi-common/ruoyi-common-pay/src/main/java/com/lakala/zf/laop/java/sdk/demo/utils/KlkConstant.java

@@ -40,22 +40,22 @@ public class KlkConstant {
     /**
      * bindAccount 分账关系绑定结果回调地址
      */
-    public static final String BIND_ACC_URL = "https://jcs-api.52o.site/api/mall/callback/applyBind";
+    public static final String BIND_ACC_URL = "https://jcsapi-new.52o.site/jcsapi/api/mall/callback/applyBind";
 
     /**
      * 提现结果回调地址
      */
-    public static final String WITHDRAWAL = "https://jcs-api.52o.site/api/mall/callback/withdrawal";
+    public static final String WITHDRAWAL = "https://jcsapi-new.52o.site/jcsapi/api/mall/callback/withdrawal";
 
     /**
      * 会员兑换码订单回调地址
      */
-    public static final String MEMBER_CODE_ORDER = "https://jcs-api.52o.site/api/mall/callback/codeOrder";
+    public static final String MEMBER_CODE_ORDER = "https://jcsapi-new.52o.site/jcsapi/api/mall/callback/codeOrder";
 
     /**
      * 材料订单回调地址
      */
-    public static final String MEMBER_ORDER = "https://jcs-api.52o.site/api/mall/callback/order";
+    public static final String MEMBER_ORDER = "https://jcsapi-new.52o.site/jcsapi/api/mall/callback/order";
 
     /**
      * 分账状态    处理中：PROCESSING, 已受理：ACCEPTED, 成功：SUCCESS, 失败：FAIL

ruoyi-common/ruoyi-common-pay/src/main/java/com/lakala/zf/laop/java/sdk/demo/utils/V3LakalaUserUtils.java

@@ -3,6 +3,7 @@ package com.lakala.zf.laop.java.sdk.demo.utils;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.lakala.zf.laop.java.sdk.demo.BaseCommonDemo;
+import com.lakala.zf.laop.java.sdk.demo.v3.V3LabsRelationRefundRequest;
 import com.lkl.laop.sdk.LKLSDK;
 import com.lkl.laop.sdk.request.*;
 import com.lkl.laop.sdk.utils.CommonUtil;
@@ -28,7 +29,9 @@ public class V3LakalaUserUtils extends BaseCommonDemo {
         cardBin.setOrderNo(CommonUtil.getOrderNo());
         cardBin.setOrgCode(KlkConstant.ORG_CODE);
         cardBin.setCardNo(acctNo);
+        System.out.println("cardBin:"+cardBin);
         String cardBinResponse = LKLSDK.httpPost(cardBin);
+        System.out.println(cardBinResponse);
         return JSON.parseObject(cardBinResponse);
     }
 
@@ -102,9 +105,9 @@ public class V3LakalaUserUtils extends BaseCommonDemo {
         return JSON.parseObject(response);
     }
 
-/*    *//**
-     * 退款
-     *//*
+    /**
+     * 提款模式查询
+     */
     public static JSONObject relationRefund(V3LabsRelationRefundRequest v3LabsRelationRefundRequest) throws Exception {
         // 1. 配置初始化
         doInit();
@@ -116,6 +119,6 @@ public class V3LakalaUserUtils extends BaseCommonDemo {
         //4. 响应
         System.out.println(response);
         return JSON.parseObject(response);
-    }*/
+    }
 
 }

ruoyi-common/ruoyi-common-pay/src/main/java/com/lakala/zf/laop/java/sdk/demo/v3/V3LabsRelationRefundRequest.java

@@ -0,0 +1,166 @@
+package com.lakala.zf.laop.java.sdk.demo.v3;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.lkl.laop.sdk.enums.FunctionCodeEnum;
+import com.lkl.laop.sdk.request.V3CommRequest;
+import com.lkl.laop.sdk.request.model.V3LabsTradeLocationInfo;
+
+/**
+ * @author nxj
+ * @date 2023/7/21 14:07
+ * @description v3退款交易
+ */
+public class V3LabsRelationRefundRequest extends V3CommRequest {
+
+    /**
+     * 商户号
+     * M
+     * 拉卡拉分配的商户号
+     */
+    @JsonProperty("merchant_no")
+    private String merchantNo;
+
+    /**
+     * 终端号
+     * M
+     * 拉卡拉分配的业务终端号
+     */
+    @JsonProperty("term_no")
+    private String termNo;
+
+    /**
+     * 商户交易流水号
+     * M
+     * 商户系统唯一
+     */
+    @JsonProperty("out_trade_no")
+    private String outTradeNo;
+
+    /**
+     * 退款金额
+     * M
+     * 单位分，整数数字型字符
+     */
+    @JsonProperty("refund_amount")
+    private String refundAmount;
+
+    /**
+     * 退款原因
+     * M
+     * 退款原因描述
+     */
+    @JsonProperty("refund_reason")
+    private String refundReason;
+
+    /**
+     * 原商户交易流水号
+     * C
+     * 下单时的商户请求流水号（退款时origin_out_trade_no，origin_trade_no，origin_log_no必送其一）
+     */
+    @JsonProperty("origin_out_trade_no")
+    private String originOutTradeNo;
+
+    /**
+     * 原拉卡拉交易流水号
+     * C
+     * 下单成功时，返回的拉卡拉交易流水。 origin_out_trade_no、origin_log_no、origin_trade_no至少一个必填
+     * （调用收银台下单接口拉起交易后发起退款时至少要传两个），同时存在时优先级顺序如下： origin_trade_no、origin_log_no、origin_out_trade_no。
+     */
+    @JsonProperty("origin_trade_no")
+    private String originTradeNo;
+
+    /**
+     * 原对账单流水号
+     * C
+     * 对账单中的交易流水。 origin_out_trade_no、origin_log_no、origin_trade_no至少一个必填
+     * （调用收银台下单接口拉起交易后发起退款时至少要传两个，同时存在时优先级顺序如下： origin_trade_no、origin_log_no、origin_out_trade_no。
+     */
+    @JsonProperty("origin_log_no")
+    private String originLogNo;
+
+    /**
+     * 地址位置信息
+     * M
+     * 地址位置信息，风控要求必送
+     */
+    @JsonProperty("location_info")
+    private V3LabsTradeLocationInfo locationInfo;
+
+    public String getMerchantNo() {
+        return merchantNo;
+    }
+
+    public void setMerchantNo(String merchantNo) {
+        this.merchantNo = merchantNo;
+    }
+
+    public String getTermNo() {
+        return termNo;
+    }
+
+    public void setTermNo(String termNo) {
+        this.termNo = termNo;
+    }
+
+    public String getOutTradeNo() {
+        return outTradeNo;
+    }
+
+    public void setOutTradeNo(String outTradeNo) {
+        this.outTradeNo = outTradeNo;
+    }
+
+    public String getRefundAmount() {
+        return refundAmount;
+    }
+
+    public void setRefundAmount(String refundAmount) {
+        this.refundAmount = refundAmount;
+    }
+
+    public String getRefundReason() {
+        return refundReason;
+    }
+
+    public void setRefundReason(String refundReason) {
+        this.refundReason = refundReason;
+    }
+
+    public String getOriginOutTradeNo() {
+        return originOutTradeNo;
+    }
+
+    public void setOriginOutTradeNo(String originOutTradeNo) {
+        this.originOutTradeNo = originOutTradeNo;
+    }
+
+    public String getOriginTradeNo() {
+        return originTradeNo;
+    }
+
+    public void setOriginTradeNo(String originTradeNo) {
+        this.originTradeNo = originTradeNo;
+    }
+
+    public String getOriginLogNo() {
+        return originLogNo;
+    }
+
+    public void setOriginLogNo(String originLogNo) {
+        this.originLogNo = originLogNo;
+    }
+
+    public V3LabsTradeLocationInfo getLocationInfo() {
+        return locationInfo;
+    }
+
+    public void setLocationInfo(V3LabsTradeLocationInfo locationInfo) {
+        this.locationInfo = locationInfo;
+    }
+
+    @Override
+    public FunctionCodeEnum getFunctionCode() {
+        return FunctionCodeEnum.API_V3_LABS_RELATION_REFUND;
+    }
+
+}