chore: 客户常用提货网点修改为字典

sql/v2.1/20241129.sql

@@ -7,4 +7,18 @@ on o.order_id = nor.order_id
     join ecw_order_consignee nee
     on o.order_id = nee.order_id
     SET o.is_limit_update_consignee = 0
-WHERE o.is_cargo_control = 1 AND o.create_time <= '2024-11.28 00:00:00' AND nor.country_code = nee.country_code AND nor.phone = nee.phone;
+WHERE o.is_cargo_control = 1 AND o.create_time <= '2024-11.28 00:00:00' AND nor.country_code = nee.country_code AND nor.phone = nee.phone;
\ No newline at end of file
+
+
+
+-- 添加常用客户提货网点sql
+
+INSERT INTO `system_dict_type`(`id`, `name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`,
+                                        `update_time`, `deleted`)
+VALUES (null, '常用提货网点', 'pickup_points', 0, NULL, '115', '2024-11-29 14:39:24', '115',
+        '2024-11-29 14:39:24', b'0');
+
+INSERT INTO `system_dict_data` (`sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`,
+                                `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`)
+VALUES (1, 'Alaba总部', '1', 'pickup_points', 0, 'default', '', NULL, '1',
+        '2024-11-29 14:39:24', '115', '2024-11-29 14:39:24', b'0', 'Alaba headquarters');
\ No newline at end of file

yudao-module-customer/yudao-module-customer-core/src/main/java/cn/iocoder/yudao/module/customer/vo/customer/vo/CustomerDetailRespVO.java

