update

mec-biz/src/main/java/com/ym/mec/biz/service/impl/OrderPayOpsServiceImpl.java

@@ -17,6 +17,7 @@ import java.util.function.BiPredicate;
 import java.util.function.Consumer;
 import java.util.function.Function;
 
+import com.huifu.adapay.core.util.StringUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.redisson.api.RBucket;
 import org.redisson.api.RedissonClient;
@@ -118,10 +119,10 @@ public class OrderPayOpsServiceImpl implements OrderPayOpsService {
         signParams.put("orderNo", param.getOrderNo());
         signParams.put("notifyUrl", param.getNotifyUrl());
         signParams.put("returnUrl", param.getReturnUrl());
-        signParams.put("orderSubject", param.getOrderSubject());
-        signParams.put("orderBody", param.getOrderBody());
+        signParams.put("orderSubject", StringUtil.isEmpty(param.getOrderSubject())?"":param.getOrderSubject().replaceAll("\\+",""));
+        signParams.put("orderBody", StringUtil.isEmpty(param.getOrderBody())?"":param.getOrderBody().replaceAll("\\+",""));
         signParams.put("wxAppId", hfMerchantConfig.getWxAppId());
-        String originalStr = JSONObject.toJSONString(signParams).replaceAll("\\+","");
+        String originalStr = JSONObject.toJSONString(signParams);
         String newSign = DigestUtils.md5DigestAsHex(originalStr.getBytes());
         if (!newSign.equals(param.getSign())) {
             log.info("executePayment >>>>>> checkSing : {}", newSign);

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/adapay/Payment.java

@@ -6,6 +6,7 @@ import java.util.*;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.huifu.adapay.core.exception.BaseAdaPayException;
+import com.huifu.adapay.core.util.StringUtil;
 import com.huifu.adapay.model.PaymentReverse;
 import com.huifu.adapay.model.Refund;
 import com.ym.mec.thirdparty.adapay.entity.BaseResult;
@@ -132,11 +133,11 @@ public class Payment {
         paymentParams.put("orderNo", orderNo);
         paymentParams.put("notifyUrl", notifyUrl);
         paymentParams.put("returnUrl", returnUrl);
-        paymentParams.put("orderSubject", orderSubject);
-        paymentParams.put("orderBody", orderBody);
+        paymentParams.put("orderSubject", StringUtil.isEmpty(orderSubject)?"":orderSubject.replaceAll("\\+",""));
+        paymentParams.put("orderBody", StringUtil.isEmpty(orderBody)?"":orderBody.replaceAll("\\+",""));
         paymentParams.put("wxAppId", hfMerchantConfig.getWxAppId());
 
-        String originalStr = JSONObject.toJSONString(paymentParams).replaceAll("\\+","");
+        String originalStr = JSONObject.toJSONString(paymentParams);
         String sign = DigestUtils.md5DigestAsHex(originalStr.getBytes());
 
         paymentParams.put("sign", sign);