Merge remote-tracking branch 'origin/v7.6_small_version_fix_20231204' into test

performance-web/src/main/java/com/clx/performance/service/impl/PaymentServiceImpl.java

@@ -2,7 +2,6 @@ package com.clx.performance.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.TypeReference;
-import com.clx.performance.config.MslAppConfig;
 import com.clx.performance.config.MslPaymentConfig;
 import com.clx.performance.constant.ActionConstants;
 import com.clx.performance.dao.ThirdPartRequestLogDao;
@@ -12,23 +11,20 @@ import com.clx.performance.encryption.oldmsl.SystemCodeEnum;
 import com.clx.performance.enums.PayUnitTypeEnum;
 import com.clx.performance.enums.PerformanceResultEnum;
 import com.clx.performance.enums.ThirdRequestTypeEnum;
-import com.clx.performance.service.PaymentService;
 import com.clx.performance.model.ThirdPartRequestLog;
 import com.clx.performance.param.pc.payment.PayParam;
 import com.clx.performance.param.pc.payment.PayUnitDTO;
 import com.clx.performance.param.pc.payment.PayUserDTO;
+import com.clx.performance.service.PaymentService;
 import com.clx.performance.service.ThirdPartRequestLogService;
 import com.google.gson.Gson;
 import com.msl.common.dto.HttpDTO;
-import com.msl.common.enums.ResultCodeEnum;
 import com.msl.common.exception.ServiceSystemException;
 import com.msl.common.result.Result;
 import com.msl.common.utils.EncryptUtil;
 import com.msl.common.utils.HttpUtil;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
-import org.apache.poi.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
@@ -183,6 +179,7 @@ public class PaymentServiceImpl implements PaymentService {
     }
 
     private <T> Result<T> covertResult(String result, TypeReference<Result<T>> reference) {
+        log.info("钱包支付返回结果===》{}",result);
         return new Gson().fromJson(result, reference.getType());
     }