商户端订单详情接口代码调整

nightFragrance-massage/src/main/java/com/ylx/order/domain/TOrder.java

@@ -195,4 +195,7 @@ public class TOrder extends BaseEntity {
 
     @ApiModelProperty("商户收益")
     private BigDecimal merchantIncome;
+
+    @ApiModelProperty("用户下单地址的城市区域码")
+    private String cityCode;
 }

nightFragrance-massage/src/main/java/com/ylx/order/domain/dto/MerchantOrderDetailDTO.java

@@ -14,7 +14,4 @@ public class MerchantOrderDetailDTO {
     @ApiModelProperty("关联的主订单ID")
     private Long orderId;
 
-    @NotNull(message = "城市代码不能为空")
-    @ApiModelProperty("城市编码")
-    private String cityCode;
 }

nightFragrance-massage/src/main/java/com/ylx/order/service/impl/TOrderServiceImpl.java

@@ -20,13 +20,19 @@ import com.ylx.common.utils.*;
 import com.ylx.common.weixinPay.enums.WxPayTypeEnum;
 import com.ylx.common.weixinPay.service.WxPayV3Service;
 import com.ylx.fareSetting.service.IMaProjectFareSettingService;
-import com.ylx.massage.domain.*;
+import com.ylx.massage.domain.MaProject;
+import com.ylx.massage.domain.MaTechnician;
+import com.ylx.massage.domain.TGeoFence;
+import com.ylx.massage.domain.TWxUser;
 import com.ylx.massage.domain.vo.HomeBlock;
 import com.ylx.massage.domain.vo.OrderVerificationVo;
 import com.ylx.massage.domain.vo.TechnicianAvailabilityVo;
 import com.ylx.massage.mapper.MaProjectMapper;
 import com.ylx.massage.mapper.MaTechnicianMapper;
-import com.ylx.massage.service.*;
+import com.ylx.massage.service.CouponService;
+import com.ylx.massage.service.IMaTechnicianService;
+import com.ylx.massage.service.TGeoFenceService;
+import com.ylx.massage.service.TWxUserService;
 import com.ylx.massage.utils.OrderNumberGenerator;
 import com.ylx.message.enums.TriggerEventEnum;
 import com.ylx.message.service.IMessageService;
@@ -538,6 +544,7 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
         order.setContactPersonName(address.getUserName());
         order.setContactPhoneNumber(address.getPhone());
         order.setContactAddressInfo(address.getDetailAddress());
+        order.setCityCode(address.getCityCode());
         order.setBasePrice(basePrice);
         order.setCouponDiscount(couponDiscount);
         order.setTrafficFee(trafficFee);
@@ -1250,7 +1257,7 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
         vo.setContactPhoneNumber(PhoneUtils.maskPhoneNumber(order.getContactPhoneNumber()));
 
         // 4. 计算距离与告警提示 (依赖地理围栏表 t_geo_fence)
-        List<TGeoFence> validFenceList = geoFenceService.selectValidFences(dto.getCityCode());
+        List<TGeoFence> validFenceList = geoFenceService.selectValidFences(order.getCityCode());
         List<TGeoFence> usableFence = filterUsableFence(validFenceList);