Skip to content

J
jiedao-api-boot-master
Commit 08b09baa authored by Smile's avatar Smile
Browse files
Options

TODO:app添加法语后台修改

parent 19706490
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1801 additions and 139 deletions
sql/v2.3/20241203lh.sql 0 → 100644
View file @ 08b09baa
--数据库字段添加
ALTER TABLE system_dict_data ADD COLUMN label_fr VARCHAR(100) COMMENT '字典标签法文';
ALTER TABLE ecw_region ADD COLUMN title_fr VARCHAR(255) COMMENT '地区法文';
ALTER TABLE ecw_warehouse ADD COLUMN title_fr VARCHAR(500) COMMENT '法文名称';
ALTER TABLE ecw_warehouse ADD COLUMN address_fr VARCHAR(500) COMMENT '法文地址';
ALTER TABLE ecw_product ADD COLUMN title_fr VARCHAR(255) COMMENT '法文标题';
ALTER TABLE ecw_product_attr ADD COLUMN attr_name_fr VARCHAR(255) COMMENT '属性法文';
ALTER TABLE system_help_doc ADD COLUMN title_fr VARCHAR(500) COMMENT '标题法文';
ALTER TABLE system_help_doc ADD COLUMN content_fr longtext COMMENT '内容法文';
ALTER TABLE system_need_know ADD COLUMN title_fr VARCHAR(500) COMMENT '标题法文';
ALTER TABLE system_need_know ADD COLUMN content_fr longtext COMMENT '内容法文';
ALTER TABLE ecw_unit ADD COLUMN title_fr VARCHAR(100) COMMENT '法文名称';
alter table ecw_currency_ecash add column title_fr VARCHAR(100) COMMENT '法文名称';
ALTER TABLE score_rule ADD COLUMN title_fr VARCHAR(255) COMMENT '规则标题法文';
ALTER TABLE score_rule ADD COLUMN desc_fr VARCHAR(255) COMMENT '规则说明法文';
alter table score_rule add COLUMN `cover_image_fr` varchar(255) DEFAULT NULL COMMENT '封面图法文';
ALTER TABLE system_notice ADD COLUMN title_fr VARCHAR(255) COMMENT '公告标题法文';
ALTER TABLE system_notice ADD COLUMN content_fr text COMMENT '公告内容法文';
alter table ecw_order_item add COLUMN `prod_title_fr` varchar(255) DEFAULT NULL COMMENT '产品法文标题';
alter table ecw_order_item add COLUMN `check_prod_title_fr` varchar(255) DEFAULT NULL COMMENT '到仓产品法文英文标题';
alter table ecw_product_brank add COLUMN `title_fr` varchar(255) DEFAULT NULL COMMENT '品牌法文标题';
alter table ecw_channel add COLUMN `name_fr` varchar(64) DEFAULT NULL COMMENT '名称-法文';
alter table ecw_channel add COLUMN `internal_name_fr` varchar(64) DEFAULT NULL COMMENT '内部名称-法文';
alter table ecw_channel add COLUMN `remarks_fr` varchar(255) DEFAULT NULL COMMENT '备注-法文';
alter table ecw_order_time add COLUMN `title_fr` varchar(255) DEFAULT NULL COMMENT '名称-法文';
alter table ecw_order_time add COLUMN `remarks_fr` varchar(255) DEFAULT NULL COMMENT '法文备注';
--渠道表法语内容添加
UPDATE ecw_channel
SET name_fr = 'Vols préférentiels' WHERE name_zh = '尼特惠';
UPDATE ecw_channel
SET name_fr = 'Marchandises spéciales (Hong Kong)' WHERE name_zh = '尼特货';
UPDATE ecw_channel
SET name_fr = 'Vols préférentiels' WHERE name_zh = '尼特惠航班';
UPDATE ecw_channel
SET name_fr = 'Marchandises normales du Ghana' WHERE name_zh = '加纳特惠';
UPDATE ecw_channel
SET name_fr = 'Marchandises spéciales du Ghana' WHERE name_zh = '加纳特货';
UPDATE ecw_channel
SET name_fr = 'Vol F-NIG' WHERE name_zh = '尼特快';
UPDATE ecw_channel
SET name_fr = 'Offre spéciale-Onitsha' WHERE name_zh = '尼特惠-Onitsha';
UPDATE ecw_channel
SET name_fr = 'Marchandises spéciales-Kano' WHERE name_zh = '尼特货-kano';
UPDATE ecw_channel
SET name_fr = 'Marchandises spéciales-Onitsha' WHERE name_zh = '尼特货-Onitsha';
UPDATE ecw_channel
SET name_fr = 'Offre spéciale-Kano' WHERE name_zh = '尼特惠-kano';
UPDATE ecw_channel
SET name_fr = 'Cargo aérien Tanzanie' WHERE name_zh = '坦桑尼亚空运';
UPDATE ecw_channel
SET name_fr = 'Cargo aérien marchandises spéciales Tanzanie' WHERE name_zh = '坦桑特货';
UPDATE ecw_channel
SET name_fr = 'Cargo aérien Kenya' WHERE name_zh = '肯尼亚空运';
UPDATE ecw_channel
SET name_fr = 'Cargo aérien Kenya' WHERE name_zh = '肯尼亚特货';
UPDATE ecw_channel
SET name_fr = 'Cargo maritime & aérien' WHERE name_zh = '海空联运';
UPDATE ecw_channel
SET internal_name_fr = 'Vols préférentiels' WHERE name_zh = '尼特惠';
UPDATE ecw_channel
SET internal_name_fr = 'Marchandises spéciales (Hong Kong)' WHERE name_zh = '尼特货';
UPDATE ecw_channel
SET internal_name_fr = 'Vols préférentiels' WHERE name_zh = '尼特惠航班';
UPDATE ecw_channel
SET internal_name_fr = 'Marchandises normales du Ghana' WHERE name_zh = '加纳特惠';
UPDATE ecw_channel
SET internal_name_fr = 'Marchandises spéciales du Ghana' WHERE name_zh = '加纳特货';
UPDATE ecw_channel
SET internal_name_fr = 'Vol F-NIG' WHERE name_zh = '尼特快';
UPDATE ecw_channel
SET internal_name_fr = 'Offre spéciale-Onitsha' WHERE name_zh = '尼特惠-Onitsha';
UPDATE ecw_channel
SET internal_name_fr = 'Marchandises spéciales-Kano' WHERE name_zh = '尼特货-kano';
UPDATE ecw_channel
SET internal_name_fr = 'Marchandises spéciales-Onitsha' WHERE name_zh = '尼特货-Onitsha';
UPDATE ecw_channel
SET internal_name_fr = 'Offre spéciale-Kano' WHERE name_zh = '尼特惠-kano';
UPDATE ecw_channel
SET internal_name_fr = 'Cargo aérien Tanzanie' WHERE name_zh = '坦桑尼亚空运';
UPDATE ecw_channel
SET internal_name_fr = 'Cargo aérien marchandises spéciales Tanzanie' WHERE name_zh = '坦桑特货';
UPDATE ecw_channel
SET internal_name_fr = 'Cargo aérien Kenya' WHERE name_zh = '肯尼亚空运';
UPDATE ecw_channel
SET internal_name_fr = 'Cargo aérien Kenya' WHERE name_zh = '肯尼亚特货';
UPDATE ecw_channel
SET internal_name_fr = 'Cargo maritime & aérien' WHERE name_zh = '海空联运';
\ No newline at end of file
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/dict/core/dto/DictDataRespDTO.java
View file @ 08b09baa
......@@ -19,6 +19,10 @@ public class DictDataRespDTO {
* 字典英文标签
*/
private String labelEn;
/**
* 字典英文标签
*/
private String labelFr;
/**
* 字典值
*/
......
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/i18n/core/I18nMessage.java
View file @ 08b09baa
......@@ -65,7 +65,7 @@ public class I18nMessage {
* @return
*/
public static String getMessage(String message, Integer lang) {
Locale locale = lang == 0 ? Locale.SIMPLIFIED_CHINESE : Locale.ENGLISH;
Locale locale = Languages.getLocaleByCode(lang);
try {
return accessor.getMessage(message, locale);
} catch (Exception e) {
......
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/i18n/core/LangEnum.java
View file @ 08b09baa
......@@ -19,7 +19,11 @@ public enum LangEnum {
ZH("zh", 0),
/*** 英文 */
EN("en", 1);
EN("en", 1),
/*** 法文 */
FR("fr", 2);
private String language;
......
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/i18n/core/Languages.java 0 → 100644
View file @ 08b09baa
package cn.iocoder.yudao.framework.i18n.core;
import lombok.AllArgsConstructor;
import lombok.Getter;
import java.util.Locale;
@Getter
public enum Languages {
SIMPLIFIED_CHINESE(0, Locale.SIMPLIFIED_CHINESE),
ENGLISH(1, Locale.ENGLISH),
// 集成法语
FRENCH(2, Locale.FRENCH);
private int code;
private Locale locale;
Languages(int code, Locale locale) {
this.code = code;
this.locale = locale;
}
public int getCode() {
return code;
}
public Locale getLocale() {
return locale;
}
public static Locale getLocaleByCode(int code) {
for (Languages languages : values()) {
if (languages.getCode() == code) {
return languages.getLocale();
}
}
// 默认返回简体中文
return SIMPLIFIED_CHINESE.getLocale();
}
}
yudao-module-depository/yudao-module-depository-core/src/main/java/cn/iocoder/yudao/module/depository/dal/dataobject/warehouse/WarehouseDO.java
View file @ 08b09baa
......@@ -57,6 +57,10 @@ public class WarehouseDO extends BaseDO implements Serializable {
* 英文名称
*/
private String titleEn;
/**
* 英文名称
*/
private String titleFr;
/**
* 容量
*/
......@@ -69,6 +73,10 @@ public class WarehouseDO extends BaseDO implements Serializable {
* 英文地址
*/
private String addressEn;
/**
* 英文地址
*/
private String addressFr;
/**
* 洲
*/
......
yudao-module-depository/yudao-module-depository-core/src/main/java/cn/iocoder/yudao/module/depository/dal/dataobject/warehouse/WarehouseLineDO.java
View file @ 08b09baa
......@@ -100,10 +100,14 @@ public class WarehouseLineDO extends BaseDO {
@TableField(exist = false)
private String startTitleEn;
@TableField(exist = false)
private String startTitleFr;
@TableField(exist = false)
private String destTitleZh;
@TableField(exist = false)
private String destTitleEn;
@TableField(exist = false)
private String destTitleFr;
@TableField(exist = false)
private Long startCityId;
@TableField(exist = false)
private Long destCityId;
......
yudao-module-depository/yudao-module-depository-core/src/main/java/cn/iocoder/yudao/module/depository/dal/mysql/warehouse/WarehouseLineMapper.java
View file @ 08b09baa
......@@ -68,14 +68,17 @@ public interface WarehouseLineMapper extends BaseMapperX<WarehouseLineDO> {
"ew_start.guojia as start_country_id,",
"ew_start.title_zh as start_title_zh,",
"ew_start.title_en as start_title_en,",
"ew_start.title_fr as start_title_fr,",
"ew_start.qianzhui as start_qianzhui,",
"ew_start_country.title_zh as start_country_title_zh,",
"ew_start_country.title_en as start_country_title_en,",
"ew_start_country.title_fr as start_country_title_fr,",
"ew_start.volume as start_volume,",
"ew_start.rent_free_days as start_rent_free_days,",
"ew_start.lock_recipient_days as start_lock_recipient_days,",
"ew_start.address_zh as start_address_zh,",
"ew_start.address_en as start_address_en,",
"ew_start.address_fr as start_address_fr,",
"ew_start.head as start_head,",
"ew_start.tell as start_tell,",
"ew_start.kyc_status as kycStatus,",
......@@ -83,16 +86,20 @@ public interface WarehouseLineMapper extends BaseMapperX<WarehouseLineDO> {
"ew_dest.guojia as dest_country_id,",
"ew_dest.title_zh as dest_title_zh,",
"ew_dest.title_en as dest_title_en,",
"ew_dest.title_fr as dest_title_fr,",
"ew_dest.qianzhui as dest_qianzhui,",
"ew_dest_country.title_zh as dest_country_title_zh,",
"ew_dest_country.title_en as dest_country_title_en,",
"ew_dest_country.title_fr as dest_country_title_fr,",
"ew_dest_city.title_zh as dest_city_title_zh,",
"ew_dest_city.title_en as dest_city_title_en,",
"ew_dest_city.title_fr as dest_city_title_fr,",
"ew_dest.volume as dest_volume,",
"ew_dest.rent_free_days as dest_rent_free_days,",
"ew_dest.lock_recipient_days as dest_lock_recipient_days,",
"ew_dest.address_zh as dest_address_zh,",
"ew_dest.address_en as dest_address_en,",
"ew_dest.address_fr as dest_address_fr,",
"ew_dest.head as dest_head,",
"ew_dest.tell as dest_tell",
"FROM",
......
yudao-module-depository/yudao-module-depository-core/src/main/java/cn/iocoder/yudao/module/depository/dal/mysql/warehouse/WarehouseMapper.java
View file @ 08b09baa
......@@ -142,12 +142,15 @@ public interface WarehouseMapper extends BaseMapperX<WarehouseDO> {
"w.id as warehouseId,",
"w.title_zh as warehouseTitleZh,",
"w.title_en as warehouseTitleEn,",
"w.title_fr as warehouseTitleFr,",
"r1.id as guojia,",
"r1.title_zh as guojiaName,",
"r1.title_en as guojiaNameEn,",
"r1.title_fr as guojiaNameFr,",
"r2.id as shi, ",
"r2.title_zh as shiName, ",
"r2.title_en as shiNameEn ",
"r2.title_en as shiNameEn, ",
"r2.title_fr as shiNameFr ",
"FROM ecw_warehouse w ",
"LEFT JOIN ecw_region r1 ",
"ON w.guojia = r1.id ",
......
yudao-module-depository/yudao-module-depository-core/src/main/java/cn/iocoder/yudao/module/depository/dto/LogisticsInfoDto.java
View file @ 08b09baa
......@@ -23,6 +23,9 @@ public class LogisticsInfoDto {
@ApiModelProperty(value = "始发地仓库英文名称")
private String startTitleEn;
@ApiModelProperty(value = "始发地仓库法文名称")
private String startTitleFr;
@ApiModelProperty(value = "始发地仓库前缀简称")
private String startQianzhui;
......@@ -32,6 +35,9 @@ public class LogisticsInfoDto {
@ApiModelProperty(value = "始发地国家英文名称")
private String startCountryTitleEn;
@ApiModelProperty(value = "始发地国家法文名称")
private String startCountryTitleFr;
// @ApiModelProperty(value = "始发地城市中文名称")
// private String startCityTitleZh;
//
......@@ -53,6 +59,9 @@ public class LogisticsInfoDto {
@ApiModelProperty(value = "始发地仓库英文地址")
private String startAddressEn;
@ApiModelProperty(value = "始发地仓库法文地址")
private String startAddressFr;
@ApiModelProperty(value = "始发地仓库负责人")
private String startHead;
......@@ -73,6 +82,10 @@ public class LogisticsInfoDto {
@ApiModelProperty(value = "目的地仓库英文名称")
private String destTitleEn;
@ApiModelProperty(value = "目的地仓库法文名称")
private String destTitleFr;
@ApiModelProperty(value = "目的地仓库前缀简称")
private String destQianzhui;
......@@ -82,12 +95,18 @@ public class LogisticsInfoDto {
@ApiModelProperty(value = "目的地国家英文名称")
private String destCountryTitleEn;
@ApiModelProperty(value = "目的地国家法文名称")
private String destCountryTitleFr;
@ApiModelProperty(value = "目的地城市中文名称")
private String destCityTitleZh;
@ApiModelProperty(value = "目的地城市英文名称")
private String destCityTitleEn;
@ApiModelProperty(value = "目的地城市法文名称")
private String destCityTitleFr;
@ApiModelProperty(value = "目的地仓库容量")
private String destVolume;
......@@ -103,6 +122,9 @@ public class LogisticsInfoDto {
@ApiModelProperty(value = "目的地仓库英文地址")
private String destAddressEn;
@ApiModelProperty(value = "目的地仓库法文地址")
private String destAddressFr;
@ApiModelProperty(value = "目的地仓库负责人")
private String destHead;
......
yudao-module-depository/yudao-module-depository-core/src/main/java/cn/iocoder/yudao/module/depository/service/warehouse/impl/WarehouseServiceImpl.java
View file @ 08b09baa
......@@ -556,7 +556,7 @@ public class WarehouseServiceImpl implements WarehouseService {
}
@Override
@Cacheable(cacheNames = "jd:warehouse:list", key = "#tradeType")
// @Cacheable(cacheNames = "jd:warehouse:list", key = "#tradeType")
public WarehouseListVO getGuojiaAndShiAndWarehouseList(Integer tradeType) {
WarehouseListVO vo = new WarehouseListVO();
List<WarehouseTreeVO> list = warehouseMapper.getWarehouseTreeList(tradeType);
......@@ -571,7 +571,9 @@ public class WarehouseServiceImpl implements WarehouseService {
WarehouseTreeVO warehouseTreeVO = warehouseList.get(0);
v.setShiName(warehouseTreeVO.getShiName());
v.setShiNameEn(warehouseTreeVO.getShiNameEn());
v.setShiNameFr(warehouseTreeVO.getShiNameFr());
v.setGuojiaNameEn(warehouseTreeVO.getGuojiaNameEn());
v.setGuojiaNameFr(warehouseTreeVO.getGuojiaNameFr());
v.setGuojiaName(warehouseTreeVO.getGuojiaName());
v.setGuojia(warehouseTreeVO.getGuojia());
shiVOList.add(v);
......@@ -586,6 +588,7 @@ public class WarehouseServiceImpl implements WarehouseService {
List<WarehouseTreeVO> shiWarehouseList = entry.getValue();
WarehouseTreeVO warehouseTreeVO = shiWarehouseList.get(0);
v.setGuojiaNameEn(warehouseTreeVO.getGuojiaNameEn());
v.setGuojiaNameFr(warehouseTreeVO.getGuojiaNameFr());
v.setGuojiaName(warehouseTreeVO.getGuojiaName());
guojiaList.add(v);
}
......
yudao-module-depository/yudao-module-depository-core/src/main/java/cn/iocoder/yudao/module/depository/vo/warehouse/WarehouseTreeVO.java
View file @ 08b09baa
......@@ -16,19 +16,24 @@ public class WarehouseTreeVO {
private String guojiaName ;
@ApiModelProperty("国家英文名称")
private String guojiaNameEn ;
@ApiModelProperty("国家法文名称")
private String guojiaNameFr ;
@ApiModelProperty("城市区域id")
private Long shi;
@ApiModelProperty("城市中文名称")
private String shiName;
@ApiModelProperty("城市英文名称")
private String shiNameEn;
@ApiModelProperty("城市法文名称")
private String shiNameFr;
@ApiModelProperty("仓库id")
private Long warehouseId;
@ApiModelProperty("仓库中文名称")
private String warehouseTitleZh;
@ApiModelProperty("仓库英文名称")
private String warehouseTitleEn;
@ApiModelProperty("仓库法文名称")
private String warehouseTitleFr;
@ApiModelProperty(value = "子元素", example = "true")
......
yudao-module-depository/yudao-module-depository-core/src/main/resources/mapper/warehouse/WarehouseLineMapper.xml
View file @ 08b09baa
......@@ -13,8 +13,10 @@
<result property="destQianzhui" column="dest_qianzhui" />
<result property="startTitleZh" column="start_title_zh" />
<result property="startTitleEn" column="start_title_en" />
<result property="startTitleFr" column="start_title_fr" />
<result property="destTitleZh" column="dest_title_zh" />
<result property="destTitleEn" column="dest_title_en" />
<result property="destTitleFr" column="dest_title_fr" />
</resultMap>
<select id="openedRouterList" resultMap="warehouseLineEntity">
......@@ -22,10 +24,12 @@
ewl.*,
ew_start.title_zh start_title_zh,
ew_start.title_en start_title_en,
ew_start.title_fr start_title_fr,
ew_start.qianzhui start_qianzhui,
ew_dest.qianzhui dest_qianzhui,
ew_dest.title_zh dest_title_zh,
ew_dest.title_en dest_title_en,
ew_dest.title_fr dest_title_fr,
ew_start.shi start_city_id,
ew_dest.shi dest_city_id,
ew_start.guojia start_country_id,
......
yudao-module-ecw/yudao-module-ecw-impl/src/main/java/cn/iocoder/yudao/module/ecw/controller/admin/region/vo/RegionBaseVO.java
View file @ 08b09baa
......@@ -19,6 +19,10 @@ public class RegionBaseVO {
@NotNull(message = "地区英文不能为空")
private String titleEn;
@ApiModelProperty(value = "地区法文", required = true)
@NotNull(message = "地区法文不能为空")
private String titleFr;
@ApiModelProperty(value = "简称", required = true)
@NotNull(message = "简称不能为空")
private String shortName;
......
yudao-module-ecw/yudao-module-ecw-impl/src/main/java/cn/iocoder/yudao/module/ecw/controller/admin/unit/vo/UnitBaseVO.java
View file @ 08b09baa
......@@ -16,6 +16,9 @@ public class UnitBaseVO {
@ApiModelProperty(value = "英文名称")
private String titleEn;
@ApiModelProperty(value = "法文名称")
private String titleFr;
@ApiModelProperty(value = "单位符号")
private String fuhao;
......
yudao-module-ecw/yudao-module-ecw-impl/src/main/java/cn/iocoder/yudao/module/ecw/dal/dataobject/country/CountryDO.java
View file @ 08b09baa
......@@ -31,6 +31,10 @@ public class CountryDO extends BaseDO {
* 国家英文名称
*/
private String nameEn;
/**
* 国家法文名称
*/
private String nameFr;
/**
* 简称
*/
......
yudao-module-ecw/yudao-module-ecw-impl/src/main/java/cn/iocoder/yudao/module/ecw/dal/dataobject/region/RegionDO.java
View file @ 08b09baa
......@@ -31,6 +31,10 @@ public class RegionDO extends BaseDO {
* 地区英文
*/
private String titleEn;
/**
* 地区法文
*/
private String titleFr;
/**
* 简称
*/
......
yudao-module-ecw/yudao-module-ecw-impl/src/main/java/cn/iocoder/yudao/module/ecw/dal/dataobject/unit/UnitDO.java
View file @ 08b09baa
......@@ -19,7 +19,7 @@ import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
public class UnitDO extends BaseDO {
/**
*
*
*/
@TableId
private Integer id;
......@@ -31,6 +31,10 @@ public class UnitDO extends BaseDO {
* 英文名称
*/
private String titleEn;
/**
* 法文名称
*/
private String titleFr;
/**
* 单位符号
*/
......
yudao-module-ecw/yudao-module-ecw-impl/src/main/java/cn/iocoder/yudao/module/ecw/dal/mysql/country/CountryMapper.java
View file @ 08b09baa
......@@ -38,6 +38,7 @@ public interface CountryMapper extends AbstractMapper<CountryDO> {
return selectList(new LambdaQuery<CountryDO>()
.likeIfPresent(CountryDO::getNameZh, vo.getNameZh())
.likeIfPresent(CountryDO::getNameEn, vo.getNameEn())
.likeIfPresent(CountryDO::getNameFr, vo.getNameFr())
.likeIfPresent(CountryDO::getNameShort, vo.getNameShort())
.likeIfPresent(CountryDO::getTel, vo.getTel())
.betweenIfPresent(CountryDO::getCreateTime, vo.getBeginCreateTime(), vo.getEndCreateTime())
......
yudao-module-ecw/yudao-module-ecw-impl/src/main/java/cn/iocoder/yudao/module/ecw/vo/country/CountryBackVO.java
View file @ 08b09baa
......@@ -30,6 +30,10 @@ public class CountryBackVO {
@ApiModelProperty(value = "国家英文名称", required = true)
private String nameEn;
@ExcelProperty("国家法文名称")
@ApiModelProperty(value = "国家法文名称", required = true)
private String nameFr;
@ExcelProperty("简称")
@ApiModelProperty(value = "简称")
private String nameShort;
......
yudao-module-ecw/yudao-module-ecw-impl/src/main/java/cn/iocoder/yudao/module/ecw/vo/country/CountryQueryVO.java
View file @ 08b09baa
......@@ -17,6 +17,9 @@ public class CountryQueryVO {
@ApiModelProperty(value = "国家英文名称")
private String nameEn;
@ApiModelProperty(value = "国家法文名称")
private String nameFr;
@ApiModelProperty(value = "简称")
private String nameShort;
......
yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/controller/app/scoreRule/vo/AppScoreRuleListBackVO.java
View file @ 08b09baa
......@@ -28,24 +28,36 @@ public class AppScoreRuleListBackVO {
@ApiModelProperty(value = "指标类型英文")
private String typeEn;
@ApiModelProperty(value = "指标类型法文")
private String typeFr;
@ApiModelProperty(value = "规则标题中文", required = true)
private String titleZh;
@ApiModelProperty(value = "规则标题英文", required = true)
private String titleEn;
@ApiModelProperty(value = "规则标题法文", required = true)
private String titleFr;
@ApiModelProperty(value = "规则说明中文", required = true)
private String descZh;
@ApiModelProperty(value = "规则说明英文", required = true)
private String descEn;
@ApiModelProperty(value = "规则说明法文", required = true)
private String descFr;
@ApiModelProperty(value = "封面图中文")
private String coverImageZh;
@ApiModelProperty(value = "封面图英文")
private String coverImageEn;
@ApiModelProperty(value = "封面图法文")
private String coverImageFr;
@ApiModelProperty(value = "推荐扩展字段")
private ScoreRulerRecommendExtraVO extraRecommend;
@ApiModelProperty(value = "推荐链接")
......
yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/scoreRule/ScoreRuleDO.java
View file @ 08b09baa
......@@ -40,6 +40,10 @@ public class ScoreRuleDO extends BaseDO {
* 规则标题英文
*/
private String titleEn;
/**
* 规则标题法文
*/
private String titleFr;
/**
* 规则说明中文
*/
......@@ -48,6 +52,10 @@ public class ScoreRuleDO extends BaseDO {
* 规则说明英文
*/
private String descEn;
/**
* 规则说明法文
*/
private String descFr;
/**
* 封面图中文
*/
......@@ -56,6 +64,10 @@ public class ScoreRuleDO extends BaseDO {
* 封面图英文
*/
private String coverImageEn;
/**
* 封面图法文
*/
private String coverImageFr;
/**
* 单次获取积分数
*/
......
yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/service/scoreRule/ScoreRuleServiceImpl.java
View file @ 08b09baa
......@@ -687,6 +687,7 @@ public class ScoreRuleServiceImpl extends AbstractService<ScoreRuleMapper, Score
String type = appScoreRuleBackDetailVO.getType().toString();
appScoreRuleBackDetailVO.setTypeZh(DictFrameworkUtils.getDictDataFromCache("score_rule_type", type).getLabel());
appScoreRuleBackDetailVO.setTypeEn(DictFrameworkUtils.getDictDataFromCache("score_rule_type", type).getLabelEn());
appScoreRuleBackDetailVO.setTypeFr(DictFrameworkUtils.getDictDataFromCache("score_rule_type", type).getLabelFr());
return appScoreRuleBackDetailVO;
}
......
yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/vo/scoreRule/ScoreRuleBackVO.java
View file @ 08b09baa
......@@ -38,6 +38,10 @@ public class ScoreRuleBackVO {
@ApiModelProperty(value = "规则标题英文", required = true)
private String titleEn;
@ExcelProperty("规则标题法文")
@ApiModelProperty(value = "规则标题法文", required = true)
private String titleFr;
@ExcelProperty("规则说明中文")
@ApiModelProperty(value = "规则说明中文", required = true)
private String descZh;
......@@ -46,6 +50,10 @@ public class ScoreRuleBackVO {
@ApiModelProperty(value = "规则说明英文", required = true)
private String descEn;
@ExcelProperty("规则说明法文")
@ApiModelProperty(value = "规则说明英文", required = true)
private String descFr;
@ExcelProperty("封面图中文")
@ApiModelProperty(value = "封面图中文")
private String coverImageZh;
......@@ -54,6 +62,10 @@ public class ScoreRuleBackVO {
@ApiModelProperty(value = "封面图英文")
private String coverImageEn;
@ExcelProperty("封面图法文")
@ApiModelProperty(value = "封面图法文")
private String coverImageFr;
@ExcelProperty("单次获取积分数")
@ApiModelProperty(value = "单次获取积分数", required = true)
private Integer getScoreOnce;
......
yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/vo/scoreRule/extra/ScoreRuleShareExtraVO.java
View file @ 08b09baa
......@@ -11,6 +11,8 @@ public class ScoreRuleShareExtraVO {
private String activityDescZh ;
@ApiModelProperty(value = "英文活动内容", required = true)
private String activityDescEn ;
@ApiModelProperty(value = "法文活动内容", required = true)
private String activityDescFr ;
@ApiModelProperty(value = "活动链接", required = true)
private String activityUrl ;
@ApiModelProperty(value = "是否分享（0是，1否）默认是", required = true)
......
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/dal/dataobject/order/OrderDO.java
View file @ 08b09baa
......@@ -615,6 +615,9 @@ public class OrderDO extends BaseDO {
@TableField(exist = false)
@ApiModelProperty(value = "入仓状态变更前缀(例如：理货移除、预装移除、撤销拆单、装柜移除)")
private String prefixStatusEn = "";
@TableField(exist = false)
@ApiModelProperty(value = "入仓状态变更前缀(例如：理货移除、预装移除、撤销拆单、装柜移除)")
private String prefixStatusFr = "";
@TableField(exist = false)
@ApiModelProperty(value = "是否主拆单")
......
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/dal/dataobject/orderItem/OrderItemDO.java
View file @ 08b09baa
......@@ -81,6 +81,10 @@ public class OrderItemDO extends BaseDO {
* 产品英文标题
*/
private String prodTitleEn;
/**
* 产品法文标题
*/
private String prodTitleFr;
@ApiModelProperty(value = "商品第三方链接")
private String link;
......@@ -429,6 +433,9 @@ public class OrderItemDO extends BaseDO {
@ApiModelProperty(value = "到仓产品英文标题")
private String checkProdTitleEn;
@ApiModelProperty(value = "到仓产品法文标题")
private String checkProdTitleFr;
@ApiModelProperty(value = "到仓材质")
private String checkMaterial;
......
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/dal/dataobject/orderTime/OrderTimeDO.java
View file @ 08b09baa
......@@ -35,13 +35,17 @@ public class OrderTimeDO extends BaseDO {
*/
private Integer status;
/**
*
*
*/
private String titleZh;
/**
*
*
*/
private String titleEn;
/**
* 法文名称
*/
private String titleFr;
/**
* 中文备注
......@@ -51,6 +55,10 @@ public class OrderTimeDO extends BaseDO {
* 英文备注
*/
private String remarksEn;
/**
* 法文备注
*/
private String remarksFr;
/**
* 类型
......
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/dal/mysql/orderItem/OrderItemMapper.java
View file @ 08b09baa
......@@ -166,8 +166,18 @@ public interface OrderItemMapper extends AbstractMapper<OrderItemDO> {
"(oi.original_clearance_freight + oi.packaging_freight_price + oi.brand_clearance_fee_price + oi.electrified_clearance_fee_price + oi.liquid_clearance_fee_price - oi.discount_clearance_fee_price) as after_discount_clearance_freight, ",
"IF(o.order_type != 2 and (SELECT COUNT(1) FROM ecw_order_exception hoe WHERE hoe.order_id = o.order_id AND hoe.deleted = 0 AND hoe.order_exception_status = 0 AND hoe.order_exception_type ='order_heavy_cargo_exception') = 0, IFNULL(oi.warehouse_in_info ->> '$.volume', oi.volume), oi.w_volume ) as we_volume,",
"IF(o.order_type != 3 and (SELECT COUNT(1) FROM ecw_order_exception boe WHERE boe.order_id = o.order_id AND boe.deleted = 0 AND boe.order_exception_status = 0 AND boe.order_exception_type ='order_bulky_cargo_exception') = 0, IFNULL(oi.warehouse_in_info ->> '$.weight', oi.weight), oi.v_weight ) as vo_weight,",
"IF(#{lang} = 0, pd.title_zh, pd.title_en) as brand_name, ",
"IF(#{lang} = 0, pdc.title_zh, pdc.title_en) as brand_name ",
"CASE #{lang} ",
"WHEN 0 THEN pd.title_zh ",
"WHEN 1 THEN pd.title_en ",
"WHEN 2 THEN pd.title_fr ",
"ELSE pd.title_zh ",
"END as brand_name ,",
"CASE #{lang} ",
"WHEN 0 THEN pdc.title_zh ",
"WHEN 1 THEN pdc.title_en ",
"WHEN 2 THEN pdc.title_fr ",
"ELSE pdc.title_zh ",
"END as check_brand ",
"from ecw_order_item oi",
"left join ecw_product_brank pd",
"on pd.id = oi.brand",
......
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/enums/OrderAirTimeEnum.java
View file @ 08b09baa
......@@ -11,30 +11,30 @@ import java.util.Arrays;
@Getter
public enum OrderAirTimeEnum implements IntArrayValuable {
//1未使用
AIR_ORDER_PLACED(200, "下单", "Order placed", "",""),
AIR_ORDER_PLACED(200, "下单", "Order placed","Commande passée", "","",""),
// AIR_IN_WAREHOUSE(520201, "入仓", "Warehousing", "货物已入捷道%s","The shipment has been delivered to E&C %s"),
// SEA_IN_WAREHOUSE(520201, "入仓", "Warehousing", "货物已入捷道%s，本次入仓%s件，总入仓%s件","%s ctns have been arrived at E&C %s warehouse，TTL ctns are %s."),
AIR_IN_WAREHOUSE(520201, "入仓", "Received", "货物已入捷道%s，本次入仓%s件，总入仓%s件","%s ctns have been arrived at E&C %s warehouse，TTL ctns are %s."),
AIR_IN_WAREHOUSE(520201, "入仓", "Received", "Reçu", "货物已入捷道%s，本次入仓%s件，总入仓%s件","%s ctns have been arrived at E&C %s warehouse,TTL ctns are %s.","%s colis sont arrivés à l'entrepôt E&C %s, Total est %s."),
// SEA_IN_WAREHOUSE_REMARK(520201, "入仓", "Warehousing", "货物已入捷道%s，本次入仓%s件，总入仓%s件，未到齐","%s ctns have been arrived at E&C %s warehouse，TTL ctns are %s. Incomplete"),
AIR_IN_WAREHOUSE_REMARK(520201, "入仓", "Received", "货物已入捷道%s，总入仓%s件，未到齐","%s ctns have been arrived at E&C %s warehouse，TTL ctns are %s. Incomplete"),
AIR_PACKED(520202, "打包", "Packed", "货物已完成二次打包","The shipment has been packed, waiting to be dispatched."),// 打包完成时调用
AIR_WAREHOUSED(320412,"出仓", "Dispatched","货物已出库，发往国际机场","One the way to China International airport."),
AIR_CUSTOMS_IN_PROGRESS(120413, "报关", "Customs Declaration", "由于%s原因，待放行","Due to %s reasons, awaiting release"),
AIR_CUSTOMS_PASS_AIR(120421, "报关", "Customs Declaration", "货物报关已放行，候机中","Shipment has been released by China custom, waiting to departed China."),
AIR_CUSTOMS_PART_EXIT(120414, "报关", "Customs Inspection", "报关查验退场，返回仓库中","The shipment has been Inspected by China custom,waiting to return back to the warehouse."),
AIR_CUSTOMS_FULL_EXIT(120415, "报关", "Customs Inspection", "报关查验退场，返回仓库中","The shipment has been Inspected by China custom,waiting to return back to the warehouse."),
AIR_HAS_TAKEN_OFF(13042601, "起运", "Departed", "货物已起飞，预计在%s日期抵达%s机场","The shipment has departed China.ETA date to %s is %s"),
AIR_HAS_TAKEN_OFF_DELAY(13042602, "起运", "Departed", "由于%s原因，延误起飞","Delayed takeoff due to %s"),
AIR_ARRIVED(14032801, "到港", "Arrived", "货物已抵达%s机场，清关中","The shipment has arrived at %s airport.waiting for custom declaration to be done."),
AIR_ARRIVED_DELAY(14032802, "到港", "Arrived", "由于%s原因，延误抵达目的地","Due to %s reasons, delayed arrival at the destination"),
AIR_CLEARED_DELAY(14032803, "清关", "Cleared out", "由于%s原因，待清关","Due to %s reasons, customs clearance is pending"),
AIR_CLEARED(150330, "清关", "Customs cleared", "货物已清关","Customs clearance of the shipment has been completed."),
AIR_UNLOADED_CABINET(16043501,"到仓", "Delivered","货物已抵达捷道%s提货仓","The shipment has been delivered to E&C %s branch."),
AIR_UNLOADED_CABINET_DELAY(16043502,"到仓", "Delivered","由于%s原因，延误到仓时间","Due to %s reasons, the arrival time is delayed"),
AIR_IN_WAREHOUSE_REMARK(520201, "入仓", "Received", "Reçu", "货物已入捷道%s，总入仓%s件，未到齐","%s ctns have been arrived at E&C %s warehouse,TTL ctns are %s. Incomplete","%s colis sont arrivés à l'entrepôt E&C %s, total est %s. manque"),
AIR_PACKED(520202, "打包", "Repacked", "Remballé", "货物已完成二次打包","The shipment has been packed, waiting to be dispatched.","le produit a été emballé, En attente de libération."),// 打包完成时调用
AIR_WAREHOUSED(320412,"出仓", "Dispatched", "Expédié","货物已出库，发往国际机场","One the way to China International airport.","En route vers l'aéroport international de Chine."),
AIR_CUSTOMS_IN_PROGRESS(120413, "报关", "Customs Declaration", "déclaration en douane", "由于%s原因，待放行","Due to %s reasons, awaiting release","En raison de %s, En attente de libération."),
AIR_CUSTOMS_PASS_AIR(120421, "报关", "Customs Declaration", "déclaration en douane", "货物报关已放行，候机中","shipment been released by China custom,","le produit a été libéré par la douane chinoise."),
AIR_CUSTOMS_PART_EXIT(120414, "报关", "Customs Inspection", "Inspection douanière", "报关查验退场，返回仓库中","The shipment has been Inspected by China Customs,waiting to return back to the warehouse.","le produit a été inspecté par la douane chinoise, en attente de retour à l'entrepôt."),
AIR_CUSTOMS_FULL_EXIT(120415, "报关", "Customs Inspection", "Inspection douanière", "报关查验退场，返回仓库中","The shipment has been Inspected by China Customs,waiting to return back to the warehouse.","le produit a été libéré par la douane chinoise, en attente de retour à l'entrepôt."),
AIR_HAS_TAKEN_OFF(13042601, "起运", "Departed", "Départ", "货物已起飞，预计在%s日期抵达%s机场","The shipment has departed China.ETA date is %s to %s","le produit a quitté la Chine.ETA environ est du %s au %s."),
AIR_HAS_TAKEN_OFF_DELAY(13042602, "起运", "Departed", "Départ", "由于%s原因，延误起飞","Delayed takeoff due to %s","en raison de %s.départ retardée"),
AIR_ARRIVED(14032801, "到港", "Arrived Air Port", "Arrivé à l’aéroport", "货物已抵达%s机场，清关中","The shipment has arrived at %s airport.under clearing","le produit est arrivé à l'aéroport de %s, en train de dédouaner."),
AIR_ARRIVED_DELAY(14032802, "到港", "Arrived Air Port", "Arrivé à l’aéroport", "由于%s原因，延误抵达目的地","Due to %s, delayed arrival at the destination","En raison de %s, Arrivée retardée à destination ."),
AIR_CLEARED_DELAY(14032803, "清关", "Under clearing", "Dédouane", "由于%s原因，待清关","Due to %s, customs clearance is pending","En raison de %s, le dédouanement est en attente."),
AIR_CLEARED(150330, "已清关", "Cleared", "Dédouané", "货物已清关","Shipment has been cleared","le produit a été dédouané."),
AIR_UNLOADED_CABINET(16043501,"到仓", "Unloaded", "Déchargé","货物已抵达捷道%s提货仓","The shipment has been delivered to E&C %s pick up station.","le produit a été arrivé à l‘entrepôt de destination E&C %s."),
AIR_UNLOADED_CABINET_DELAY(16043502,"到仓", "Unloaded", "Déchargé","由于%s原因，延误到仓时间","Due to %s, the arrival time is delayed","En raison de %s, le temps d'arrivée est retardé."),
// AIR_PICKED_UP(2000, "提货", "Picked up", "货物已提货","The shipment been picked up "),
AIR_PICKED_UP(2000, "提货", "Collected", "货物已提货，本次提货%s件，剩余%s件","%s ctns has been collected by the consignee，remaining %s ctns in E&C destination branch."),
AIR_WAREHOUSE_WITHDRAWAL(7206, "退仓", "Warehouse Withdrawal", "货物已退仓","The shipment have been withdrawn from warehouse"),
AIR_ORDER_CANCEL(8800, "取消订单", "Order Cancelled", "",""),
AIR_PICKED_UP(2000, "提货", "Collected", "Retiré", "货物已提货，本次提货%s件，剩余%s件","%s ctns have been picked up by the consignee,remaining %s ctns in E&C branch.","%s colis ont été récupérés par le destinataire, il reste %s colis dans la branche E&C."),
AIR_WAREHOUSE_WITHDRAWAL(7206, "退仓", "Returned", "Retourné", "货物已退仓","The goods have been returned to the sender","Les marchandises ont été retournées à l'expéditeur."),
AIR_ORDER_CANCEL(8800, "取消订单", "Order Cancelled", "Commande annulée", "","",""),
;
......@@ -55,6 +55,10 @@ public enum OrderAirTimeEnum implements IntArrayValuable {
* 类型英文名
*/
private final String nameEn;
/**
* 类型法文名
*/
private final String nameFr;
/**
* 备注中文名
......@@ -66,6 +70,11 @@ public enum OrderAirTimeEnum implements IntArrayValuable {
*/
private final String remarksEn;
/**
* 备注法文名
*/
private final String remarksFr;
public static OrderAirTimeEnum valueOf(Integer value) {
......
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/enums/OrderSeaTimeEnum.java
View file @ 08b09baa
......@@ -11,27 +11,27 @@ import java.util.Arrays;
@Getter
public enum OrderSeaTimeEnum implements IntArrayValuable {
SEA_ORDER_PLACED(200, "下单", "Order placed", "",""),
SEA_ORDER_PLACED(200, "下单", "Order placed", "","","",""),
// SEA_IN_WAREHOUSE(520201, "入仓", "Warehousing", "货物已入捷道%s，本次入仓%s件，总入仓%s件","The There are %s ctns been arrived in E&C %s，TTL ctns are %s."),
SEA_IN_WAREHOUSE(520201, "入仓", "Received", "货物已入捷道%s，本次入仓%s件，总入仓%s件","%s ctns have been arrived at E&C %s warehouse，TTL ctns are %s."),
SEA_IN_WAREHOUSE(520201, "入仓","Received", "Reçu", "货物已入捷道%s，本次入仓%s件，总入仓%s件","%s ctns have been arrived at E&C %s warehouse，TTL ctns are %s.","%s colis sont arrivés à l'entrepôt E&C %s, total est %s."),
// SEA_IN_WAREHOUSE_REMARK(520201, "入仓", "Warehousing", "货物已入捷道%s，本次入仓%s件，总入仓%s件，未到齐","%s ctns have been arrived at E&C %s warehouse，TTL ctns are %s. Incomplete"),
SEA_IN_WAREHOUSE_REMARK(520201, "入仓", "Received", "货物已入捷道%s，总入仓%s件，未到齐","%s ctns have been arrived at E&C %s warehouse，TTL ctns are %s. Incomplete"),
SEA_INSTALLED_CABINET(320412,"装柜", "loaded","货物已装柜，发往码头，预计%s日期开船","The shipment have been loaded into container and sent to the port, done with custom clearance by an estimated sailing date of %s."),
SEA_CUSTOMS_IN_PROGRESS(120413, "报关", "Customs Declaration", "由于%s原因，待放行","Due to %s reasons, awaiting release"),
SEA_CUSTOMS_PASS_SEA(120325, "报关", "Customs Declaration", "货物报关已放行，等待起运","Shipment is released by China customs, waiting to depart China, with an extimated sailing date of %s"),
SEA_CUSTOMS_FULL_EXIT(120323, "报关", "Customs Declaration", "报关查验退场，返回仓库中","Shipment is inspected by China customs, waiting to return back to the warehouse"),
SEA_HAS_TAKEN_OFF(13042601, "起运", "In shipment", "货物航运中，预计在%s日期到港","the shipment's estimated arrival time is:%s."),
SEA_HAS_TAKEN_OFF_DELAY(13042602, "起运", "Departed", "由于%s原因，延误起运","Delayed takeoff due to %s"),
SEA_ARRIVED(14032801, "到港", "Arrived", "货物已到港，清关中","The shipment has arrived the port of destination port, waiting for custom declaration to be done."),
SEA_ARRIVED_DELAY(14032802, "到港", "Arrived", "由于%s原因，延误抵达目的地","Due to %s reasons, delayed arrival at the destination"),
SEA_CLEARED_DELAY(14032803, "清关", "Cleared out", "由于%s原因，待清关","Due to %s reasons, customs clearance is pending"),
SEA_CLEARED(150330, "清关", "Customs cleared", "货物已清关","Customs clearance of the shipment has been completed."),
SEA_UNLOADED_CABINET(162180,"到仓", "Delivered","货物已抵达捷道%s提货仓","The shipment has been delivered to E&C %s branch."),
SEA_UNLOADED_CABINET_DELAY(16043502,"到仓", "Delivered","由于%s原因，延误到仓时间","Due to %s reasons, the arrival time is delayed"),
SEA_PICKED_UP(2000, "提货", "Collected", "货物已提货，本次提货%s件，剩余%s件","%s ctns has been collected by the consignee，remaining %s ctns in E&C destination branch. "),
SEA_IN_WAREHOUSE_REMARK(520201, "入仓","Received", "Reçu", "货物已入捷道%s，总入仓%s件，未到齐","%s ctns have been arrived at E&C %s warehouse，TTL ctns are %s. Incomplete","%s colis sont arrivés à l'entrepôt E&C %s, total est %s. manque"),
SEA_INSTALLED_CABINET(320412,"装柜", "Loaded","Chargé","货物已装柜，发往码头，预计%s日期开船","Goods have been loaded and sent to the port, The ETD is %s.","Le produit a été chargé et envoyé au port. ETD environ est %s."),
SEA_CUSTOMS_IN_PROGRESS(120413, "报关","Customs Declaration", "déclaration en douane", "由于%s原因，待放行","Due to %s reasons, still waiting for departure","En raison de %s, en attente de départ."),
SEA_CUSTOMS_PASS_SEA(120325, "报关","Customs Declaration", "déclaration en douane", "货物报关已放行，等待起运","shipment been released by China custom, the ETD is %s","Le produit a été libéré par la douane chinoise, ETD environ est %s."),
SEA_CUSTOMS_FULL_EXIT(120323, "报关","Customs Declaration", "déclaration en douane", "报关查验退场，返回仓库中","Goods inspected by China customs, will return back to the warehouse","le produit a été libéré par la douane chinoise, en attente de retour à l'entrepôt."),
SEA_HAS_TAKEN_OFF(13042601, "起运","Shipping", "Départ", "货物航运中，预计在%s日期到港","Departed, the ETA is:%s.","le produit a quitté la Chine. ETA environ est du %s au %s."),
SEA_HAS_TAKEN_OFF_DELAY(13042602, "起运","Shipping", "Départ", "由于%s原因，延误起运","Delayed in sailing due to %s","en raison de %s.départ retardée"),
SEA_ARRIVED(14032801, "到港","Arrived", "Arrivé", "货物已到港，清关中","Already arrived the port of destination, waiting for the clearance of goods.","le produit est arrivé au port de %s, en train de dédouaner."),
SEA_ARRIVED_DELAY(14032802, "到港","Arrived", "Arrivé", "由于%s原因，延误抵达目的地","Due to %s reasons, delayed arrival at the destination","En raison de %s, arrivée retardée à destination."),
SEA_CLEARED_DELAY(14032803, "清关","Under clearing", "Dédouane", "由于%s原因，待清关","Due to %s reasons, clearance of goods is pending","En raison de %s, le dédouanement est en attente."),
SEA_CLEARED(150330, "清关","cleared", "Dédouané", "货物已清关","Customs clearance of the shipment has been completed.","le produit a été dédouané."),
SEA_UNLOADED_CABINET(162180,"到仓","Unloaded", "Déchargé","货物已抵达捷道%s提货仓","The goods has been delivered to E&C %s branch.","le produit a été arrivé à l‘entrepôt de destination E&C %s."),
SEA_UNLOADED_CABINET_DELAY(16043502,"到仓","Unloaded", "Déchargé","由于%s原因，延误到仓时间","Due to %s reasons, the unloaded time is delayed","En raison de %s, le temps d'arrivée est retardé."),
SEA_PICKED_UP(2000, "提货","Collected", "Retiré", "货物已提货，本次提货%s件，剩余%s件","%s ctns have been picked up by the consignee，remaining %s ctns in E&C branch.","%s colis ont été récupérés par le destinataire, il reste %s colis dans la branche E&C."),
// SEA_PICKED_UP_FINISH(2000, "提货", "Picked up", "货物已提货","The shipment been picked up"),
SEA_WAREHOUSE_WITHDRAWAL(7206, "退仓", "Warehouse Withdrawal", "货物已退仓","The shipment have been withdrawn from warehouse"),
SEA_ORDER_CANCEL(8800, "取消订单", "Order Cancelled", "",""),
SEA_WAREHOUSE_WITHDRAWAL(7206, "退仓","Returned", "Retourné", "货物已退仓","The goods have been returned to the sender","Les marchandises ont été retournées à l'expéditeur."),
SEA_ORDER_CANCEL(8800, "取消订单","Order Cancelled", "Commande annulée", "","",""),
;
......@@ -52,6 +52,10 @@ public enum OrderSeaTimeEnum implements IntArrayValuable {
* 类型英文名
*/
private final String nameEn;
/**
* 类型法文名
*/
private final String nameFr;
/**
* 备注中文名
......@@ -62,6 +66,10 @@ public enum OrderSeaTimeEnum implements IntArrayValuable {
* 备注英文名
*/
private final String remarksEn;
/**
* 备注英文名
*/
private final String remarksFr;
......
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/enums/OrderStatusEnum.java
View file @ 08b09baa
......@@ -10,45 +10,45 @@ import java.util.Arrays;
@AllArgsConstructor
@Getter
public enum OrderStatusEnum implements IntArrayValuable {
DRAFT(0, "草稿", "draft", "",""),
DRAFT(0, "草稿", "draft","Brouillon" ,"","",""),
//1未使用
ORDER_PLACED(2, "已下单", "Order placed", "",""),
WAREHOUSING(3, "入仓中", "Warehousing in progress", "",""),
ORDER_PLACED(2, "已下单", "Order placed","Commande passée", "","",""),
WAREHOUSING(3, "入仓中", "Warehousing in progress","Stockage en cours", "","",""),
// SPECIAL_APPLY_PROGRESS(4, "特价申请中", "Special offer application in progress", "",""),
IN_WAREHOUSE(5, "已入仓", "Warehousing", "货物已入捷道%s","The shipment has been delivered to E&C %s"),
WITHDRAWN_EXPENSES_NOT_CLEARED(6, "已退仓-费用未清", "Withdrawn - expense not cleared", "",""),
WITHDRAWN(7, "已退仓", "Withdrawn", "",""),
WAREHOUSE_ADJUSTMENT(8, "调仓中", "Warehouse adjustment in progress", "",""),
MERGED_ORDER(9, "已合单", "Closed order", "",""),
SPLIT_ORDER(10, "已拆单", "Split order", "",""),
PRE_INSTALLED(11, "已预装", "Pre installed", "",""),
INSTALLED_CABINET(12, "已装柜", "Installed cabinet", "预计开船时间：","Estimated time of departure:"),
IN_SHIPPING(13, "航运中", "In shipping", "货物已出仓，预计到港时间：","The goods have been warehoused, and the estimated arrival time is:"),
ARRIVED(14, "已到目的港", "Arrived", "",""),
CLEARED(15, "已清关", "Cleared", "货物已清关","The shipment been cleared out"),
UNLOADED_CABINET(16, "已卸柜", "Unloaded cabinet", "",""),
TWP_WAY_TAKEOFF(17, "二程起飞", "Two way takeoff", "",""),
TWP_WAY_ARRIVAL(18, "二程到目的港", "Two way arrival", "",""),
IN_WAREHOUSE(5, "已入仓", "Received","Reçu", "货物已入捷道%s"," %s ctns have been received at E&C %s warehouse,TTL ctns are %s.","%s colis ont été reçus à l'entrepôt E&C %s,total est %s."),
WITHDRAWN_EXPENSES_NOT_CLEARED(6, "已退仓-费用未清", "Returned -unpaid","Retourné - impayé", "","",""),
WITHDRAWN(7, "已退仓", "Returned","Retourné", "","",""),
WAREHOUSE_ADJUSTMENT(8, "调仓中", "Transfer in progress","Transfert en cours", "","",""),
MERGED_ORDER(9, "已合单", "Merge order","Fusionner la commande", "","",""),
SPLIT_ORDER(10, "已拆单", "Split order","Diviser la commande", "","",""),
PRE_INSTALLED(11, "已预装", "Preloaded","Préchargé", "","",""),
INSTALLED_CABINET(12, "已装柜", "Loaded","Chargé", "预计开船时间：","ETD:","ETD (Date estimée de départ):"),
IN_SHIPPING(13, "航运中", "Shipping","Expédition", "货物已出仓，预计到港时间：","Vessel departured and ETA:","déja quitté le port. ETA (Date environ d'arrivée) :"),
ARRIVED(14, "已到目的港", "Arrived","Arrivé", "","",""),
CLEARED(15, "已清关", "Cleared out","Dédouané", "货物已清关","Customs clearance of the goods has been completed","les produits ont déja dédouané."),
UNLOADED_CABINET(16, "已卸柜", "Unloaded","Déchargé", "","",""),
TWP_WAY_TAKEOFF(17, "二程起飞", "departed from transit station","Départ de la station de transit", "","",""),
TWP_WAY_ARRIVAL(18, "二程到目的港", "Arrived destination","Arrivé à destination", "","",""),
// WRITTEN_OFF(19, "已核销", "Written off"),
PICKED_UP(20, "已提货", "Picked up", "提货时间：","Pickup time:"),
PART_PICKED_UP(21, "部分提货", "Part Picked up", "提货时间：","Pickup time:"),
PICKED_UP(20, "已提货", "Collected","Retiré", "提货时间：","Pick-up time:","Heure de retiré :"),
PART_PICKED_UP(21, "部分提货", "Parts Collected","retiré partiellement", "提货时间：","Pick-up time:","Heure de retiré :"),
//....预留定义
// TALLY(31, "理货", "tally", "", ""),
SHIPMENT(32, "出货", "shipment", "", ""),
SHIPMENT(32, "出货", "Sent out","Envoyé", "", "", ""),
// ORDER_UPDATE(50, "订单修改中", "Order update in progress", "",""),
CANCEL(88, "取消订单", "cancellation of order", "",""),
CANCEL(88, "取消订单", "Order Cancelled", "Commande annulée", "","", ""),
// 此状态为状态13的空运转义状态，当运输方式为空运时，状态13为已起飞
HAS_TAKEN_OFF(130, "已起飞", "Has taken off", "货物已起飞，预计在%s日期抵达%s机场","The shipment has departed China.ETA date to %s is %s"),
CUSTOMS_PASS_AIR(12421, "已报关", "Customs Declaration", "货物报关已放行，候机中","Shipment been released by China custom.waiting to departed China"),
CUSTOMS_PART_EXIT(12322, "已报关", "Customs Inspection", "报关查验退场，返回仓库中","Shipment been Inspected by China custom.waiting return to warehouse"),
CUSTOMS_FULL_EXIT(12323, "已报关", "Customs Inspection", "报关查验退场，返回仓库中","Shipment been Inspected by China custom.waiting return to warehouse"),
WAREHOUSED(32412,"出仓", "Sent out","",""),
UNLOADED_CABINET_AIR(16435,"到仓", "Location","货物已抵达捷道%s提货仓","The shipment been delivered at E&C %s branch"),
HAS_TAKEN_OFF(130, "已起飞", "Departed", "Expédié", "货物已起飞，预计在%s日期抵达%s机场","The goods has departed China .ETA date to %s is %s","Les marchandises ont quitté la Chine. ETA à %s est %s."),
CUSTOMS_PASS_AIR(12421, "已报关", "Customs Declaration", "déja déclaré", "货物报关已放行，候机中","Goods been released by China custom.waiting to departed China","Les marchandises ont été libérées par la douane chinoise, en attente de départ."),
CUSTOMS_PART_EXIT(12322, "已报关", "Customs Inspection", "déja déclaré", "报关查验退场，返回仓库中","Goods been Inspected by China custom.waiting return to warehouse","Les marchandises ont été inspectées par la douane chinoise, en attente de retour à l'entrepôt."),
CUSTOMS_FULL_EXIT(12323, "已报关", "Customs Inspection", "déja déclaré", "报关查验退场，返回仓库中","Goods been Inspected by China custom.waiting return to warehouse","Les marchandises ont été libérées par la douane chinoise, en attente de retour à l'entrepôt."),
WAREHOUSED(32412,"出仓", "Dispatched", "Expédié","","", ""),
UNLOADED_CABINET_AIR(16435,"到仓", "Arrived", "Arrivé","货物已抵达捷道%s提货仓","The goods has been delivered to E&C%s branch.","Les marchandises ont été livrées à la branche E&C %s."),
;
......@@ -69,6 +69,11 @@ public enum OrderStatusEnum implements IntArrayValuable {
*/
private final String nameEn;
/**
* 类型法文名
*/
private final String nameFr;
/**
* 备注中文名
*/
......@@ -79,6 +84,11 @@ public enum OrderStatusEnum implements IntArrayValuable {
*/
private final String remarksEn;
/**
* 备注法文名
*/
private final String remarksFr;
public static OrderStatusEnum valueOf(Integer value) {
......
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/enums/OrderStatusMsgEnum.java
View file @ 08b09baa
......@@ -159,17 +159,17 @@ public enum OrderStatusMsgEnum {
if (inWarehouseState != 0) {
if (Objects.equals(value.inWarehouseState, inWarehouseState)) {
// 返回定义出货状态
return lang == 0 ? I18nMessage.getZhMessage(message) : I18nMessage.getEnMessage(message);
return I18nMessage.getMessage(message,lang);
}
} else {
// 返回定义出货状态
return lang == 0 ? I18nMessage.getZhMessage(message) : I18nMessage.getEnMessage(message);
return I18nMessage.getMessage(message,lang);
}
} else if (Objects.equals(value.status, status) && inWarehouseState != 0 && Objects.equals(value.inWarehouseState, inWarehouseState)) {
if (shipmentState != 0) {
if (Objects.equals(value.shipmentState, shipmentState)) {
// 返回定义出货状态
return lang == 0 ? I18nMessage.getZhMessage(message) : I18nMessage.getEnMessage(message);
return I18nMessage.getMessage(message,lang);
}
} else {
// 空运订单，且不是入仓中订单，需要判断订单备货状态
......@@ -198,12 +198,12 @@ public enum OrderStatusMsgEnum {
}
// 返回定义的入仓状态
return lang == 0 ? I18nMessage.getZhMessage(message) : I18nMessage.getEnMessage(message);
return I18nMessage.getMessage(message,lang);
}
} else if (Objects.equals(value.status, status) && (status == 0 || status == 2 || status == 4 || status == 20 || status == 21 || status == 50 || status == 88)) {
// 这里是没有定义子状态的主状态值
// 返回定义的主状态
return lang == 0 ? I18nMessage.getZhMessage(message) : I18nMessage.getEnMessage(message);
return I18nMessage.getMessage(message,lang);
}
}
......
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/OrderBusinessService.java
View file @ 08b09baa
......@@ -202,7 +202,7 @@ public interface OrderBusinessService extends IService<OrderDO> {
* @param now 当前执行时间
* @param timeId 动态id
*/
void addAirOrderTimeLog(OrderDO orderDO, OrderAirTimeEnum orderAirTimeEnum, String reasonZh, String reasonEn,
void addAirOrderTimeLog(OrderDO orderDO, OrderAirTimeEnum orderAirTimeEnum, String reasonZh, String reasonEn,String reasonFr,
Date estTime, Date businessTime, Date now, Long timeId);
/**
......@@ -217,7 +217,7 @@ public interface OrderBusinessService extends IService<OrderDO> {
* @param now 当前执行时间
* @param timeId 动态id
*/
void addSeaOrderTimeLog(OrderDO orderDO, OrderSeaTimeEnum orderSeaTimeEnum, String reasonZh, String reasonEn,
void addSeaOrderTimeLog(OrderDO orderDO, OrderSeaTimeEnum orderSeaTimeEnum, String reasonZh, String reasonEn,String reasonFr,
Date estTime, Date businessTime, Date now, Long timeId);
/**
......@@ -231,7 +231,7 @@ public interface OrderBusinessService extends IService<OrderDO> {
* @param businessTime 业务时间
* @param now 当前执行时间
*/
void addAirOrderTimeLog(Collection<Long> orderIdList, OrderAirTimeEnum orderAirTimeEnum, String reasonZh, String reasonEn,
void addAirOrderTimeLog(Collection<Long> orderIdList, OrderAirTimeEnum orderAirTimeEnum, String reasonZh, String reasonEn,String reasonFr,
Date estTime, Date businessTime, Date now);
......@@ -246,7 +246,7 @@ public interface OrderBusinessService extends IService<OrderDO> {
* @param businessTime 业务时间
* @param now 当前执行时间
*/
void addSeaOrderTimeLog(Collection<Long> orderIdList, OrderSeaTimeEnum orderSeaTimeEnum, String reasonZh, String reasonEn,
void addSeaOrderTimeLog(Collection<Long> orderIdList, OrderSeaTimeEnum orderSeaTimeEnum, String reasonZh, String reasonEn,String reasonFr,
Date estTime, Date businessTime, Date now);
/**
......@@ -260,7 +260,7 @@ public interface OrderBusinessService extends IService<OrderDO> {
* @param businessTime 业务时间
* @param now 当前执行时间
*/
void addAirOrderTimeLog(String containerNumber, OrderAirTimeEnum orderAirTimeEnum, String reasonZh, String reasonEn,
void addAirOrderTimeLog(String containerNumber, OrderAirTimeEnum orderAirTimeEnum, String reasonZh, String reasonEn,String reasonFr,
Date estTime, Date businessTime, Date now);
/**
......
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderAirServiceImpl.java
View file @ 08b09baa
......@@ -101,7 +101,7 @@ public class OrderAirServiceImpl extends AbstractService<OrderMapper, OrderDO> i
.eq(OrderTimeDO::getOrderId, orderId)
.eq(OrderTimeDO::getStatus, OrderAirTimeEnum.AIR_PACKED.getValue()));
if (count == 0) {
orderBusinessService.addAirOrderTimeLog(orderDO, OrderAirTimeEnum.AIR_PACKED, null, null, null, null, null, null);
orderBusinessService.addAirOrderTimeLog(orderDO, OrderAirTimeEnum.AIR_PACKED, null, null,null,null, null, null, null);
}
}
......
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderServiceImpl.java
View file @ 08b09baa
......@@ -485,9 +485,9 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
}
}
if (Objects.equals(TransportTypeShortEnum.AIR_FREIGHT_LINE.getValue(), createReqVO.getTransportId())) {
orderBusinessService.addAirOrderTimeLog(order, OrderAirTimeEnum.AIR_ORDER_PLACED, null, null, null, null, now, null);
orderBusinessService.addAirOrderTimeLog(order, OrderAirTimeEnum.AIR_ORDER_PLACED, null, null, null, null, null, now, null);
} else if (Objects.equals(TransportTypeShortEnum.SEA_CONTAINER.getValue(), createReqVO.getTransportId())) {
orderBusinessService.addSeaOrderTimeLog(order, OrderSeaTimeEnum.SEA_ORDER_PLACED, null, null, null, null, now, null);
orderBusinessService.addSeaOrderTimeLog(order, OrderSeaTimeEnum.SEA_ORDER_PLACED, null, null,null, null, null, now, null);
} else {
orderBusinessService.addOrderTimeLog(order.getStatus(), order, 0, now, now);
}
......@@ -1688,9 +1688,9 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
// 修改订单时如果状态为下单,且原订单状态不是下单，更新日志事件
if (Objects.equals(OrderStatusEnum.ORDER_PLACED.getValue(), updateObj.getStatus()) && !Objects.equals(oldOrderDO.getStatus(), updateObj.getStatus())) {
if (Objects.equals(TransportTypeShortEnum.AIR_FREIGHT_LINE.getValue(), updateObj.getTransportId())) {
orderBusinessService.addAirOrderTimeLog(updateObj, OrderAirTimeEnum.AIR_ORDER_PLACED, null, null, null, null, now, null);
orderBusinessService.addAirOrderTimeLog(updateObj, OrderAirTimeEnum.AIR_ORDER_PLACED, null, null, null, null, null, now, null);
} else if (Objects.equals(TransportTypeShortEnum.SEA_CONTAINER.getValue(), updateObj.getTransportId())) {
orderBusinessService.addSeaOrderTimeLog(updateObj, OrderSeaTimeEnum.SEA_ORDER_PLACED, null, null, null, null, now, null);
orderBusinessService.addSeaOrderTimeLog(updateObj, OrderSeaTimeEnum.SEA_ORDER_PLACED, null, null,null, null, null, now, null);
} else {
orderBusinessService.addOrderTimeLog(updateObj.getStatus(), updateObj, 0, now, now);
}
......@@ -4148,9 +4148,9 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
if (Objects.nonNull(hasExit) && hasExit == 1) {
// 部分退场入仓
if (Objects.equals(currentOrderDO.getTransportId(), TransportTypeShortEnum.AIR_FREIGHT_LINE.getValue())) {
orderBusinessService.addAirOrderTimeLog(currentOrderDO, OrderAirTimeEnum.AIR_IN_WAREHOUSE, null, null, null, null, null, null);
orderBusinessService.addAirOrderTimeLog(currentOrderDO, OrderAirTimeEnum.AIR_IN_WAREHOUSE, null, null,null, null, null, null, null);
} else if (Objects.equals(currentOrderDO.getTransportId(), TransportTypeShortEnum.SEA_CONTAINER.getValue())) {
orderBusinessService.addSeaOrderTimeLog(currentOrderDO, OrderSeaTimeEnum.SEA_IN_WAREHOUSE, null, null, null, null, null, null);
orderBusinessService.addSeaOrderTimeLog(currentOrderDO, OrderSeaTimeEnum.SEA_IN_WAREHOUSE, null, null,null, null, null, null, null);
}
} else {
List<OrderTimeDO> orderTimeDOS = orderTimeMapper.selectList(new LambdaQueryWrapper<OrderTimeDO>()
......@@ -4163,11 +4163,11 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
currentOrderDO.setLastTimeTotalNum(timeDO.getTotalNum());
}
if (Objects.equals(currentOrderDO.getTransportId(), TransportTypeShortEnum.AIR_FREIGHT_LINE.getValue())) {
orderBusinessService.addAirOrderTimeLog(currentOrderDO, OrderAirTimeEnum.AIR_IN_WAREHOUSE, null, null, null, businessTime, null, timeId);
orderBusinessService.addAirOrderTimeLog(currentOrderDO, OrderAirTimeEnum.AIR_IN_WAREHOUSE, null, null,null, null, businessTime, null, timeId);
} else if (Objects.equals(currentOrderDO.getTransportId(), TransportTypeShortEnum.SEA_CONTAINER.getValue())) {
if (currentOrderDO.getLastTimeTotalNum() != currentOrderDO.getSumNum()) {
// 当有入仓箱数变化时才做动态更新
orderBusinessService.addSeaOrderTimeLog(currentOrderDO, OrderSeaTimeEnum.SEA_IN_WAREHOUSE, null, null, null, businessTime, null, timeId);
orderBusinessService.addSeaOrderTimeLog(currentOrderDO, OrderSeaTimeEnum.SEA_IN_WAREHOUSE, null, null,null, null, businessTime, null, timeId);
}
}
}
......@@ -4214,9 +4214,9 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
currentOrderDO.setAirShipment(0);
// 退仓成功，添加动态
if (Objects.equals(currentOrderDO.getTransportId(), TransportTypeShortEnum.AIR_FREIGHT_LINE.getValue())) {
orderBusinessService.addAirOrderTimeLog(currentOrderDO, OrderAirTimeEnum.AIR_WAREHOUSE_WITHDRAWAL, null, null, null, null, null, null);
orderBusinessService.addAirOrderTimeLog(currentOrderDO, OrderAirTimeEnum.AIR_WAREHOUSE_WITHDRAWAL, null, null,null,null, null, null, null);
} else if (Objects.equals(currentOrderDO.getTransportId(), TransportTypeShortEnum.SEA_CONTAINER.getValue())) {
orderBusinessService.addSeaOrderTimeLog(currentOrderDO, OrderSeaTimeEnum.SEA_WAREHOUSE_WITHDRAWAL, null, null, null, null, null, null);
orderBusinessService.addSeaOrderTimeLog(currentOrderDO, OrderSeaTimeEnum.SEA_WAREHOUSE_WITHDRAWAL, null, null,null, null, null, null, null);
}
}
//入仓中，重置订单的已入仓数据
......@@ -4992,6 +4992,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
if (StringUtils.isNotBlank(estTime) && (StringUtils.isNotBlank(orderStatusEnum.getRemarksZh()) || StringUtils.isNotBlank(orderStatusEnum.getRemarksEn()))) {
orderTimeDO.setRemarksZh(orderStatusEnum.getRemarksZh() + estTime);
orderTimeDO.setRemarksEn(orderStatusEnum.getRemarksEn() + estTime);
orderTimeDO.setRemarksFr(orderStatusEnum.getRemarksFr() + estTime);
}
// switch (type) {
// case 1:
......@@ -5062,6 +5063,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
// }
orderTimeDO.setTitleZh((Objects.nonNull(orderDO.getPrefixStatusZh()) ? orderDO.getPrefixStatusZh() : "") + orderStatusEnum.getNameZh());
orderTimeDO.setTitleEn((Objects.nonNull(orderDO.getPrefixStatusEn()) ? orderDO.getPrefixStatusEn() : "") + orderStatusEnum.getNameEn());
orderTimeDO.setTitleFr((Objects.nonNull(orderDO.getPrefixStatusFr()) ? orderDO.getPrefixStatusFr() : "") + orderStatusEnum.getNameFr());
orderTimeMapper.insert(orderTimeDO);
}
}
......@@ -6212,9 +6214,9 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
// 更新订单操作日志
orderBusinessService.addOrderOperateLog(orderId, "取消订单", null);
if (Objects.equals(orderDO.getTransportId(), TransportTypeShortEnum.AIR_FREIGHT_LINE.getValue())) {
orderBusinessService.addAirOrderTimeLog(orderDO, OrderAirTimeEnum.AIR_ORDER_CANCEL, null, null, null, null, null, null);
orderBusinessService.addAirOrderTimeLog(orderDO, OrderAirTimeEnum.AIR_ORDER_CANCEL, null, null,null, null, null, null, null);
} else if (Objects.equals(orderDO.getTransportId(), TransportTypeShortEnum.SEA_CONTAINER.getValue())) {
orderBusinessService.addSeaOrderTimeLog(orderDO, OrderSeaTimeEnum.SEA_ORDER_CANCEL, null, null, null, null, null, null);
orderBusinessService.addSeaOrderTimeLog(orderDO, OrderSeaTimeEnum.SEA_ORDER_CANCEL, null, null, null,null, null, null, null);
}
}
......
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/order/OrderBackPageVO.java
View file @ 08b09baa
......@@ -581,7 +581,19 @@ public class OrderBackPageVO {
public void setStatus(Integer status) {
this.status = status;
Integer lang = Objects.nonNull(this.lang) ? this.lang : I18nMessage.getLang();
this.statusText = lang == 0 ? OrderStatusEnum.valueOf(status).getNameZh() : OrderStatusEnum.valueOf(status).getNameEn();
switch(lang) {
case 0:
this.statusText = OrderStatusEnum.valueOf(status).getNameZh();
break;
case 1:
this.statusText = OrderStatusEnum.valueOf(status).getNameEn();
break;
case 2:
this.statusText = OrderStatusEnum.valueOf(status).getNameFr();
break;
default:
this.statusText = OrderStatusEnum.valueOf(status).getNameZh();
}
this.getOrderDesc();
}
......
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/orderItem/OrderItemBackVO.java
View file @ 08b09baa
......@@ -77,6 +77,10 @@ public class OrderItemBackVO {
@ApiModelProperty(value = "产品英文标题")
private String prodTitleEn;
@ExcelProperty("产品法文标题")
@ApiModelProperty(value = "产品法文标题")
private String prodTitleFr;
@ExcelProperty("商品第三方链接")
@ApiModelProperty(value = "商品第三方链接")
private String link;
......@@ -452,6 +456,9 @@ public class OrderItemBackVO {
@ApiModelProperty(value = "到仓产品英文标题")
private String checkProdTitleEn;
@ApiModelProperty(value = "到仓产品法文标题")
private String checkProdTitleFr;
@ApiModelProperty(value = "到仓材质")
private String checkMaterial;
......
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/orderTime/OrderTimeBackVO.java
View file @ 08b09baa
......@@ -45,6 +45,13 @@ public class OrderTimeBackVO {
@ApiModelProperty(value = "英文标题")
private String title_en;
@ExcelProperty("")
@ApiModelProperty(value = "法文标题")
private String titleFr;
@ApiModelProperty(value = "法文标题")
private String title_fr;
/**
* 中文备注
*/
......@@ -55,6 +62,11 @@ public class OrderTimeBackVO {
*/
@ApiModelProperty(value = "英文备注")
private String remarksEn;
/**
* 法文备注
*/
@ApiModelProperty(value = "英文备注")
private String remarksFr;
@ExcelProperty("创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
......@@ -113,6 +125,16 @@ public class OrderTimeBackVO {
// if(Objects.nonNull(this.createTime) && StringUtils.isNotBlank(this.title_zh)){
// this.titleZh = this.title_zh + " " + DateUtil.formatDateTime(this.createTime);
// this.titleEn = this.title_en + " " + DateUtil.formatDateTime(this.createTime);
// }
}
}
public void setTitle_fr(String title_fr) {
this.title_fr = title_fr;
if (StringUtils.isNotBlank(title_fr)){
this.titleFr = title_fr;
// if(Objects.nonNull(this.createTime) && StringUtils.isNotBlank(this.title_zh)){
// this.titleZh = this.title_zh + " " + DateUtil.formatDateTime(this.createTime);
// this.titleEn = this.title_en + " " + DateUtil.formatDateTime(this.createTime);
// }
}
}
......
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/orderTime/OrderTimeBaseVO.java
View file @ 08b09baa
......@@ -23,12 +23,15 @@ public class OrderTimeBaseVO {
@ApiModelProperty(value = "订单状态 详见字典 order_status")
private Integer status;
@ApiModelProperty(value = "")
@ApiModelProperty(value = "中文名称")
private String titleZh;
@ApiModelProperty(value = "")
@ApiModelProperty(value = "英文名称")
private String titleEn;
@ApiModelProperty(value = "法文名称")
private String titleFr;
@ApiModelProperty(value = "标记颜色：0 默认不标记 1 红色")
private Integer mark = 0;
......@@ -42,6 +45,11 @@ public class OrderTimeBaseVO {
*/
@ApiModelProperty(value = "英文备注")
private String remarksEn;
/**
* 英文备注
*/
@ApiModelProperty(value = "英文备注")
private String remarksFr;
@ExcelProperty("业务时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
......
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/orderTime/OrderTimeQueryVO.java
View file @ 08b09baa
......@@ -24,6 +24,9 @@ public class OrderTimeQueryVO {
@ApiModelProperty(value = "")
private String titleEn;
@ApiModelProperty(value = "")
private String titleFr;
/**
* 中文备注
*/
......@@ -34,6 +37,11 @@ public class OrderTimeQueryVO {
*/
@ApiModelProperty(value = "英文备注")
private String remarksEn;
/**
* 法文备注
*/
@ApiModelProperty(value = "法文备注")
private String remarksFr;
/**
* 类型
......
yudao-module-product/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/vo/product/ProductBaseVO.java
View file @ 08b09baa
......@@ -27,6 +27,9 @@ public class ProductBaseVO {
@ApiModelProperty(value = "英文标题")
private String titleEn;
@ApiModelProperty(value = "法文标题")
private String titleFr;
@ApiModelProperty(value = "商品材质,字典material_type")
private String materialType;
......
yudao-module-product/yudao-module-product-core/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/product/ProductAttrDO.java
View file @ 08b09baa
......@@ -32,6 +32,10 @@ public class ProductAttrDO extends BaseDO {
* 属性英文名称
*/
private String attrNameEn;
/**
* 属性法文名称
*/
private String attrNameFr;
/**
* 属性代码
......
yudao-module-product/yudao-module-product-core/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/product/ProductDO.java
View file @ 08b09baa
......@@ -44,6 +44,10 @@ public class ProductDO extends BaseDO {
* 英文标题
*/
private String titleEn;
/**
* 法文标题
*/
private String titleFr;
/**
* 商品材质
......
yudao-module-product/yudao-module-product-core/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/product/ProductMapper.java
View file @ 08b09baa
......@@ -359,11 +359,9 @@ public interface ProductMapper extends BaseMapperX<ProductDO> {
.eqIfPresent(ProductDO::getAuditStatus, reqVO.getAuditStatus())
.eqIfPresent(ProductDO::getStatus, reqVO.getStatus())
.inIfPresent(ProductDO::getId, idList)
.and(StringUtil.isNotEmpty(reqVO.getTitleZh()),
i -> i.like(ProductDO::getTitleZh, reqVO.getTitleZh())
.or()
.like(ProductDO::getTitleEn, reqVO.getTitleZh())
)
.likeIfPresent(ProductDO::getTitleZh, reqVO.getTitleZh())
.likeIfPresent(ProductDO::getTitleEn, reqVO.getTitleEn())
.likeIfPresent(ProductDO::getTitleFr, reqVO.getTitleFr())
.apply(StringUtils.isNotEmpty(reqVO.getAttrId()), "FIND_IN_SET({0}, attr_id)", reqVO.getAttrId())
.orderByDesc(ProductDO::getId));
}
......
yudao-module-product/yudao-module-product-core/src/main/java/cn/iocoder/yudao/module/product/vo/product/ProductExportReqVO.java
View file @ 08b09baa
......@@ -28,6 +28,9 @@ public class ProductExportReqVO {
@ApiModelProperty(value = "英文标题")
private String titleEn;
@ApiModelProperty(value = "法文标题")
private String titleFr;
@ApiModelProperty(value = "商品材质,字段material_type")
private String materialType;
......
yudao-module-product/yudao-module-product-core/src/main/java/cn/iocoder/yudao/module/product/vo/productAttr/ProductAttrBaseVO.java
View file @ 08b09baa
......@@ -18,6 +18,9 @@ public class ProductAttrBaseVO {
@ApiModelProperty(value = "属性英文名称")
private String attrNameEn;
@ApiModelProperty(value = "属性法文名称")
private String attrNameFr;
@ApiModelProperty(value = "属性代码", required = true)
@NotNull(message = "属性代码不能为空")
private String attrCode;
......
yudao-module-reward/yudao-module-reward-impl/src/main/java/cn/iocoder/yudao/module/reward/controller/app/redeem/AppRedeemRewardController.java
View file @ 08b09baa
......@@ -54,9 +54,11 @@ public class AppRedeemRewardController {
String status = appRewardRedeemDetailRespVO.getStatus().toString();
appRewardRedeemDetailRespVO.setStatusZh(DictFrameworkUtils.getDictDataFromCache("reward_redeem_status", status).getLabel());
appRewardRedeemDetailRespVO.setStatusEn(DictFrameworkUtils.getDictDataFromCache("reward_redeem_status", status).getLabelEn());
appRewardRedeemDetailRespVO.setStatusFr(DictFrameworkUtils.getDictDataFromCache("reward_redeem_status", status).getLabelFr());
String redeemType = appRewardRedeemDetailRespVO.getRedeemType().toString();
appRewardRedeemDetailRespVO.setRedeemTypeZh(DictFrameworkUtils.getDictDataFromCache("way_of_receiving", redeemType).getLabel());
appRewardRedeemDetailRespVO.setRedeemTypeEn(DictFrameworkUtils.getDictDataFromCache("way_of_receiving", redeemType).getLabelEn());
appRewardRedeemDetailRespVO.setRedeemTypeFr(DictFrameworkUtils.getDictDataFromCache("way_of_receiving", redeemType).getLabelFr());
return success(appRewardRedeemDetailRespVO);
}
return null;
......
yudao-module-reward/yudao-module-reward-impl/src/main/java/cn/iocoder/yudao/module/reward/controller/app/redeem/vo/AppRewardRedeemDetailRespVO.java
View file @ 08b09baa
......@@ -26,6 +26,8 @@ public class AppRewardRedeemDetailRespVO {
private String statusZh;
@ApiModelProperty(value = "兑换状态英文")
private String statusEn;
@ApiModelProperty(value = "兑换状态法文")
private String statusFr;
@ApiModelProperty(value = "兑换积分")
private Integer totalCount;
@ApiModelProperty(value = "礼品名称（中文）")
......@@ -50,6 +52,8 @@ public class AppRewardRedeemDetailRespVO {
private String redeemTypeZh;
@ApiModelProperty(value = "兑换方式英文")
private String redeemTypeEn;
@ApiModelProperty(value = "兑换方式法文")
private String redeemTypeFr;
@ApiModelProperty(value = "兑换网点(中文)")
private String nodeTitleZh;
@ApiModelProperty(value = "兑换网点(英文)")
......
yudao-module-sale/yudao-module-sale-core/src/main/java/cn/iocoder/yudao/module/sale/dal/dataobject/channel/ChannelDO.java
View file @ 08b09baa
......@@ -35,6 +35,10 @@ public class ChannelDO extends BaseDO {
* 名称-英文
*/
private String nameEn;
/**
* 名称-法文
*/
private String nameFr;
/**
* 内部名称-中文
*/
......@@ -43,6 +47,10 @@ public class ChannelDO extends BaseDO {
* 内部名称-英文
*/
private String internalNameEn;
/**
* 内部名称-法文
*/
private String internalNameFr;
/**
* 类型编码
*/
......@@ -83,6 +91,10 @@ public class ChannelDO extends BaseDO {
* 备注-英文
*/
private String remarksEn;
/**
* 备注-法文
*/
private String remarksFr;
/**
* 状态(0:禁用 1:启用)
*/
......
yudao-module-sale/yudao-module-sale-core/src/main/java/cn/iocoder/yudao/module/sale/vo/channel/ChannelBaseVO.java
View file @ 08b09baa
......@@ -20,12 +20,18 @@ public class ChannelBaseVO {
@ApiModelProperty(value = "名称-英文")
private String nameEn;
@ApiModelProperty(value = "名称-法文")
private String nameFr;
@ApiModelProperty(value = "内部名称-中文")
private String internalNameZh;
@ApiModelProperty(value = "内部名称-英文")
private String internalNameEn;
@ApiModelProperty(value = "内部名称-法文")
private String internalNameFr;
@ApiModelProperty(value = "类型编码")
private String typeNumber;
......@@ -56,6 +62,9 @@ public class ChannelBaseVO {
@ApiModelProperty(value = "备注-英文")
private String remarksEn;
@ApiModelProperty(value = "备注-法文")
private String remarksFr;
@ApiModelProperty(value = "状态(0:禁用 1:启用)")
private Boolean status;
......
yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/box/BoxService.java
View file @ 08b09baa
......@@ -195,9 +195,9 @@ public interface BoxService extends IService<BoxDO> {
* @param businessTime 业务时间
* @param now 当前执行时间
*/
void addOrderAirTimeLog(Collection<Long> orderIdList, OrderAirTimeEnum orderAirTimeEnum, String reasonZh, String reasonEn, Date estTime, Date businessTime, Date now);
void addOrderAirTimeLog(Collection<Long> orderIdList, OrderAirTimeEnum orderAirTimeEnum, String reasonZh, String reasonEn,String reasonFr, Date estTime, Date businessTime, Date now);
void addOrderSeaTimeLog(Collection<Long> orderIdList, OrderSeaTimeEnum orderSeaTimeEnum, String reasonZh, String reasonEn, Date estTime, Date businessTime, Date now);
void addOrderSeaTimeLog(Collection<Long> orderIdList, OrderSeaTimeEnum orderSeaTimeEnum, String reasonZh, String reasonEn,String reasonFr, Date estTime, Date businessTime, Date now);
/**
* 校验已装箱数量是否符合
......
yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/box/BoxServiceImpl.java
View file @ 08b09baa
......@@ -1871,10 +1871,10 @@ public class BoxServiceImpl extends AbstractService<BoxMapper, BoxDO> implements
} else if (transportType == 3) {
if (shipmentState == BoxStatusEnum.CLEARANCE_WAIT_UNLOAD.getStatus()) {
// 空运清关
addOrderAirTimeLog(orderIdList, OrderAirTimeEnum.AIR_CLEARED, null, null, null, businessTime, null);
addOrderAirTimeLog(orderIdList, OrderAirTimeEnum.AIR_CLEARED, null, null,null, null, businessTime, null);
} else if (shipmentState == BoxStatusEnum.ARRIVAL_WAIT_DISCHARGE.getStatus() || shipmentState == BoxStatusEnum.DISCHARGE_WAIT_CLEARANCE.getStatus()) {
// 空运到港
addOrderAirTimeLog(orderIdList, OrderAirTimeEnum.AIR_ARRIVED, null, null, null, businessTime, null);
addOrderAirTimeLog(orderIdList, OrderAirTimeEnum.AIR_ARRIVED, null, null,null, null, businessTime, null);
} else {
this.shipmentAirOrderTimeLog(orderIdList, null, businessTime, shipmentState);
}
......@@ -1912,10 +1912,10 @@ public class BoxServiceImpl extends AbstractService<BoxMapper, BoxDO> implements
} else if (transportType == 3) {
if (shipmentState == BoxStatusEnum.CLEARANCE_WAIT_UNLOAD.getStatus()) {
// 空运清关
addOrderAirTimeLog(orderIdList, OrderAirTimeEnum.AIR_CLEARED, null, null, estTime, businessTime, null);
addOrderAirTimeLog(orderIdList, OrderAirTimeEnum.AIR_CLEARED, null, null,null, estTime, businessTime, null);
} else if (shipmentState == BoxStatusEnum.ARRIVAL_WAIT_DISCHARGE.getStatus() || shipmentState == BoxStatusEnum.DISCHARGE_WAIT_CLEARANCE.getStatus()) {
// 空运到港
addOrderAirTimeLog(orderIdList, OrderAirTimeEnum.AIR_ARRIVED, null, null, estTime, businessTime, null);
addOrderAirTimeLog(orderIdList, OrderAirTimeEnum.AIR_ARRIVED, null, null,null, estTime, businessTime, null);
} else {
this.shipmentAirOrderTimeLog(orderIdList, estTime, businessTime, shipmentState);
}
......@@ -2000,7 +2000,7 @@ public class BoxServiceImpl extends AbstractService<BoxMapper, BoxDO> implements
}
if (Objects.nonNull(orderSeaTimeEnum)) {
addOrderSeaTimeLog(orderIdList, orderSeaTimeEnum, null, null, estTime, businessTime, null);
addOrderSeaTimeLog(orderIdList, orderSeaTimeEnum, null, null,null, estTime, businessTime, null);
}
}
}
......@@ -2040,22 +2040,22 @@ public class BoxServiceImpl extends AbstractService<BoxMapper, BoxDO> implements
}
if (Objects.nonNull(orderAirTimeEnum)) {
addOrderAirTimeLog(orderIdList, orderAirTimeEnum, null, null, estTime, businessTime, null);
addOrderAirTimeLog(orderIdList, orderAirTimeEnum, null, null,null, estTime, businessTime, null);
}
}
}
public void addOrderAirTimeLog(Collection<Long> orderIdList, OrderAirTimeEnum orderAirTimeEnum, String reasonZh, String reasonEn, Date estTime, Date businessTime, Date now) {
@Override
public void addOrderAirTimeLog(Collection<Long> orderIdList, OrderAirTimeEnum orderAirTimeEnum, String reasonZh, String reasonEn, String reasonFr,Date estTime, Date businessTime, Date now) {
if (Objects.nonNull(orderAirTimeEnum)) {
orderBusinessService.addAirOrderTimeLog(orderIdList, orderAirTimeEnum, reasonZh, reasonEn, estTime, businessTime, now);
orderBusinessService.addAirOrderTimeLog(orderIdList, orderAirTimeEnum, reasonZh, reasonEn,reasonFr,estTime, businessTime, now);
}
}
@Override
public void addOrderSeaTimeLog(Collection<Long> orderIdList, OrderSeaTimeEnum orderSeaTimeEnum, String reasonZh, String reasonEn, Date estTime, Date businessTime, Date now) {
public void addOrderSeaTimeLog(Collection<Long> orderIdList, OrderSeaTimeEnum orderSeaTimeEnum, String reasonZh, String reasonEn,String reasonFr,Date estTime, Date businessTime, Date now) {
if (Objects.nonNull(orderSeaTimeEnum)) {
orderBusinessService.addSeaOrderTimeLog(orderIdList, orderSeaTimeEnum, reasonZh, reasonEn, estTime, businessTime, now);
orderBusinessService.addSeaOrderTimeLog(orderIdList, orderSeaTimeEnum, reasonZh, reasonEn,reasonFr,estTime, businessTime, now);
}
}
......
yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/boxAbnormal/BoxAbnormalServiceImpl.java
View file @ 08b09baa
......@@ -183,7 +183,7 @@ public class BoxAbnormalServiceImpl extends AbstractService<BoxAbnormalMapper, B
}
if (Objects.nonNull(orderAirTimeEnum)) {
boxService.addOrderAirTimeLog(orderIdList, orderAirTimeEnum, errorDict.getLabel(), errorDict.getLabelEn(), null, null, null);
boxService.addOrderAirTimeLog(orderIdList, orderAirTimeEnum, errorDict.getLabel(), errorDict.getLabelEn(),errorDict.getLabelFr(), null, null, null);
}
} else if (transportType.equals(TransportTypeEnum.SEA_COMBINED_CABINET.getType())) {
......@@ -210,7 +210,7 @@ public class BoxAbnormalServiceImpl extends AbstractService<BoxAbnormalMapper, B
}
if (Objects.nonNull(orderSeaTimeEnum)) {
boxService.addOrderSeaTimeLog(orderIdList, orderSeaTimeEnum, errorDict.getLabel(), errorDict.getLabelEn(), null, null, null);
boxService.addOrderSeaTimeLog(orderIdList, orderSeaTimeEnum, errorDict.getLabel(), errorDict.getLabelEn(),errorDict.getLabelFr(),null, null, null);
}
} else {
// TODO 后续业务再补充
......
yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/vo/DictDataBaseVO.java
View file @ 08b09baa
......@@ -28,6 +28,12 @@ public class DictDataBaseVO {
@Size(max = 100, message = "英文字典标签长度不能超过100个字符")
private String labelEn;
@ApiModelProperty(value = "法文字典标签", required = true, example = "捷道")
@NotBlank(message = "法文字典标签不能为空")
@Size(max = 100, message = "法文字典标签长度不能超过100个字符")
private String labelFr;
@ApiModelProperty(value = "字典值", required = true, example = "iocoder")
@NotBlank(message = "字典键值不能为空")
@Size(max = 100, message = "字典键值长度不能超过100个字符")
......
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/banner/vo/banner/BannerBackVO.java
View file @ 08b09baa
......@@ -27,6 +27,9 @@ public class BannerBackVO {
@ExcelProperty("英文标题")
@ApiModelProperty(value = "英文标题")
private String titleEn;
@ExcelProperty("法文标题")
@ApiModelProperty(value = "法文标题")
private String titleFr;
@ExcelProperty("中文内容")
@ApiModelProperty(value = "中文内容")
......@@ -36,6 +39,10 @@ public class BannerBackVO {
@ApiModelProperty(value = "英文内容")
private String contentEn;
@ExcelProperty("法文内容")
@ApiModelProperty(value = "法文内容")
private String contentFr;
@ExcelProperty("图片地址WEB")
@ApiModelProperty(value = "图片地址WEB")
private String bannerUrlWeb;
......
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/banner/vo/banner/BannerQueryVO.java
View file @ 08b09baa
......@@ -18,12 +18,18 @@ public class BannerQueryVO {
@ApiModelProperty(value = "英文标题")
private String titleEn;
@ApiModelProperty(value = "法文标题")
private String titleFr;
@ApiModelProperty(value = "中文内容")
private String contentZh;
@ApiModelProperty(value = "英文内容")
private String contentEn;
@ApiModelProperty(value = "法文内容")
private String contentFr;
@ApiModelProperty(value = "图片地址WEB")
private String bannerUrlWeb;
......
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/data/DictDataExcelVO.java
View file @ 08b09baa
......@@ -23,6 +23,9 @@ public class DictDataExcelVO {
@ExcelProperty("英文字典标签")
private String labelEn;
@ExcelProperty("法文字典标签")
private String labelFr;
@ExcelProperty("字典键值")
private String value;
......
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/data/DictDataExportReqVO.java
View file @ 08b09baa
......@@ -17,6 +17,10 @@ public class DictDataExportReqVO {
@Size(max = 100, message = "英文字典标签长度不能超过100个字符")
private String labelEn;
@ApiModelProperty(value = "法文字典标签", example = "捷道")
@Size(max = 100, message = "法文字典标签长度不能超过100个字符")
private String labelFr;
@ApiModelProperty(value = "字典类型", example = "sys_common_sex", notes = "模糊匹配")
@Size(max = 100, message = "字典类型类型长度不能超过100个字符")
private String dictType;
......
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/data/DictDataPageReqVO.java
View file @ 08b09baa
......@@ -21,6 +21,11 @@ public class DictDataPageReqVO extends PageParam {
@Size(max = 100, message = "英文字典标签长度不能超过100个字符")
private String labelEn;
@ApiModelProperty(value = "英文字典标签", example = "捷道")
@Size(max = 100, message = "英文字典标签长度不能超过100个字符")
private String labelFr;
@ApiModelProperty(value = "字典类型", example = "sys_common_sex", notes = "模糊匹配")
@Size(max = 100, message = "字典类型类型长度不能超过100个字符")
private String dictType;
......
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/banner/BannerDO.java
View file @ 08b09baa
......@@ -20,7 +20,7 @@ import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
public class BannerDO extends BaseDO {
/**
*
*
*/
@TableId
private Long id;
......@@ -32,6 +32,10 @@ public class BannerDO extends BaseDO {
* 英文标题
*/
private String titleEn;
/**
* 法文标题
*/
private String titleFr;
/**
* 中文内容
*/
......@@ -40,6 +44,10 @@ public class BannerDO extends BaseDO {
* 英文内容
*/
private String contentEn;
/**
* 法文内容
*/
private String contentFr;
/**
* 图片地址WEB
*/
......
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/dict/DictDataDO.java
View file @ 08b09baa
......@@ -31,6 +31,7 @@ public class DictDataDO extends BaseDO {
*/
private String label;
private String labelEn;
private String labelFr;
/**
* 字典值
*/
......
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/helpDoc/HelpDocDO.java
View file @ 08b09baa
......@@ -20,7 +20,7 @@ import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
public class HelpDocDO extends BaseDO {
/**
*
*
*/
@TableId
private Long id;
......@@ -32,6 +32,10 @@ public class HelpDocDO extends BaseDO {
* 标题英文
*/
private String titleEn;
/**
* 标题法文
*/
private String titleFr;
/**
* 内容中文
*/
......@@ -40,6 +44,10 @@ public class HelpDocDO extends BaseDO {
* 内容英语
*/
private String contentEn;
/**
* 内容法语
*/
private String contentFr;
/**
* 0-启用,1-停用
*
......
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/needKnow/NeedKnowDO.java
View file @ 08b09baa
......@@ -20,7 +20,7 @@ import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
public class NeedKnowDO extends BaseDO {
/**
*
*
*/
@TableId
private Long id;
......@@ -38,6 +38,10 @@ public class NeedKnowDO extends BaseDO {
* 标题英文
*/
private String titleEn;
/**
* 标题法文
*/
private String titleFr;
/**
* 内容中文
*/
......@@ -46,6 +50,10 @@ public class NeedKnowDO extends BaseDO {
* 内容英语
*/
private String contentEn;
/**
* 内容英语
*/
private String contentFr;
/**
* 0-启用,1-停用
*
......
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dict/DictDataMapper.java
View file @ 08b09baa
......@@ -36,6 +36,7 @@ public interface DictDataMapper extends BaseMapperX<DictDataDO> {
return selectPage(reqVO, new LambdaQueryWrapperX<DictDataDO>()
.likeIfPresent(DictDataDO::getLabel, reqVO.getLabel())
.likeIfPresent(DictDataDO::getLabelEn, reqVO.getLabelEn())
.likeIfPresent(DictDataDO::getLabelFr, reqVO.getLabelFr())
.eqIfPresent(DictDataDO::getDictType, reqVO.getDictType())
.eqIfPresent(DictDataDO::getStatus, reqVO.getStatus())
.orderByAsc(Arrays.asList(DictDataDO::getDictType, DictDataDO::getSort)));
......
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/vo/helpDoc/HelpDocBackVO.java
View file @ 08b09baa
......@@ -30,6 +30,10 @@ public class HelpDocBackVO {
@ApiModelProperty(value = "标题英文")
private String titleEn;
@ExcelProperty("标题法文")
@ApiModelProperty(value = "标题法文")
private String titleFr;
@ExcelProperty("内容中文")
@ApiModelProperty(value = "内容中文")
private String contentZh;
......@@ -38,6 +42,10 @@ public class HelpDocBackVO {
@ApiModelProperty(value = "内容英语")
private String contentEn;
@ExcelProperty("内容法语")
@ApiModelProperty(value = "内容法语")
private String contentFr;
@ExcelProperty(value = "0-启用,1-停用", converter = DictConvert.class)
@DictFormat("help_doc_status") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
@ApiModelProperty(value = "0-启用,1-停用")
......
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/vo/helpDoc/HelpDocQueryVO.java
View file @ 08b09baa
......@@ -18,12 +18,18 @@ public class HelpDocQueryVO {
@ApiModelProperty(value = "标题英文")
private String titleEn;
@ApiModelProperty(value = "标题法文")
private String titleFr;
@ApiModelProperty(value = "内容中文")
private String contentZh;
@ApiModelProperty(value = "内容英语")
private String contentEn;
@ApiModelProperty(value = "内容法文")
private String contentFr;
@ApiModelProperty(value = "0-启用,1-停用")
private Integer status;
......
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/vo/needKnow/NeedKnowBackVO.java
View file @ 08b09baa
......@@ -35,6 +35,10 @@ public class NeedKnowBackVO {
@ApiModelProperty(value = "标题英文")
private String titleEn;
@ExcelProperty("标题法文")
@ApiModelProperty(value = "标题法文")
private String titleFr;
@ExcelProperty("内容中文")
@ApiModelProperty(value = "内容中文")
private String contentZh;
......@@ -43,6 +47,10 @@ public class NeedKnowBackVO {
@ApiModelProperty(value = "内容英语")
private String contentEn;
@ExcelProperty("内容法语")
@ApiModelProperty(value = "内容法语")
private String contentFr;
@ExcelProperty(value = "0-启用,1-停用", converter = DictConvert.class)
@DictFormat("need_know_status") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
@ApiModelProperty(value = "0-启用,1-停用")
......
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/vo/needKnow/NeedKnowQueryVO.java
View file @ 08b09baa
......@@ -21,6 +21,9 @@ public class NeedKnowQueryVO {
@ApiModelProperty(value = "标题英文")
private String titleEn;
@ApiModelProperty(value = "标题法文")
private String titleFr;
@ApiModelProperty(value = "0-启用,1-停用")
private Integer status;
......
yudao-server/src/main/resources/i18n/messages_fr.properties 0 → 100644
View file @ 08b09baa
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment