bug修复

ruoyi-admin/src/main/resources/application-dev.yml

@@ -201,14 +201,14 @@ wx:
     mchKey: #微信支付商户密钥
     subAppId: #服务商模式下的子商户公众账号ID
     subMchId: #服务商模式下的子商户号
-    keyPath: "D:/1703980824_20250417_cert/apiclient_cert.p12" # p12证书的位置，可以指定绝对路径，也可以指定类路径（以classpath:开头）
+    keyPath: "ruoyi-admin/src/main/resources/cert/apiclient_cert.p12" # p12证书的位置，可以指定绝对路径，也可以指定类路径（以classpath:开头）
     #keyPath: "E:/工作/所有项目/全民霸王猜/overlord-guess-admin/ruoyi-admin/src/main/resources/cert/apiclient_cert.p12" # p12证书的位置，可以指定绝对路径，也可以指定类路径（以classpath:开头）
     apiv3: 5Bc8eR7zQ1X9gK3lMp2vN6sD4hJ0fAqW #公司的：7f279a5423a15118e9cb1fc381631f61   客户的：5Bc8eR7zQ1X9gK3lMp2vN6sD4hJ0fAqW
     certSerialNo: 5C8AB18A9CC11514B1343E422C0C57D620B157DC #证书序列号公司的:5DDEE5F70C50743B6B3BFC92263696D2A68AC951,客户的：5C8AB18A9CC11514B1343E422C0C57D620B157DC
-    privateKeyPath: "D:/1703980824_20250417_cert/apiclient_key.pem"
+    privateKeyPath: "ruoyi-admin/src/main/resources/cert/apiclient_key.pem"
     #privateKeyPath: "E:/工作/所有项目/全民霸王猜/overlord-guess-admin/ruoyi-admin/src/main/resources/cert/apiclient_key.pem"
     publicKeyId: PUB_KEY_ID_0117039808242025041700351608000401   #公司的：PUB_KEY_ID_0116405774802025022100326400001700 客户的：PUB_KEY_ID_0117039808242025041700351608000401
-    publicKeyPath: "D:/1703980824_20250417_cert/pub_key.pem"
+    publicKeyPath: "ruoyi-admin/src/main/resources/cert/pub_key.pem"
     #publicKeyPath: "E:/工作/所有项目/全民霸王猜/overlord-guess-admin/ruoyi-admin/src/main/resources/cert/pub_key.pem"
     payNotifyUrl: "https://frp.songlanyun.com/api/pay/wx/notify"
     refundNotifyUrl: "https://frp.songlanyun.com/api/wx/refund/notify"

ruoyi-newwxpay/src/main/java/com/ruoyi/fubeiPay/service/FubeiPayService.java