@@ -290,11 +290,6 @@ public class CustomerDetailRespVO extends CustomerBaseVO {
     private String productNameEn;
 
 
-    @ApiModelProperty(value = "常用提货点中文名称")
-    private String pickupPointNameZh;
-    @ApiModelProperty(value = "常用提货点英文名称")
-    private String pickupPointNameEn;
-
 
     @ApiModelProperty(value = "业务国家中文名称")
     private String busiCountryNameZh;

yudao-module-customer/yudao-module-customer-core/src/main/resources/mapper/customer/CustomerMapper.xml

@@ -76,8 +76,6 @@
         <result column="default_billing" jdbcType="BIT" property="defaultBilling"/>
         <result column="credit_level_name_zh" jdbcType="VARCHAR" property="creditLevelNameZh"/>
         <result column="credit_level_name_en" jdbcType="VARCHAR" property="creditLevelNameEn"/>
-        <result column="pickup_point_name_zh" jdbcType="VARCHAR" property="pickupPointNameZh"/>
-        <result column="pickup_point_name_en" jdbcType="VARCHAR" property="pickupPointNameEn"/>
         <result column="vip_level_name_zh" jdbcType="VARCHAR" property="vipLevelNameZh"/>
         <result column="vip_level_name_en" jdbcType="VARCHAR" property="vipLevelNameEn"/>
         <result column="busi_country_name_zh" jdbcType="VARCHAR" property="busiCountryNameZh"/>
@@ -150,8 +148,6 @@
                 pt.id as type_id,
                 pt.title_zh as type_title_zh,
                 pt.title_en as type_title_en,
-                (SELECT GROUP_CONCAT(title_zh) FROM ecw_node n WHERE FIND_IN_SET(n.id,(SELECT pickup_points FROM ecw_customer WHERE id=c.id))) AS pickup_point_name_zh,
-                (SELECT GROUP_CONCAT(title_en) FROM ecw_node n WHERE FIND_IN_SET(n.id,(SELECT pickup_points FROM ecw_customer WHERE id=c.id))) AS pickup_point_name_en,
                 (SELECT GROUP_CONCAT(name_zh) FROM ecw_country ct WHERE FIND_IN_SET(ct.id,(SELECT busi_country_ids FROM ecw_customer WHERE id=c.id))) AS busi_country_name_zh,
                 (SELECT GROUP_CONCAT(name_en) FROM ecw_country ct WHERE FIND_IN_SET(ct.id,(SELECT busi_country_ids FROM ecw_customer WHERE id=c.id))) AS busi_country_name_en,
                 (SELECT GROUP_CONCAT(name) FROM ecw_customer_competitor ccp WHERE FIND_IN_SET(ccp.id,(SELECT competitor_ids FROM ecw_customer WHERE id=c.id))) AS competitor_names,

yudao-module-customer/yudao-module-customer-rest/src/main/java/cn/iocoder/yudao/module/customer/controller/admin/customer/CustomerController.http

@@ -45,7 +45,7 @@ Authorization: Bearer {{token}}
 tenant-id: {{adminTenentId}}
 Content-Type: application/json
 
-{"inquiry":null,"id":"38155","number":"SGP00004","name":"yh2345","nameEn":null,"level":1,"country":194,"type":"0,1","transportType":"1","agentId":null,"company":"","companyEn":null,"payerName":null,"address":null,"productType":null,"productId":null,"pickupPoint":null,"memberId":null,"birthday":null,"balance":null,"source":5,"picture":null,"customerService":null,"customerContacts":[{"customerId":38155,"department":"","position":"","name":"yh12345","nameEn":"","social":null,"socialNumber":"","email":"","isDefault":1,"userid":null,"username":null,"areaCode":"65","phoneNew":"66666666","createTime":1692929203000,"id":69056,"customerContactsId":69056,"customerName":null,"company":""}],"customerLines":[],"lightUnit":null,"promoter":null,"status":1,"founder":118,"department":null,"invoiceTitle":null,"licenseNumber":null,"bank":null,"bankNumber":null,"project":null,"billingAddress":null,"billingTell":null,"taxRate":0,"remarks":null,"arrivalConfirm":0,"weightUnit":null,"createTime":1692924735000,"isShowTidanPrice":true,"carName":null,"carNo":null,"customerBanks":[],"creditLevel":3,"vipLevelScore":1,"vipLevelNameZh":"普通","vipLevelNameEn":"common","creditLevelScore":400,"creditLevelNameZh":"信用良好","creditLevelNameEn":"good credit","customerServiceName":null,"consigneeFirstCustomerService":null,"isNew":true,"resourceType":1,"isInOpenSea":false,"enterOpenSeaTime":null,"estimateEnterOpenSeaTime":null,"catchTime":null,"promoterName":null,"enquiryInfo":null,"isCustomerServiceConfirmed":false,"isWebOrderConsigneeSync":false,"isPotential":false,"founderName":"yanghao","customerBankBackVOList":[],"countryNameZh":"新加坡","countryNameEn":"Singapore","productTypeNameZh":null,"productTypeNameEn":null,"productNameZh":null,"productNameEn":null,"pickupPointNameZh":null,"pickupPointNameEn":null}
+{"inquiry":null,"id":"38155","number":"SGP00004","name":"yh2345","nameEn":null,"level":1,"country":194,"type":"0,1","transportType":"1","agentId":null,"company":"","companyEn":null,"payerName":null,"address":null,"productType":null,"productId":null,"pickupPoint":null,"memberId":null,"birthday":null,"balance":null,"source":5,"picture":null,"customerService":null,"customerContacts":[{"customerId":38155,"department":"","position":"","name":"yh12345","nameEn":"","social":null,"socialNumber":"","email":"","isDefault":1,"userid":null,"username":null,"areaCode":"65","phoneNew":"66666666","createTime":1692929203000,"id":69056,"customerContactsId":69056,"customerName":null,"company":""}],"customerLines":[],"lightUnit":null,"promoter":null,"status":1,"founder":118,"department":null,"invoiceTitle":null,"licenseNumber":null,"bank":null,"bankNumber":null,"project":null,"billingAddress":null,"billingTell":null,"taxRate":0,"remarks":null,"arrivalConfirm":0,"weightUnit":null,"createTime":1692924735000,"isShowTidanPrice":true,"carName":null,"carNo":null,"customerBanks":[],"creditLevel":3,"vipLevelScore":1,"vipLevelNameZh":"普通","vipLevelNameEn":"common","creditLevelScore":400,"creditLevelNameZh":"信用良好","creditLevelNameEn":"good credit","customerServiceName":null,"consigneeFirstCustomerService":null,"isNew":true,"resourceType":1,"isInOpenSea":false,"enterOpenSeaTime":null,"estimateEnterOpenSeaTime":null,"catchTime":null,"promoterName":null,"enquiryInfo":null,"isCustomerServiceConfirmed":false,"isWebOrderConsigneeSync":false,"isPotential":false,"founderName":"yanghao","customerBankBackVOList":[],"countryNameZh":"新加坡","countryNameEn":"Singapore","productTypeNameZh":null,"productTypeNameEn":null,"productNameZh":null,"productNameEn":null}