dd

code/src/test/java/BaseDataSource.java

@@ -4,12 +4,12 @@ public class BaseDataSource {
 
     public static void main(String[] args) {
         GeneratorApplication.builder()
-                .url("jdbc:mysql://36.134.91.96:17330/winfaster_master?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true")
+                .url("jdbc:mysql://36.134.91.96:17330/bytesailing_base?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true")
                 .username("fjhx2012mysql")
                 .password("3PN-Mzn#vnP&q6d")
                 .port(9989)
-                .module("admin")
-                .parent("com.fjhx.admin")
+                .module("hx-area")
+                .parent("com.fjhx.area")
                 .superServiceClass("com.ruoyi.common.core.service.BaseService")
                 .build();
     }

hx-admin/src/test/java/DingDingTest.java

@@ -6,6 +6,7 @@ import com.aliyun.dingtalkoauth2_1_0.models.GetCorpAccessTokenResponseBody;
 import com.aliyun.tea.TeaException;
 import com.aliyun.teaopenapi.models.Config;
 import com.fjhx.admin.BytesailingApplication;
+import com.fjhx.area.service.CustomizeAreaService;
 import com.fjhx.dingding.constant.Constant;
 import com.fjhx.dingding.service.DingService;
 import com.ruoyi.common.annotation.TenantIgnore;
@@ -28,6 +29,9 @@ public class DingDingTest {
     @Autowired
     private DingService dingService;
 
+    @Autowired
+    private CustomizeAreaService customizeAreaService;
+
     @TenantIgnore
     @Test
     public void test1() {

hx-common/src/main/java/com/fjhx/common/controller/corporation/CorporationController.java

@@ -1,13 +1,16 @@
 package com.fjhx.common.controller.corporation;
 
-import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.common.entity.corporation.vo.CorporationVo;
-import com.fjhx.common.entity.corporation.dto.CorporationSelectDto;
 import com.fjhx.common.entity.corporation.dto.CorporationDto;
-import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.fjhx.common.entity.corporation.dto.CorporationSelectDto;
+import com.fjhx.common.entity.corporation.vo.CorporationVo;
 import com.fjhx.common.service.corporation.CorporationService;
+import com.ruoyi.common.core.domain.BaseSelectDto;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 
 /**

hx-common/src/main/java/com/fjhx/common/entity/corporation/dto/CorporationDto.java

@@ -1,5 +1,6 @@
 package com.fjhx.common.entity.corporation.dto;
 
+import com.fjhx.area.service.SetCustomizeAreaId;
 import com.fjhx.common.entity.corporation.po.Corporation;
 import com.fjhx.file.entity.ObsFile;
 import lombok.Getter;
@@ -15,23 +16,36 @@ import java.util.List;
  */
 @Getter
 @Setter
-public class CorporationDto extends Corporation {
+public class CorporationDto extends Corporation implements SetCustomizeAreaId {
 
     /**
      * 企业logo
      */
     List<ObsFile> enterpriseLogoList;
+
     /**
      * 法人签名
      */
     List<ObsFile> larSignList;
+
     /**
      * 公章
      */
     List<ObsFile> officialSealList;
+
     /**
      * 合同章
      */
     List<ObsFile> contractSealList;
 
+    /**
+     * 省/州名称
+     */
+    private String provinceName;
+
+    /**
+     * 市名称
+     */
+    private String cityName;
+
 }

hx-common/src/main/java/com/fjhx/common/entity/corporation/po/Corporation.java

@@ -80,17 +80,17 @@ public class Corporation extends BasePo {
     /**
      * 国家
      */
-    private String countryId;
+    private Long countryId;
 
     /**
      * 省
      */
-    private String provinceId;
+    private Long provinceId;
 
     /**
      * 市
      */
-    private String cityId;
+    private Long cityId;
 
     /**
      * 详细地址

hx-common/src/main/java/com/fjhx/common/entity/corporation/vo/CorporationVo.java

@@ -1,6 +1,7 @@
 package com.fjhx.common.entity.corporation.vo;
 
 import com.fjhx.area.service.ISetAreaName;
+import com.fjhx.area.service.SetCustomizeAreaName;
 import com.fjhx.common.entity.corporation.po.Corporation;
 import lombok.Getter;
 import lombok.Setter;
@@ -13,7 +14,7 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-public class CorporationVo extends Corporation implements ISetAreaName {
+public class CorporationVo extends Corporation implements SetCustomizeAreaName {
 
     private String countryName;
 

hx-common/src/main/java/com/fjhx/common/service/corporation/impl/CorporationServiceImpl.java

@@ -1,23 +1,22 @@
 package com.fjhx.common.service.corporation.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
-import com.fjhx.area.utils.AreaUtil;
+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.entity.corporation.dto.CorporationDto;
+import com.fjhx.common.entity.corporation.dto.CorporationSelectDto;
 import com.fjhx.common.entity.corporation.po.Corporation;
+import com.fjhx.common.entity.corporation.vo.CorporationVo;
 import com.fjhx.common.mapper.corporation.CorporationMapper;
 import com.fjhx.common.service.corporation.CorporationService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fjhx.file.entity.ObsFile;
 import com.fjhx.file.utils.ObsFileUtil;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.common.entity.corporation.vo.CorporationVo;
-import com.fjhx.common.entity.corporation.dto.CorporationSelectDto;
 import com.ruoyi.common.utils.wrapper.IWrapper;
-import com.fjhx.common.entity.corporation.dto.CorporationDto;
-import cn.hutool.core.bean.BeanUtil;
+import org.springframework.stereotype.Service;
 
 import java.util.List;
 
@@ -46,7 +45,7 @@ public class CorporationServiceImpl extends ServiceImpl<CorporationMapper, Corpo
         Page<CorporationVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         List<CorporationVo> records = page.getRecords();
         // 赋值国省市
-        AreaUtil.setAreaName(records);
+        CustomizeAreaUtil.setAreaName(records);
         return page;
     }
 
@@ -55,36 +54,42 @@ public class CorporationServiceImpl extends ServiceImpl<CorporationMapper, Corpo
         Corporation Corporation = this.getById(id);
         CorporationVo result = BeanUtil.toBean(Corporation, CorporationVo.class);
         // 赋值国省市
-        AreaUtil.setAreaName(result);
+        CustomizeAreaUtil.setAreaName(result);
         return result;
     }
 
     @DSTransactional
     @Override
     public void add(CorporationDto corporationDto) {
+
+        CustomizeAreaUtil.setAreaId(corporationDto);
+
         this.save(corporationDto);
-        //企业logo
-        ObsFileUtil.saveFile(corporationDto.getEnterpriseLogoList(), corporationDto.getId(),1);
-        //法人签名
-        ObsFileUtil.saveFile(corporationDto.getLarSignList(), corporationDto.getId(),2);
-        //公章
-        ObsFileUtil.saveFile(corporationDto.getOfficialSealList(), corporationDto.getId(),3);
-        //合同章
-        ObsFileUtil.saveFile(corporationDto.getContractSealList(), corporationDto.getId(),4);
+        // 企业logo
+        ObsFileUtil.saveFile(corporationDto.getEnterpriseLogoList(), corporationDto.getId(), 1);
+        // 法人签名
+        ObsFileUtil.saveFile(corporationDto.getLarSignList(), corporationDto.getId(), 2);
+        // 公章
+        ObsFileUtil.saveFile(corporationDto.getOfficialSealList(), corporationDto.getId(), 3);
+        // 合同章
+        ObsFileUtil.saveFile(corporationDto.getContractSealList(), corporationDto.getId(), 4);
     }
 
     @DSTransactional
     @Override
     public void edit(CorporationDto corporationDto) {
+
+        CustomizeAreaUtil.setAreaId(corporationDto);
+
         this.updateById(corporationDto);
-        //企业logo
-        ObsFileUtil.editFile(corporationDto.getEnterpriseLogoList(), corporationDto.getId(),1);
-        //法人签名
-        ObsFileUtil.editFile(corporationDto.getLarSignList(), corporationDto.getId(),2);
-        //公章
-        ObsFileUtil.editFile(corporationDto.getOfficialSealList(), corporationDto.getId(),3);
-        //合同章
-        ObsFileUtil.editFile(corporationDto.getContractSealList(), corporationDto.getId(),4);
+        // 企业logo
+        ObsFileUtil.editFile(corporationDto.getEnterpriseLogoList(), corporationDto.getId(), 1);
+        // 法人签名
+        ObsFileUtil.editFile(corporationDto.getLarSignList(), corporationDto.getId(), 2);
+        // 公章
+        ObsFileUtil.editFile(corporationDto.getOfficialSealList(), corporationDto.getId(), 3);
+        // 合同章
+        ObsFileUtil.editFile(corporationDto.getContractSealList(), corporationDto.getId(), 4);
     }
 
     @Override

hx-customer/src/main/java/com/fjhx/customer/entity/customer/dto/CustomerDto.java

@@ -1,12 +1,11 @@
 package com.fjhx.customer.entity.customer.dto;
 
-import com.baomidou.mybatisplus.annotation.TableField;
+import com.fjhx.area.service.SetCustomizeAreaId;
 import com.fjhx.customer.entity.customer.po.Customer;
 import com.fjhx.customer.entity.customer.po.CustomerUser;
 import lombok.Getter;
 import lombok.Setter;
 
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -17,7 +16,7 @@ import java.util.List;
  */
 @Getter
 @Setter
-public class CustomerDto extends Customer {
+public class CustomerDto extends Customer implements SetCustomizeAreaId {
 
     private List<CustomerUser> customerUserList;
 
@@ -30,4 +29,15 @@ public class CustomerDto extends Customer {
      * 结束时间
      */
     private String endTime;
+
+    /**
+     * 省/州名称
+     */
+    private String provinceName;
+
+    /**
+     * 市名称
+     */
+    private String cityName;
+
 }

hx-customer/src/main/java/com/fjhx/customer/entity/customer/po/Customer.java

@@ -31,17 +31,17 @@ public class Customer extends BasePo {
     /**
      * 国家表id
      */
-    private String countryId;
+    private Long countryId;
 
     /**
      * 省份ID
      */
-    private String provinceId;
+    private Long provinceId;
 
     /**
      * 城市id
      */
-    private String cityId;
+    private Long cityId;
 
     /**
      * 地址

hx-customer/src/main/java/com/fjhx/customer/entity/customer/vo/CustomerVo.java

@@ -1,6 +1,8 @@
 package com.fjhx.customer.entity.customer.vo;
 
 import com.fjhx.area.service.ISetAreaName;
+import com.fjhx.area.service.SetCustomizeAreaId;
+import com.fjhx.area.service.SetCustomizeAreaName;
 import com.fjhx.customer.entity.customer.po.Customer;
 import com.fjhx.customer.entity.customer.po.CustomerFollowRecords;
 import com.fjhx.customer.entity.customer.po.CustomerUser;
@@ -17,7 +19,7 @@ import java.util.List;
  */
 @Getter
 @Setter
-public class CustomerVo extends Customer implements ISetAreaName {
+public class CustomerVo extends Customer implements SetCustomizeAreaName {
 
 
     private String countryName;

hx-customer/src/main/java/com/fjhx/customer/service/customer/impl/CustomerServiceImpl.java

@@ -2,11 +2,12 @@ package com.fjhx.customer.service.customer.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fjhx.area.utils.AreaUtil;
+import com.fjhx.area.utils.CustomizeAreaUtil;
 import com.fjhx.customer.entity.customer.dto.CustomerDto;
 import com.fjhx.customer.entity.customer.dto.CustomerSelectDto;
 import com.fjhx.customer.entity.customer.po.Customer;
@@ -88,7 +89,7 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
 
         //复制城市信息
         List<CustomerVo> records = page.getRecords();
-        AreaUtil.setAreaName(records);
+        CustomizeAreaUtil.setAreaName(records);
         //赋值客户跟进记录
         for (CustomerVo record : records) {
             List<CustomerFollowRecords> customerFollowRecordsList = customerFollowRecordsService.list(q ->
@@ -123,7 +124,7 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
         List<CustomerUser> customerUserList = customerUserService.list(Wrappers.<CustomerUser>lambdaQuery()
                 .eq(CustomerUser::getCustomerId, result.getId()));
         result.setCustomerUserList(customerUserList);
-        AreaUtil.setAreaName(result);
+        CustomizeAreaUtil.setAreaName(result);
         return result;
     }
 
@@ -133,11 +134,14 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
      * @param customerDto
      */
     @Override
-    @Transactional(rollbackFor = {Exception.class})
+    @DSTransactional
     public void add(CustomerDto customerDto) {
+
+        CustomizeAreaUtil.setAreaId(customerDto);
+
         customerDto.setCode(CodeEnum.CUSTOMER.getCode());
         this.save(customerDto);
-        //添加库户-联系人表的信息
+        // 添加库户-联系人表的信息
         saveCustomerUse(customerDto);
     }
 
@@ -146,14 +150,17 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
      *
      * @param customerDto
      */
-    @Transactional(rollbackFor = {Exception.class})
+    @DSTransactional
     @Override
     public void edit(CustomerDto customerDto) {
-        //修改客户表的信息
+
+        CustomizeAreaUtil.setAreaId(customerDto);
+
+        // 修改客户表的信息
         this.updateById(customerDto);
-        //删除客户-用户表的信息
+        // 删除客户-用户表的信息
         customerUserService.remove(Wrappers.<CustomerUser>lambdaQuery().eq(CustomerUser::getCustomerId, customerDto.getId()));
-        //添加客户-联系人表的信息
+        // 添加客户-联系人表的信息
         saveCustomerUse(customerDto);
     }
 
@@ -199,7 +206,7 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
         Page<CustomerVo> page = baseMapper.getPage(dto.getPage(), wrapper);
         //复制城市信息
         List<CustomerVo> records = page.getRecords();
-        AreaUtil.setAreaName(records);
+        CustomizeAreaUtil.setAreaName(records);
         //赋值客户跟进记录
         for (CustomerVo record : records) {
             List<CustomerFollowRecords> customerFollowRecordsList = customerFollowRecordsService.list(q ->

hx-sale/src/main/java/com/fjhx/sale/entity/contract/dto/ContractDto.java

@@ -42,4 +42,13 @@ public class ContractDto extends Contract {
      * 产品名称
      */
     private String productName;
+
+    private String buyProvinceName;
+
+    private String buyCityName;
+
+    private String sellProvinceName;
+
+    private String sellCityName;
+
 }

hx-sale/src/main/java/com/fjhx/sale/entity/contract/po/Contract.java

@@ -77,17 +77,17 @@ public class Contract extends BasePo {
     /**
      * 卖方国家表id
      */
-    private String sellCountryId;
+    private Long sellCountryId;
 
     /**
      * 卖方省份id
      */
-    private String sellProvinceId;
+    private Long sellProvinceId;
 
     /**
      * 卖方城市id
      */
-    private String sellCityId;
+    private Long sellCityId;
 
     /**
      * 卖方详细地址
@@ -115,17 +115,17 @@ public class Contract extends BasePo {
     /**
      * 买方国家表id
      */
-    private String buyCountryId;
+    private Long buyCountryId;
 
     /**
      * 买方省份id
      */
-    private String buyProvinceId;
+    private Long buyProvinceId;
 
     /**
      * 买方城市id
      */
-    private String buyCityId;
+    private Long buyCityId;
 
     /**
      * 买方详细地址

hx-sale/src/main/java/com/fjhx/sale/entity/documents/po/Documents.java

@@ -32,7 +32,7 @@ public class Documents extends BasePo {
     /**
      * 国家表id
      */
-    private String countryId;
+    private Long countryId;
 
     /**
      * 国家名称

hx-sale/src/main/java/com/fjhx/sale/entity/sale/po/SaleQuotation.java

@@ -88,17 +88,17 @@ public class SaleQuotation extends BasePo {
     /**
      * 买方国家表id
      */
-    private String buyCountryId;
+    private Long buyCountryId;
 
     /**
      * 买方省份id
      */
-    private String buyProvinceId;
+    private Long buyProvinceId;
 
     /**
      * 买方城市id
      */
-    private String buyCityId;
+    private Long buyCityId;
 
     /**
      * 买方详细地址

hx-sale/src/main/java/com/fjhx/sale/service/contract/impl/ContractServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson2.JSONObject;
+import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -12,7 +13,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.account.controller.utils.DateUtils;
 import com.fjhx.account.entity.account.po.AccountManagement;
 import com.fjhx.account.service.account.AccountManagementService;
-import com.fjhx.area.utils.AreaUtil;
+import com.fjhx.area.service.SetCustomizeAreaId;
+import com.fjhx.area.utils.CustomizeAreaUtil;
 import com.fjhx.common.entity.corporation.po.Corporation;
 import com.fjhx.common.entity.documentary.bo.DocumentaryData;
 import com.fjhx.common.enums.FlowStatusEnum;
@@ -23,7 +25,6 @@ import com.fjhx.customer.entity.customer.po.Customer;
 import com.fjhx.customer.service.customer.CustomerService;
 import com.fjhx.item.entity.product.dto.ProductInfoSelectDto;
 import com.fjhx.item.service.product.ProductInfoService;
-import com.fjhx.sale.entity.commission.dto.CommissionDto;
 import com.fjhx.sale.entity.contract.bo.ContractDocumentaryBo;
 import com.fjhx.sale.entity.contract.dto.ContractDto;
 import com.fjhx.sale.entity.contract.dto.ContractSelectDto;
@@ -91,9 +92,6 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
     @Autowired
     private AccountManagementService accountManagementService;
 
-    @Autowired
-    private ContractService contractService;
-
     /**
      * 分页
      *
@@ -117,7 +115,6 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
         Page<ContractVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         List<ContractVo> list = page.getRecords();
         if(CollectionUtils.isNotEmpty(list)){
-            List<Long> companyIds = list.stream().map(Contract::getSellCorporationId).collect(Collectors.toList());
             List<Long> customerIds = list.stream().map(Contract::getBuyCorporationId).collect(Collectors.toList());
             List<Customer> customerList = customerService.list(Wrappers.<Customer>query().lambda().in(Customer::getId,customerIds));
             Map<Long,List<Customer>> cusMap = customerList.stream().distinct().collect(Collectors.groupingBy(Customer::getId));
@@ -138,13 +135,17 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
         return result;
     }
 
+    @DSTransactional
     @Override
     public void add(ContractDto contractDto) {
+        setAreaId(contractDto);
         this.save(contractDto);
     }
 
+    @DSTransactional
     @Override
     public void edit(ContractDto contractDto) {
+        setAreaId(contractDto);
         this.updateById(contractDto);
     }
 
@@ -504,16 +505,19 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
      */
     private void setArea(ContractPdfInfoVo contractPdfInfoVo, Contract contract) {
 
-        List<String> areaIdList = Arrays.asList(
+        List<Long> areaIdList = Arrays.asList(
                 contract.getBuyCountryId(),
                 contract.getBuyProvinceId(),
-                contract.getBuyCityId()
+                contract.getBuyCityId(),
+                contract.getSellCountryId(),
+                contract.getSellProvinceId(),
+                contract.getSellCityId()
         );
 
-        Map<String, String> areaMap = AreaUtil.getAreaMapByIds(areaIdList);
-        contractPdfInfoVo.setSellCountryName(contract.getSellCountryId());
-        contractPdfInfoVo.setSellProvinceName(contract.getSellProvinceId());
-        contractPdfInfoVo.setSellCityName(contract.getSellCityId());
+        Map<Long, String> areaMap = CustomizeAreaUtil.getAreaMapByIds(areaIdList);
+        contractPdfInfoVo.setSellCountryName(areaMap.get(contract.getSellCountryId()));
+        contractPdfInfoVo.setSellProvinceName(areaMap.get(contract.getSellProvinceId()));
+        contractPdfInfoVo.setSellCityName(areaMap.get(contract.getSellCityId()));
         contractPdfInfoVo.setSellDetailedAddress(contract.getSellAddress());
         contractPdfInfoVo.setBuyCountryName(areaMap.get(contract.getBuyCountryId()));
         contractPdfInfoVo.setBuyProvinceName(areaMap.get(contract.getBuyProvinceId()));
@@ -585,10 +589,92 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
         contractPdfInfoVo.setBeneficiaryAddress(accountManagement.getBeneficiaryAddress());
     }
 
-    //添加时间的查询条件
-    private void  selectTime(QueryWrapper<Contract> query,ContractDto dto){
-        query.ge("DATE_FORMAT(create_time,'%Y-%m')",dto.getBeginTime());
-        query.le("DATE_FORMAT(create_time,'%Y-%m')",dto.getEndTime());
+    // 添加时间的查询条件
+    private void selectTime(QueryWrapper<Contract> query, ContractDto dto) {
+        query.ge("DATE_FORMAT(create_time,'%Y-%m')", dto.getBeginTime());
+        query.le("DATE_FORMAT(create_time,'%Y-%m')", dto.getEndTime());
+    }
+
+    private void setAreaId(ContractDto contractDto) {
+
+        SetCustomizeAreaId setCustomizeAreaId1 = new SetCustomizeAreaId() {
+
+            @Override
+            public void setProvinceId(Long provinceId) {
+                contractDto.setBuyProvinceId(provinceId);
+            }
+
+            @Override
+            public void setCityId(Long cityId) {
+                contractDto.setBuyCityId(cityId);
+            }
+
+            @Override
+            public Long getCountryId() {
+                return contractDto.getBuyCountryId();
+            }
+
+            @Override
+            public Long getProvinceId() {
+                return contractDto.getBuyProvinceId();
+            }
+
+            @Override
+            public String getProvinceName() {
+                return contractDto.getBuyProvinceName();
+            }
+
+            @Override
+            public Long getCityId() {
+                return contractDto.getBuyCityId();
+            }
+
+            @Override
+            public String getCityName() {
+                return contractDto.getBuyCityName();
+            }
+        };
+
+        SetCustomizeAreaId setCustomizeAreaId2 = new SetCustomizeAreaId() {
+
+            @Override
+            public void setProvinceId(Long provinceId) {
+                contractDto.setSellProvinceId(provinceId);
+            }
+
+            @Override
+            public void setCityId(Long cityId) {
+                contractDto.setSellCityId(cityId);
+            }
+
+            @Override
+            public Long getCountryId() {
+                return contractDto.getSellCountryId();
+            }
+
+            @Override
+            public Long getProvinceId() {
+                return contractDto.getSellProvinceId();
+            }
+
+            @Override
+            public String getProvinceName() {
+                return contractDto.getSellProvinceName();
+            }
+
+            @Override
+            public Long getCityId() {
+                return contractDto.getSellCityId();
+            }
+
+            @Override
+            public String getCityName() {
+                return contractDto.getSellCityName();
+            }
+        };
+
+        CustomizeAreaUtil.setAreaId(Arrays.asList(setCustomizeAreaId1, setCustomizeAreaId2));
+
     }
 
 }

hx-sale/src/main/java/com/fjhx/sale/service/documents/impl/DocumentsServiceImpl.java

@@ -1,11 +1,14 @@
 package com.fjhx.sale.service.documents.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.fjhx.area.utils.AreaUtil;
+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.entity.corporation.po.Corporation;
 import com.fjhx.common.service.corporation.CorporationService;
@@ -15,10 +18,13 @@ import com.fjhx.item.service.product.ProductInfoService;
 import com.fjhx.sale.entity.contract.po.Contract;
 import com.fjhx.sale.entity.contract.po.ContractProject;
 import com.fjhx.sale.entity.contract.vo.ContractVo;
+import com.fjhx.sale.entity.documents.dto.DocumentsDto;
+import com.fjhx.sale.entity.documents.dto.DocumentsSelectDto;
 import com.fjhx.sale.entity.documents.po.Documents;
 import com.fjhx.sale.entity.documents.po.DocumentsPdf;
 import com.fjhx.sale.entity.documents.po.DocumentsProduct;
 import com.fjhx.sale.entity.documents.po.DocumentsTransport;
+import com.fjhx.sale.entity.documents.vo.DocumentsVo;
 import com.fjhx.sale.entity.pack.po.PackDetail;
 import com.fjhx.sale.entity.pack.po.PackDetailGoods;
 import com.fjhx.sale.entity.pack.po.PackShipment;
@@ -28,7 +34,6 @@ import com.fjhx.sale.service.contract.ContractService;
 import com.fjhx.sale.service.documents.DocumentsPdfService;
 import com.fjhx.sale.service.documents.DocumentsProductService;
 import com.fjhx.sale.service.documents.DocumentsService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.sale.service.documents.DocumentsTransportService;
 import com.fjhx.sale.service.pack.PackDetailGoodsService;
 import com.fjhx.sale.service.pack.PackDetailService;
@@ -37,11 +42,6 @@ import com.obs.services.internal.ServiceException;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.sale.entity.documents.vo.DocumentsVo;
-import com.fjhx.sale.entity.documents.dto.DocumentsSelectDto;
-import com.fjhx.sale.entity.documents.dto.DocumentsDto;
-import cn.hutool.core.bean.BeanUtil;
 
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
@@ -402,7 +402,7 @@ public class DocumentsServiceImpl extends ServiceImpl<DocumentsMapper, Documents
      */
     private void setContractArea(ContractVo contractVo) {
 
-        List<String> areaIdList = Arrays.asList(
+        List<Long> areaIdList = Arrays.asList(
                 contractVo.getBuyCountryId(),
                 contractVo.getBuyProvinceId(),
                 contractVo.getBuyCityId(),
@@ -410,7 +410,7 @@ public class DocumentsServiceImpl extends ServiceImpl<DocumentsMapper, Documents
                 contractVo.getSellProvinceId(),
                 contractVo.getSellCityId()
         );
-        Map<String, String> areaMap = AreaUtil.getAreaMapByIds(areaIdList);
+        Map<Long, String> areaMap = CustomizeAreaUtil.getAreaMapByIds(areaIdList);
         contractVo.setBuyCountryName(areaMap.get(contractVo.getBuyCountryId()));
         contractVo.setBuyProvinceName(areaMap.get(contractVo.getBuyProvinceId()));
         contractVo.setBuyCityName(areaMap.get(contractVo.getBuyCityId()));
@@ -423,10 +423,9 @@ public class DocumentsServiceImpl extends ServiceImpl<DocumentsMapper, Documents
      */
     private void setDocumentArea(Documents documents) {
 
-        List<String> areaIdList = Arrays.asList(
-                documents.getCountryId()
-        );
-        Map<String, String> areaMap = AreaUtil.getAreaMapByIds(areaIdList);
+        List<Long> areaIdList = Collections.singletonList(documents.getCountryId());
+        Map<Long, String> areaMap = CustomizeAreaUtil.getAreaMapByIds(areaIdList);
+
         documents.setCountryName(areaMap.get(documents.getCountryId()));
     }
 }

hx-sale/src/main/java/com/fjhx/sale/service/sale/impl/SaleQuotationServiceImpl.java

@@ -1,13 +1,16 @@
 package com.fjhx.sale.service.sale.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.account.controller.utils.DateUtils;
-import com.fjhx.area.utils.AreaUtil;
+import com.fjhx.area.utils.CustomizeAreaUtil;
 import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.customer.entity.customer.dto.CustomerDto;
 import com.fjhx.customer.entity.customer.dto.CustomerSelectDto;
@@ -17,13 +20,15 @@ import com.fjhx.customer.service.customer.CustomerService;
 import com.fjhx.sale.entity.contract.vo.ContractVo;
 import com.fjhx.sale.entity.quotation.po.QuotationPay;
 import com.fjhx.sale.entity.quotation.po.QuotationProduct;
+import com.fjhx.sale.entity.sale.dto.SaleQuotationDto;
+import com.fjhx.sale.entity.sale.dto.SaleQuotationSelectDto;
 import com.fjhx.sale.entity.sale.po.SaleQuotation;
+import com.fjhx.sale.entity.sale.vo.SaleQuotationVo;
 import com.fjhx.sale.mapper.sale.SaleQuotationMapper;
 import com.fjhx.sale.service.contract.ContractService;
 import com.fjhx.sale.service.quotation.QuotationPayService;
 import com.fjhx.sale.service.quotation.QuotationProductService;
 import com.fjhx.sale.service.sale.SaleQuotationService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.sale.util.code.CodeEnum;
 import com.fjhx.tenant.entity.dict.dto.DictTenantDataSelectDto;
 import com.fjhx.tenant.entity.dict.vo.DictTenantDataVo;
@@ -33,11 +38,6 @@ import com.ruoyi.common.core.domain.BasePo;
 import com.ruoyi.system.utils.UserUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.sale.entity.sale.vo.SaleQuotationVo;
-import com.fjhx.sale.entity.sale.dto.SaleQuotationSelectDto;
-import com.fjhx.sale.entity.sale.dto.SaleQuotationDto;
-import cn.hutool.core.bean.BeanUtil;
 
 import java.math.BigDecimal;
 import java.util.*;
@@ -572,12 +572,12 @@ public class SaleQuotationServiceImpl extends ServiceImpl<SaleQuotationMapper, S
      */
     private void setArea(SaleQuotationVo saleQuotationVo) {
 
-        List<String> areaIdList = Arrays.asList(
+        List<Long> areaIdList = Arrays.asList(
                 saleQuotationVo.getBuyCountryId(),
                 saleQuotationVo.getBuyProvinceId(),
                 saleQuotationVo.getBuyCityId()
         );
-        Map<String, String> areaMap = AreaUtil.getAreaMapByIds(areaIdList);
+        Map<Long, String> areaMap = CustomizeAreaUtil.getAreaMapByIds(areaIdList);
         saleQuotationVo.setBuyCountryName(areaMap.get(saleQuotationVo.getBuyCountryId()));
         saleQuotationVo.setBuyProvinceName(areaMap.get(saleQuotationVo.getBuyProvinceId()));
         saleQuotationVo.setBuyCityName(areaMap.get(saleQuotationVo.getBuyCityId()));
@@ -589,8 +589,7 @@ public class SaleQuotationServiceImpl extends ServiceImpl<SaleQuotationMapper, S
     private List<DictTenantDataVo> getDict(String code){
         DictTenantDataSelectDto dto = new DictTenantDataSelectDto();
         dto.setDictCode(code);
-        List<DictTenantDataVo> dictTenantDataServiceList = dictTenantDataService.getList(dto);
-        return dictTenantDataServiceList;
+        return dictTenantDataService.getList(dto);
     }
 
 

hx-supply/src/main/java/com/fjhx/supply/entity/supplier/dto/SupplierInfoDto.java

@@ -1,5 +1,6 @@
 package com.fjhx.supply.entity.supplier.dto;
 
+import com.fjhx.area.service.SetCustomizeAreaId;
 import com.fjhx.file.entity.ObsFile;
 import com.fjhx.supply.entity.supplier.po.SupplierInfo;
 import lombok.Getter;
@@ -15,11 +16,18 @@ import java.util.List;
  */
 @Getter
 @Setter
-public class SupplierInfoDto extends SupplierInfo {
+public class SupplierInfoDto extends SupplierInfo implements SetCustomizeAreaId {
 
     /**
      * 文件列表
      */
     List<ObsFile> fileList;
 
+    private String countryName;
+
+    private String provinceName;
+
+    private String cityName;
+
+
 }

hx-supply/src/main/java/com/fjhx/supply/entity/supplier/po/SupplierInfo.java

@@ -36,17 +36,17 @@ public class SupplierInfo extends BasePo {
     /**
      * 国家id
      */
-    private String countryId;
+    private Long countryId;
 
     /**
      * 省id
      */
-    private String provinceId;
+    private Long provinceId;
 
     /**
      * 市id
      */
-    private String cityId;
+    private Long cityId;
 
     /**
      * 地区明细

hx-supply/src/main/java/com/fjhx/supply/entity/supplier/vo/SupplierInfoVo.java

@@ -1,6 +1,7 @@
 package com.fjhx.supply.entity.supplier.vo;
 
 import com.fjhx.area.service.ISetAreaName;
+import com.fjhx.area.service.SetCustomizeAreaName;
 import com.fjhx.supply.entity.supplier.po.SupplierInfo;
 import lombok.Getter;
 import lombok.Setter;
@@ -13,7 +14,7 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-public class SupplierInfoVo extends SupplierInfo implements ISetAreaName {
+public class SupplierInfoVo extends SupplierInfo implements SetCustomizeAreaName {
 
     private String countryName;
 

hx-supply/src/main/java/com/fjhx/supply/service/supplier/impl/SupplierInfoServiceImpl.java

@@ -7,7 +7,7 @@ import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fjhx.area.utils.AreaUtil;
+import com.fjhx.area.utils.CustomizeAreaUtil;
 import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.file.utils.ObsFileUtil;
 import com.fjhx.supply.entity.supplier.dto.SupplierInfoDto;
@@ -51,7 +51,7 @@ public class SupplierInfoServiceImpl extends ServiceImpl<SupplierInfoMapper, Sup
         if (records.size() == 0) {
             return page;
         }
-        AreaUtil.setAreaName(records);
+        CustomizeAreaUtil.setAreaName(records);
         return page;
     }
 
@@ -88,7 +88,7 @@ public class SupplierInfoServiceImpl extends ServiceImpl<SupplierInfoMapper, Sup
         if (records.size() == 0) {
             return page;
         }
-        AreaUtil.setAreaName(records);
+        CustomizeAreaUtil.setAreaName(records);
         return page;
     }
 
@@ -96,7 +96,7 @@ public class SupplierInfoServiceImpl extends ServiceImpl<SupplierInfoMapper, Sup
     public SupplierInfoVo detail(Long id) {
         SupplierInfo SupplierInfo = this.getById(id);
         SupplierInfoVo result = BeanUtil.toBean(SupplierInfo, SupplierInfoVo.class);
-        AreaUtil.setAreaName(result);
+        CustomizeAreaUtil.setAreaName(result);
         return result;
     }
 
@@ -115,6 +115,7 @@ public class SupplierInfoServiceImpl extends ServiceImpl<SupplierInfoMapper, Sup
     @DSTransactional
     @Override
     public void add(SupplierInfoDto supplierInfoDto) {
+        CustomizeAreaUtil.setAreaId(supplierInfoDto);
         supplierInfoDto.setCode(CodeEnum.SUPPLIER_INFO.getCode());
         this.save(supplierInfoDto);
         ObsFileUtil.saveFile(supplierInfoDto.getFileList(), supplierInfoDto.getId());
@@ -123,6 +124,7 @@ public class SupplierInfoServiceImpl extends ServiceImpl<SupplierInfoMapper, Sup
     @DSTransactional
     @Override
     public void edit(SupplierInfoDto supplierInfoDto) {
+        CustomizeAreaUtil.setAreaId(supplierInfoDto);
         supplierInfoDto.setCode(null);
         this.updateById(supplierInfoDto);
         ObsFileUtil.editFile(supplierInfoDto.getFileList(), supplierInfoDto.getId());

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/after/dto/AfterSaleRecordDto.java

@@ -1,5 +1,6 @@
 package com.fjhx.victoriatourist.entity.after.dto;
 
+import com.fjhx.area.service.SetCustomizeAreaId;
 import com.fjhx.victoriatourist.entity.after.po.AfterSaleDetail;
 import com.fjhx.victoriatourist.entity.after.po.AfterSaleRecord;
 import lombok.Getter;
@@ -17,7 +18,7 @@ import java.util.List;
  */
 @Getter
 @Setter
-public class AfterSaleRecordDto extends AfterSaleRecord {
+public class AfterSaleRecordDto extends AfterSaleRecord implements SetCustomizeAreaId {
 
     /**
      * 关联商品
@@ -26,4 +27,15 @@ public class AfterSaleRecordDto extends AfterSaleRecord {
     @NotEmpty(message = "关联商品不能为空")
     private List<AfterSaleDetail> afterSaleDetailList;
 
+    /**
+     * 省/州名称
+     */
+    private String provinceName;
+
+    /**
+     * 市名称
+     */
+    private String cityName;
+
+
 }

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/after/po/AfterSaleRecord.java

@@ -37,19 +37,19 @@ public class AfterSaleRecord extends BasePo {
      * 国家
      */
     @NotNull(message = "国家id不能为空")
-    private String countryId;
+    private Long countryId;
 
     /**
      * 省
      */
     @NotNull(message = "省id不能为空")
-    private String provinceId;
+    private Long provinceId;
 
     /**
      * 市
      */
     @NotNull(message = "市id不能为空")
-    private String cityId;
+    private Long cityId;
 
     /**
      * 详细地址

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/after/vo/AfterSaleRecordVo.java

@@ -1,7 +1,6 @@
 package com.fjhx.victoriatourist.entity.after.vo;
 
-import com.fjhx.area.service.ISetAreaName;
-import com.fjhx.victoriatourist.entity.after.po.AfterSaleDetail;
+import com.fjhx.area.service.SetCustomizeAreaName;
 import com.fjhx.victoriatourist.entity.after.po.AfterSaleRecord;
 import lombok.Getter;
 import lombok.Setter;
@@ -16,7 +15,7 @@ import java.util.List;
  */
 @Getter
 @Setter
-public class AfterSaleRecordVo extends AfterSaleRecord implements ISetAreaName {
+public class AfterSaleRecordVo extends AfterSaleRecord implements SetCustomizeAreaName {
 
     /**
      * 客户名称

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/jd/dto/JdOrderDto.java

@@ -1,5 +1,6 @@
 package com.fjhx.victoriatourist.entity.jd.dto;
 
+import com.fjhx.area.service.SetCustomizeAreaId;
 import com.fjhx.victoriatourist.entity.jd.po.JdOrder;
 import com.fjhx.victoriatourist.entity.jd.po.JdOrderDetails;
 import lombok.Getter;
@@ -17,7 +18,7 @@ import java.util.List;
  */
 @Getter
 @Setter
-public class JdOrderDto extends JdOrder {
+public class JdOrderDto extends JdOrder implements SetCustomizeAreaId {
 
     /**
      * 京东订单明细
@@ -38,4 +39,15 @@ public class JdOrderDto extends JdOrder {
     /**调仓说明*/
     private String remark;
 
+    /**
+     * 省/州名称
+     */
+    private String provinceName;
+
+    /**
+     * 市名称
+     */
+    private String cityName;
+
+
 }

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/jd/po/JdOrder.java

@@ -44,19 +44,19 @@ public class JdOrder extends BasePo {
      * 国家
      */
     @NotBlank(message = "国家id不能为空")
-    private String countryId;
+    private Long countryId;
 
     /**
      * 省
      */
     @NotBlank(message = "省id不能为空")
-    private String provinceId;
+    private Long provinceId;
 
     /**
      * 市
      */
     @NotBlank(message = "市id不能为空")
-    private String cityId;
+    private Long cityId;
 
     /**
      * 详细地址

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/jd/vo/JdOrderVo.java

@@ -1,6 +1,7 @@
 package com.fjhx.victoriatourist.entity.jd.vo;
 
-import com.fjhx.area.service.ISetAreaName;
+import com.fjhx.area.service.SetCustomizeAreaId;
+import com.fjhx.area.service.SetCustomizeAreaName;
 import com.fjhx.victoriatourist.entity.jd.po.JdOrder;
 import lombok.Getter;
 import lombok.Setter;
@@ -16,7 +17,7 @@ import java.util.List;
  */
 @Getter
 @Setter
-public class JdOrderVo extends JdOrder implements ISetAreaName {
+public class JdOrderVo extends JdOrder implements SetCustomizeAreaName {
 
     private String countryName;
 
@@ -55,4 +56,5 @@ public class JdOrderVo extends JdOrder implements ISetAreaName {
      */
     private Date inTime;
 
+
 }

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/order/dto/OrderInfoDto.java

@@ -1,5 +1,6 @@
 package com.fjhx.victoriatourist.entity.order.dto;
 
+import com.fjhx.area.service.SetCustomizeAreaId;
 import com.fjhx.victoriatourist.entity.order.po.OrderDetails;
 import com.fjhx.victoriatourist.entity.order.po.OrderInfo;
 import lombok.Getter;
@@ -15,11 +16,22 @@ import java.util.List;
  */
 @Getter
 @Setter
-public class OrderInfoDto extends OrderInfo {
+public class OrderInfoDto extends OrderInfo implements SetCustomizeAreaId {
 
     /**
      * 订单明细
      */
     private List<OrderDetails> orderDetailsList;
 
+    /**
+     * 省/州名称
+     */
+    private String provinceName;
+
+    /**
+     * 市名称
+     */
+    private String cityName;
+
+
 }

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/order/po/OrderInfo.java

@@ -1,12 +1,13 @@
 package com.fjhx.victoriatourist.entity.order.po;
 
-import com.ruoyi.common.core.domain.BasePo;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.math.BigDecimal;
-import java.util.Date;
+import com.ruoyi.common.core.domain.BasePo;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.math.BigDecimal;
+import java.util.Date;
+
 /**
  * <p>
  * 订单
@@ -63,17 +64,17 @@ public class OrderInfo extends BasePo {
     /**
      * 国家
      */
-    private String countryId;
+    private Long countryId;
 
     /**
      * 省
      */
-    private String provinceId;
+    private Long provinceId;
 
     /**
      * 市
      */
-    private String cityId;
+    private Long cityId;
 
     /**
      * 详细地址

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/order/vo/OrderInfoVo.java

@@ -1,6 +1,7 @@
 package com.fjhx.victoriatourist.entity.order.vo;
 
 import com.fjhx.area.service.ISetAreaName;
+import com.fjhx.area.service.SetCustomizeAreaName;
 import com.fjhx.victoriatourist.entity.order.po.OrderDetails;
 import com.fjhx.victoriatourist.entity.order.po.OrderInfo;
 import lombok.Getter;
@@ -16,7 +17,7 @@ import java.util.List;
  */
 @Getter
 @Setter
-public class OrderInfoVo extends OrderInfo implements ISetAreaName {
+public class OrderInfoVo extends OrderInfo implements SetCustomizeAreaName {
 
     /**
      * 销售订单客户名称

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/after/impl/AfterSaleRecordServiceImpl.java

@@ -2,9 +2,10 @@ package com.fjhx.victoriatourist.service.after.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fjhx.area.utils.AreaUtil;
+import com.fjhx.area.utils.CustomizeAreaUtil;
 import com.fjhx.customer.service.customer.CustomerService;
 import com.fjhx.item.service.product.ProductInfoService;
 import com.fjhx.victoriatourist.entity.after.dto.AfterSaleRecordDto;
@@ -64,7 +65,7 @@ public class AfterSaleRecordServiceImpl extends ServiceImpl<AfterSaleRecordMappe
         });
 
         // 赋值国省市名称
-        AreaUtil.setAreaName(records);
+        CustomizeAreaUtil.setAreaName(records);
 
         return page;
     }
@@ -85,9 +86,10 @@ public class AfterSaleRecordServiceImpl extends ServiceImpl<AfterSaleRecordMappe
         return result;
     }
 
-    @Transactional(rollbackFor = Exception.class)
+    @DSTransactional
     @Override
     public void add(AfterSaleRecordDto afterSaleRecordDto) {
+        CustomizeAreaUtil.setAreaId(afterSaleRecordDto);
         this.save(afterSaleRecordDto);
 
         List<AfterSaleDetail> afterSaleDetailList = afterSaleRecordDto.getAfterSaleDetailList();
@@ -95,9 +97,10 @@ public class AfterSaleRecordServiceImpl extends ServiceImpl<AfterSaleRecordMappe
         afterSaleDetailService.saveBatch(afterSaleDetailList);
     }
 
-    @Transactional(rollbackFor = Exception.class)
+    @DSTransactional
     @Override
     public void edit(AfterSaleRecordDto afterSaleRecordDto) {
+        CustomizeAreaUtil.setAreaId(afterSaleRecordDto);
         Long id = afterSaleRecordDto.getId();
         if (ObjectUtil.isEmpty(id)) {
             throw new ServiceException("id不能为空");

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/jd/impl/JdOrderServiceImpl.java

@@ -6,7 +6,7 @@ import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 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.AreaUtil;
+import com.fjhx.area.utils.CustomizeAreaUtil;
 import com.fjhx.customer.service.customer.CustomerService;
 import com.fjhx.item.entity.product.po.ProductInfo;
 import com.fjhx.item.service.product.ProductInfoService;
@@ -102,7 +102,7 @@ public class JdOrderServiceImpl extends ServiceImpl<JdOrderMapper, JdOrder> impl
         }
 
         // 赋值国省市
-        AreaUtil.setAreaName(records);
+        CustomizeAreaUtil.setAreaName(records);
 
         // 赋值客户名称
         customerService.attributeAssign(records, JdOrder::getCustomerId, (item, customer) -> {
@@ -175,6 +175,8 @@ public class JdOrderServiceImpl extends ServiceImpl<JdOrderMapper, JdOrder> impl
 
         this.save(jdOrderDto);
         this.jdOrderDetailsService.saveBatch(jdOrderDetailsList);
+
+        CustomizeAreaUtil.setAreaId(jdOrderDto);
     }
 
     @DSTransactional
@@ -337,7 +339,7 @@ public class JdOrderServiceImpl extends ServiceImpl<JdOrderMapper, JdOrder> impl
         Page<JdOrderVo> page = this.baseMapper.getReceivePage(dto.getPage(), wrapper);
         List<JdOrderVo> records = page.getRecords();
         // 赋值国省市
-        AreaUtil.setAreaName(records);
+        CustomizeAreaUtil.setAreaName(records);
         //赋值接收人名字
         UserUtil.assignmentNickName(records, JdOrderVo::getInUserId, JdOrderVo::setInUserName);
         // 赋值客户名称

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/order/impl/OrderInfoServiceImpl.java

@@ -6,7 +6,7 @@ import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.area.service.AreaInfoService;
-import com.fjhx.area.utils.AreaUtil;
+import com.fjhx.area.utils.CustomizeAreaUtil;
 import com.fjhx.customer.entity.customer.po.Customer;
 import com.fjhx.customer.service.customer.CustomerService;
 import com.fjhx.item.service.product.ProductInfoService;
@@ -82,7 +82,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
             item.setCustomerName(customerInfo.getName());
         });
         //赋值赋值国省市
-        AreaUtil.setAreaName(records);
+        CustomizeAreaUtil.setAreaName(records);
         return page;
     }
 
@@ -96,7 +96,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
             result.setCustomerName(customer.getName());
         }
         //赋值赋值国省市
-        AreaUtil.setAreaName(result);
+        CustomizeAreaUtil.setAreaName(result);
         //赋值明细
         List<OrderDetails> list = orderDetailsService.list(q -> q.eq(OrderDetails::getOrderId, result.getId()));
         List<OrderDetailsVo> orderDetailsVoList = BeanUtil.copyToList(list, OrderDetailsVo.class);
@@ -173,6 +173,8 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
             stockWaitDetailsList.add(stockWaitDetails);
         }
         stockWaitDetailsService.saveBatch(stockWaitDetailsList);
+
+        CustomizeAreaUtil.setAreaId(orderInfoDto);
     }
 
     @DSTransactional
@@ -186,6 +188,9 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
             }
             stockWaitService.updateBatchById(list);
         }
+
+
+        CustomizeAreaUtil.setAreaId(orderInfoDto);
     }
 
     @Override
@@ -206,7 +211,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
         orderDetails.setNotIssuedQuantity(orderDetails.getNotIssuedQuantity().subtract(stockWaitDetailsDto.getQuantity()));
         orderDetailsService.updateById(orderDetails);
         //修改销售订单状态
-        Integer statusFlag = 0;
+        int statusFlag = 0;
         List<OrderDetails> orderDetailsList = orderDetailsService.list(q -> q.eq(OrderDetails::getOrderId, orderDetails.getOrderId()));
         for (OrderDetails details : orderDetailsList) {
             //统计已经完全出库的条数