采购退货添加地址信息字段

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/logistics/po/LogisticsInfos.java

@@ -6,6 +6,8 @@ import java.util.Date;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotBlank;
+
 /**
  * <p>
  * 物流信息
@@ -74,4 +76,24 @@ public class LogisticsInfos extends BasePo {
      */
     private String reservationCode;
 
+    /**
+     * 国家表id
+     */
+    private Long countryId;
+
+    /**
+     * 省份id
+     */
+    private Long provinceId;
+
+    /**
+     * 城市id
+     */
+    private Long cityId;
+
+    /**
+     * 详细地址
+     */
+    private String address;
+
 }

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/logistics/vo/LogisticsInfosVo.java

@@ -1,5 +1,6 @@
 package com.fjhx.victoriatourist.entity.logistics.vo;
 
+import com.fjhx.area.service.SetCustomizeAreaName;
 import com.fjhx.victoriatourist.entity.logistics.po.LogisticsInfos;
 import lombok.Getter;
 import lombok.Setter;
@@ -12,7 +13,7 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-public class LogisticsInfosVo extends LogisticsInfos {
+public class LogisticsInfosVo extends LogisticsInfos implements SetCustomizeAreaName {
 
     /**
      * 物流公司名称
@@ -24,4 +25,18 @@ public class LogisticsInfosVo extends LogisticsInfos {
      */
     private Long purchaseId;
 
+    /**
+     * 国家名称
+     */
+    private String countryName;
+    /**
+     * 省名称
+     */
+    private String cityName;
+    /**
+     * 市名称
+     */
+    private String provinceName;
+
+
 }

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/logistics/impl/LogisticsInfosServiceImpl.java

@@ -7,7 +7,9 @@ import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.area.utils.CustomizeAreaUtil;
 import com.fjhx.common.constant.SourceConstant;
+import com.fjhx.common.utils.Assert;
 import com.fjhx.kd100.entity.company.po.CompanyInfo;
 import com.fjhx.kd100.entity.logistics.po.LogisticsInfo;
 import com.fjhx.kd100.event.Kd100CallbackEvent;
@@ -28,13 +30,13 @@ import com.fjhx.victoriatourist.service.jd.JdBackDetailsService;
 import com.fjhx.victoriatourist.service.jd.JdBackService;
 import com.fjhx.victoriatourist.service.logistics.LogisticsDetailsService;
 import com.fjhx.victoriatourist.service.logistics.LogisticsInfosService;
-import com.fjhx.common.utils.Assert;
 import com.fjhx.victoriatourist.utils.LogisticsConstant;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Service;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -88,6 +90,8 @@ public class LogisticsInfosServiceImpl extends ServiceImpl<LogisticsInfosMapper,
                 record.setLogisticsCompanyName(name);
             }
         }
+        //赋值国省市名称
+        CustomizeAreaUtil.setAreaName(records);
         return page;
     }
 
@@ -95,6 +99,8 @@ public class LogisticsInfosServiceImpl extends ServiceImpl<LogisticsInfosMapper,
     public LogisticsInfosVo detail(Long id) {
         LogisticsInfos LogisticsInfos = this.getById(id);
         LogisticsInfosVo result = BeanUtil.toBean(LogisticsInfos, LogisticsInfosVo.class);
+        //赋值国省市名称
+        CustomizeAreaUtil.setAreaName(Collections.singletonList(result));
         return result;
     }
 

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/purchase/impl/PurchaseBackServiceImpl.java

@@ -197,6 +197,12 @@ public class PurchaseBackServiceImpl extends ServiceImpl<PurchaseBackMapper, Pur
         logisticsInfos.setCode(stockWaitDto.getLogisticsCode());
         logisticsInfos.setWarehouseId(stockWaitDto.getWarehouseId());
         logisticsInfos.setIsKd100(0);
+
+        logisticsInfos.setCountryId(stockWaitDto.getCountryId());//国家id
+        logisticsInfos.setCityId(stockWaitDto.getCityId());//省id
+        logisticsInfos.setProvinceId(stockWaitDto.getProvinceId());//市id
+        logisticsInfos.setAddress(stockWaitDto.getAddress());
+
         logisticsInfosService.save(logisticsInfos);
 
         List<StockWaitDetails> stockWaitDetailsList = stockWaitDto.getStockWaitDetailsList();

hx-victoriatourist/src/main/resources/mapper/logistics/LogisticsInfosMapper.xml

@@ -17,7 +17,11 @@
             li.create_user,
             li.create_time,
             li.update_user,
-            li.update_time
+            li.update_time,
+            li.country_id,
+            li.province_id,
+            li.city_id,
+            li.address
         from logistics_infos li
             ${ew.customSqlSegment}
     </select>

hx-wms/src/main/java/com/fjhx/wms/entity/stock/dto/StockWaitDto.java

@@ -5,6 +5,7 @@ import com.fjhx.wms.entity.stock.po.StockWaitDetails;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**
@@ -37,4 +38,24 @@ public class StockWaitDto extends StockWait {
      */
     private String logisticsCode;
 
+    /**
+     * 国家表id
+     */
+    private Long countryId;
+
+    /**
+     * 省份id
+     */
+    private Long provinceId;
+
+    /**
+     * 城市id
+     */
+    private Long cityId;
+
+    /**
+     * 详细地址
+     */
+    private String address;
+
 }