订单退款时，改用支付订单的tradeNo字段是否为空判断用户使用的是原生支付还是新支付

src/main/java/com/sqx/modules/order/service/impl/AppAppOrderServiceImpl.java

@@ -16,12 +16,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.sqx.common.constant.RedisKey;
 import com.sqx.common.exception.SqxException;
 import com.sqx.common.sms.SmsSendResult;
-import com.sqx.common.utils.Constant;
-import com.sqx.common.utils.DateUtils;
-import com.sqx.common.utils.DistanceUtil;
-import com.sqx.common.utils.MyGlobalThreadPool;
-import com.sqx.common.utils.PageUtils;
-import com.sqx.common.utils.Result;
+import com.sqx.common.utils.*;
 import com.sqx.modules.activity.entity.ActivityPartRecord;
 import com.sqx.modules.activity.service.ActivityPartRecordService;
 import com.sqx.modules.activity.service.ActivityService;
@@ -45,8 +40,8 @@ import com.sqx.modules.coupon.entity.TbCouponUser;
 import com.sqx.modules.datacentre.entity.SysUserShop;
 import com.sqx.modules.errand.dao.TbIndentDao;
 import com.sqx.modules.errand.entity.TbIndent;
-import com.sqx.modules.errand.service.TbIndentService;
 import com.sqx.modules.errand.entity.TbIndentSmsSendLog;
+import com.sqx.modules.errand.service.TbIndentService;
 import com.sqx.modules.errand.service.TbIndentSmsSendLogService;
 import com.sqx.modules.errand.service.TbIndentSmsTemplateService;
 import com.sqx.modules.goods.dao.GoodsDao;
@@ -83,7 +78,6 @@ import com.sqx.modules.pay.service.WxErrService;
 import com.sqx.modules.pay.vo.AliPayTransactionsParam;
 import com.sqx.modules.pay.vo.PayTransactionsVO;
 import com.sqx.modules.shop.service.ShopMessageService;
-import com.sqx.modules.sys.dao.SysUserRoleDao;
 import com.sqx.modules.sys.entity.SysUserEntity;
 import com.sqx.modules.sys.service.SysUserService;
 import com.sqx.modules.utils.SenInfoCheckUtil;
@@ -112,11 +106,7 @@ import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoUnit;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
+import java.util.*;
 
 @Service
 @Slf4j
@@ -145,8 +135,6 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
     @Autowired
     private GoodsShopRelevancyDao goodsShopRelevancyDao;
     @Autowired
-    private SysUserRoleDao sysUserRoleDao;
-    @Autowired
     private UserMoneyDao userMoneyDao;
     @Autowired
     private WxErrService wxErrService;
@@ -1888,13 +1876,12 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
      */
     private boolean wechatPayRefund(PayDetails payDetails) {
         boolean b;
-        boolean newPay = newPayService.enableNewPay();
-        if (newPay) {
+        // tradeNo不为null表示是新支付，否则为原生微信支付
+        if (StrUtil.isNotBlank(payDetails.getTradeNo())) {
             b = newPayService.wechatRefund(payDetails.getOrderId());
         } else {
             b = wxErrService.wxRefund(payDetails);
         }
-
         return b;
     }