1.调整开发端微信支付回调参数，保证测试环境能正常使用微信支付功能

2.调整送水订单显示用户具体收货地址业务

src/main/java/com/gxwebsoft/glt/entity/GltTicketOrder.java

@@ -195,6 +195,10 @@ public class GltTicketOrder implements Serializable {
     @Schema(description = "楼层（步梯+送上楼时有值，从2开始）")
     private Integer deliveryFloor;
 
+    @Schema(description = "详细地址")
+    @TableField(exist = false)
+    private String fullAddress;
+
     @Schema(description = "配送费（步梯+送上楼时计算：数量 × (楼层-1)）")
     private BigDecimal deliveryFee;
 

src/main/java/com/gxwebsoft/glt/service/impl/GltTicketOrderServiceImpl.java

@@ -18,15 +18,14 @@ import com.gxwebsoft.glt.param.GltTicketOrderParam;
 import com.gxwebsoft.glt.service.GltTicketOrderService;
 import com.gxwebsoft.glt.service.GltUserTicketLogService;
 import com.gxwebsoft.glt.service.GltUserTicketService;
-import com.gxwebsoft.shop.entity.ShopDealerCapital;
-import com.gxwebsoft.shop.entity.ShopDealerUser;
-import com.gxwebsoft.shop.entity.ShopOrder;
-import com.gxwebsoft.shop.entity.ShopOrderGoods;
+import com.gxwebsoft.shop.entity.*;
+import com.gxwebsoft.shop.mapper.ShopUserAddressMapper;
 import com.gxwebsoft.shop.service.ShopDealerCapitalService;
 import com.gxwebsoft.shop.service.ShopDealerUserService;
 import com.gxwebsoft.shop.service.ShopOrderGoodsService;
 import com.gxwebsoft.shop.service.ShopOrderService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -39,6 +38,7 @@ import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 送水订单Service实现
@@ -83,11 +83,26 @@ public class GltTicketOrderServiceImpl extends ServiceImpl<GltTicketOrderMapper,
     @Resource
     private ShopOrderGoodsService shopOrderGoodsService;
 
+    @Resource
+    private ShopUserAddressMapper shopUserAddressMapper;
+
     @Override
     public PageResult<GltTicketOrder> pageRel(GltTicketOrderParam param) {
         PageParam<GltTicketOrder, GltTicketOrderParam> page = new PageParam<>(param);
         page.setDefaultOrder("sort_number asc, create_time desc");
         List<GltTicketOrder> list = baseMapper.selectPageRel(page, param);
+        if(CollectionUtils.isNotEmpty(list)){
+            List<Integer> addressIdList = list.stream().map(GltTicketOrder::getAddressId).distinct().collect(Collectors.toList());
+            List<ShopUserAddress> userAddressList = shopUserAddressMapper.selectBatchIds(addressIdList);
+            if(CollectionUtils.isNotEmpty(userAddressList)){
+                list.forEach(ticketOrder ->{
+                    ShopUserAddress shopUserAddress = userAddressList.stream().filter(address -> ticketOrder.getAddressId().equals(address)).findFirst().orElse(null);
+                    if(shopUserAddress != null){
+                        ticketOrder.setFullAddress(shopUserAddress.getFullAddress());
+                    }
+                });
+            }
+        }
         return new PageResult<>(list, page.getTotal());
     }
 

src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java

@@ -1,47 +1,46 @@
 package com.gxwebsoft.shop.service.impl;
 
 import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.common.core.context.TenantContext;
-import com.gxwebsoft.common.core.config.ConfigProperties;
 import com.gxwebsoft.common.core.config.CertificateProperties;
+import com.gxwebsoft.common.core.config.ConfigProperties;
+import com.gxwebsoft.common.core.config.SpringContextUtil;
+import com.gxwebsoft.common.core.context.TenantContext;
 import com.gxwebsoft.common.core.enums.ShopDealerCapitalUpdateEnum;
 import com.gxwebsoft.common.core.enums.ShopDealerTypeEnum;
 import com.gxwebsoft.common.core.exception.enums.GlobalErrorCodeConstants;
-import com.gxwebsoft.common.core.utils.*;
-import com.gxwebsoft.common.core.service.PaymentCacheService;
 import com.gxwebsoft.common.core.service.EnvironmentAwarePaymentService;
-import com.gxwebsoft.common.core.config.SpringContextUtil;
+import com.gxwebsoft.common.core.service.PaymentCacheService;
+import com.gxwebsoft.common.core.utils.*;
+import com.gxwebsoft.common.core.web.PageParam;
+import com.gxwebsoft.common.core.web.PageResult;
 import com.gxwebsoft.common.system.entity.Payment;
 import com.gxwebsoft.common.system.entity.User;
 import com.gxwebsoft.common.system.mapper.UserMapper;
+import com.gxwebsoft.common.system.service.PaymentService;
+import com.gxwebsoft.common.system.service.SettingService;
+import com.gxwebsoft.payment.constants.WechatPayType;
 import com.gxwebsoft.shop.dto.ShopDealerUserReduceDto;
 import com.gxwebsoft.shop.dto.VerifyShopOrderDto;
 import com.gxwebsoft.shop.entity.*;
 import com.gxwebsoft.shop.mapper.ShopGoodsMapper;
-import com.gxwebsoft.shop.mapper.ShopUserAddressMapper;
-import com.gxwebsoft.shop.service.*;
-import com.wechat.pay.java.core.RSAAutoCertificateConfig;
-import lombok.extern.slf4j.Slf4j;
-import com.gxwebsoft.common.system.service.PaymentService;
-import com.gxwebsoft.common.system.service.SettingService;
-import com.gxwebsoft.payment.constants.WechatPayType;
 import com.gxwebsoft.shop.mapper.ShopOrderMapper;
+import com.gxwebsoft.shop.mapper.ShopUserAddressMapper;
 import com.gxwebsoft.shop.param.ShopOrderParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.shop.service.*;
 import com.wechat.pay.java.core.Config;
+import com.wechat.pay.java.core.RSAAutoCertificateConfig;
 import com.wechat.pay.java.core.RSAConfig;
 import com.wechat.pay.java.core.RSAPublicKeyConfig;
 import com.wechat.pay.java.core.exception.ServiceException;
 import com.wechat.pay.java.service.payments.jsapi.JsapiServiceExtension;
 import com.wechat.pay.java.service.payments.jsapi.model.*;
-import com.wechat.pay.java.service.payments.nativepay.NativePayService;
-// Native支付的类将使用完全限定名避免冲突
 import com.wechat.pay.java.service.payments.model.Transaction;
+import com.wechat.pay.java.service.payments.nativepay.NativePayService;
 import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

src/main/resources/application.yml

@@ -254,7 +254,7 @@ payment:
   # 开发环境配置
   dev:
     # 开发环境回调地址（本地调试用）
-    notify-url: "http://frps-10550.s209.websoft.top/api/shop/shop-order/notify"
+    notify-url: "https://glt-dev-api.websoft.top/api/shop/shop-order/notify"
     # 开发环境是否启用环境感知
     environment-aware: true