@@ -83,43 +83,44 @@ public class FubeiPayService {
      * @return
      */
     public PayVo createPayOrder(PayBo bo) {
-        FubeiPayWay payWay = bo.getPayWay();
-        Map<String, Object> paramMap = new HashMap<>();
-        // 门店商户号
-        paramMap.put("mchNo", bo.getMchNo());
-        // 商户订单号
-        paramMap.put("mchOrderNo", bo.getMchOrderNo());
-        // 支付方式
-        paramMap.put("wayCode", payWay.getMsg());
-        // 支付金额,单位分
-        paramMap.put("amount", bo.getAmount());
-        // 货币代码
-        paramMap.put("currency", "cny");
-        // 商品标题
-        paramMap.put("subject", bo.getSubject());
-        // 商品描述
-        paramMap.put("body", bo.getBody());
-        // 分账模式（业务是走余额分账）
-        paramMap.put("divisionMode", 0);
-
-        JSONObject channelExtraJson = new JSONObject();
-        if (FubeiPayWay.W_WX_LITE.equals(payWay)) {
-            // 当前小程序用户的openId
-            channelExtraJson.put("openid", bo.getUserInfoId());
-            // 当前小程序的AppId传过去
-            channelExtraJson.put("subAppId", wxAppId);
-        } else if (FubeiPayWay.W_ALI_LITE.equals(payWay)) {
-            // 支付宝用户ID
-            channelExtraJson.put("buyerUserId", bo.getUserInfoId());
-        }
-        paramMap.put("channelExtra", channelExtraJson);
-
-        // 异步通知地址
-        paramMap.put("notifyUrl", payBackUrl);
-
-        JSONObject resultJson = this.createRequest("/api/pay/unifiedOrder", paramMap, bo.getStoreKey());
-        JSONObject dataJson = resultJson.getJSONObject("data");
-        return JSONObject.parseObject(dataJson.toJSONString(), PayVo.class);
+        return new PayVo();
+//        FubeiPayWay payWay = bo.getPayWay();
+//        Map<String, Object> paramMap = new HashMap<>();
+//        // 门店商户号
+//        paramMap.put("mchNo", bo.getMchNo());
+//        // 商户订单号
+//        paramMap.put("mchOrderNo", bo.getMchOrderNo());
+//        // 支付方式
+//        paramMap.put("wayCode", payWay.getMsg());
+//        // 支付金额,单位分
+//        paramMap.put("amount", bo.getAmount());
+//        // 货币代码
+//        paramMap.put("currency", "cny");
+//        // 商品标题
+//        paramMap.put("subject", bo.getSubject());
+//        // 商品描述
+//        paramMap.put("body", bo.getBody());
+//        // 分账模式（业务是走余额分账）
+//        paramMap.put("divisionMode", 0);
+//
+//        JSONObject channelExtraJson = new JSONObject();
+//        if (FubeiPayWay.W_WX_LITE.equals(payWay)) {
+//            // 当前小程序用户的openId
+//            channelExtraJson.put("openid", bo.getUserInfoId());
+//            // 当前小程序的AppId传过去
+//            channelExtraJson.put("subAppId", wxAppId);
+//        } else if (FubeiPayWay.W_ALI_LITE.equals(payWay)) {
+//            // 支付宝用户ID
+//            channelExtraJson.put("buyerUserId", bo.getUserInfoId());
+//        }
+//        paramMap.put("channelExtra", channelExtraJson);
+//
+//        // 异步通知地址
+//        paramMap.put("notifyUrl", payBackUrl);
+//
+//        JSONObject resultJson = this.createRequest("/api/pay/unifiedOrder", paramMap, bo.getStoreKey());
+//        JSONObject dataJson = resultJson.getJSONObject("data");
+//        return JSONObject.parseObject(dataJson.toJSONString(), PayVo.class);
     }
 
     /**
@@ -149,15 +150,15 @@ public class FubeiPayService {
      */
     public Boolean closePayOrder(PayBo bo) {
         try {
-            Map<String, Object> paramMap = new HashMap<>();
-            // 商户号
-            paramMap.put("mchNo", bo.getMchNo());
-            // 商户订单号
-            paramMap.put("mchOrderNo", bo.getMchOrderNo());
-            // 支付订单号
-            paramMap.put("payOrderId", bo.getPayOrderId());
-
-            this.createRequest("/api/pay/close", paramMap, bo.getStoreKey());
+//            Map<String, Object> paramMap = new HashMap<>();
+//            // 商户号
+//            paramMap.put("mchNo", bo.getMchNo());
+//            // 商户订单号
+//            paramMap.put("mchOrderNo", bo.getMchOrderNo());
+//            // 支付订单号
+//            paramMap.put("payOrderId", bo.getPayOrderId());
+//
+//            this.createRequest("/api/pay/close", paramMap, bo.getStoreKey());
         } catch (Exception e) {
             log.error(" --- 关闭订单异常 ---> {}", e.getMessage());
         }
@@ -171,28 +172,29 @@ public class FubeiPayService {
      * @return
      */
     public String createRefundOrder(PayBo bo) {
-        Map<String, Object> paramMap = new HashMap<>();
-        // 商户号
-        paramMap.put("mchNo", bo.getMchNo());
-        // 商户订单号
-        paramMap.put("mchOrderNo", bo.getMchOrderNo());
-        // 支付订单号
-        paramMap.put("payOrderId", bo.getPayOrderId());
-        // 商户退款订单号
-        paramMap.put("mchRefundNo", bo.getMchRefundNo());
-        // 退款金额,单位分
-        paramMap.put("refundAmount", bo.getAmount());
-        // 货币代码
-        paramMap.put("currency", "cny");
-        // 退款原因
-        paramMap.put("refundReason", bo.getRefundReason());
-        // 异步通知地址
-        paramMap.put("notifyUrl", refundBackUrl);
-
-        JSONObject resultJson = this.createRequest("/api/refund/refundOrder", paramMap, bo.getStoreKey());
-        JSONObject dataJson = resultJson.getJSONObject("data");
-        // 返回支付系统 退款订单号，业务需要
-        return dataJson.getString("refundOrderId");
+        return null;
+//        Map<String, Object> paramMap = new HashMap<>();
+//        // 商户号
+//        paramMap.put("mchNo", bo.getMchNo());
+//        // 商户订单号
+//        paramMap.put("mchOrderNo", bo.getMchOrderNo());
+//        // 支付订单号
+//        paramMap.put("payOrderId", bo.getPayOrderId());
+//        // 商户退款订单号
+//        paramMap.put("mchRefundNo", bo.getMchRefundNo());
+//        // 退款金额,单位分
+//        paramMap.put("refundAmount", bo.getAmount());
+//        // 货币代码
+//        paramMap.put("currency", "cny");
+//        // 退款原因
+//        paramMap.put("refundReason", bo.getRefundReason());
+//        // 异步通知地址
+//        paramMap.put("notifyUrl", refundBackUrl);
+//
+//        JSONObject resultJson = this.createRequest("/api/refund/refundOrder", paramMap, bo.getStoreKey());
+//        JSONObject dataJson = resultJson.getJSONObject("data");
+//        // 返回支付系统 退款订单号，业务需要
+//        return dataJson.getString("refundOrderId");
     }
 
     /**
@@ -246,34 +248,35 @@ public class FubeiPayService {
      * @return
      */
     public String createBalanceDivisionExec(PayBo bo) {
-        Map<String, Object> paramMap = new HashMap<>();
-        // 门店商户号
-        paramMap.put("mchNo", bo.getMchNo());
-        // 出款方渠道商户号
-        paramMap.put("lenderChannelMchNo", bo.getLenderChannelMchNo());
-        //收款方商户号
-        paramMap.put("payeeMchNo", mchNo);
-        //收款方渠道商户号
-        paramMap.put("payeeChannelMchNo", channelMchNo);
-        //支付渠道
-        paramMap.put("ifCode", FubeiIfCode.dgpay.getCode());
-        //分账原因
-        paramMap.put("independentAccountReason", FubeiIndependentReason.FEN_RU.getCode());
-        //费用承担方
-        paramMap.put("feeBearer", 0);
-        //交易订单号
-        paramMap.put("payOrderNo", bo.getPayOrderNo());
-        //分账金额 单位：分
-        paramMap.put("dividedAmount", bo.getAmount());
-        //是否延迟交易
-        paramMap.put("isDelay", 0);
-        //备注
-        paramMap.put("remark", bo.getRemark());
-
-        JSONObject resultJson = this.createRequest("/api/balance/division/exec", paramMap, bo.getStoreKey());
-        JSONObject dataJson = resultJson.getJSONObject("data");
-        // 返回渠道订单号
-        return dataJson.getString("channelOrderId");
+        return null;
+//        Map<String, Object> paramMap = new HashMap<>();
+//        // 门店商户号
+//        paramMap.put("mchNo", bo.getMchNo());
+//        // 出款方渠道商户号
+//        paramMap.put("lenderChannelMchNo", bo.getLenderChannelMchNo());
+//        //收款方商户号
+//        paramMap.put("payeeMchNo", mchNo);
+//        //收款方渠道商户号
+//        paramMap.put("payeeChannelMchNo", channelMchNo);
+//        //支付渠道
+//        paramMap.put("ifCode", FubeiIfCode.dgpay.getCode());
+//        //分账原因
+//        paramMap.put("independentAccountReason", FubeiIndependentReason.FEN_RU.getCode());
+//        //费用承担方
+//        paramMap.put("feeBearer", 0);
+//        //交易订单号
+//        paramMap.put("payOrderNo", bo.getPayOrderNo());
+//        //分账金额 单位：分
+//        paramMap.put("dividedAmount", bo.getAmount());
+//        //是否延迟交易
+//        paramMap.put("isDelay", 0);
+//        //备注
+//        paramMap.put("remark", bo.getRemark());
+//
+//        JSONObject resultJson = this.createRequest("/api/balance/division/exec", paramMap, bo.getStoreKey());
+//        JSONObject dataJson = resultJson.getJSONObject("data");
+//        // 返回渠道订单号
+//        return dataJson.getString("channelOrderId");
     }
 
 }

ruoyi-shop/src/main/java/com/ruoyi/shop/order/service/impl/ShopOrderPackageServiceImpl.java

@@ -758,7 +758,7 @@ public class ShopOrderPackageServiceImpl implements IShopOrderPackageService {
                 shopOrderPackage.loadPackageExpress().getLogisticCode(),
                 shopOrderAddressVo.getReceiverPhone(),
                 shopOrderPackage.loadPackageExpress().getExpressCode());
-            if (StringUtils.isNotBlank(content)) {
+            if (StringUtils.isNotBlank(content) && !content.equals("{}")) {
                 shopOrderPackageExpress.setLastQueryTime(new Date());
                 shopOrderPackageExpress.setQueryResult(content);
                 shopOrderPackageExpressMapper.updateById(shopOrderPackageExpress);