Skip to content

J
jiedao-api-boot-master
Commit c5a0d0e2 authored by 332784038@qq.com's avatar 332784038@qq.com
Browse files
Options

Merge branch 'master-fix' into dev

parents 86a03f4c 1c7b383b
Expand all Show whitespace changes
Inline Side-by-side
Showing with 140 additions and 17 deletions
sql/update_2024-07.sql 0 → 100644
View file @ c5a0d0e2
-- 兰博明添加的业务字段与表补充sql脚本
alter table `ecw_order`
add column `has_consignee` bit(1) DEFAULT b'1' COMMENT '是否有收货人，1-是，0-否';
alter table `ecw_order`
add column `yeji_create_date` datetime DEFAULT NULL COMMENT '订单业绩产生时间';
alter table `ecw_order`
add column `yeji_type` int DEFAULT NULL COMMENT '业绩类型，1是新客户业绩，0是老客户业绩';
alter table `ecw_order`
add column `cal_v_value` decimal(15,2) DEFAULT NULL COMMENT '根据体积或重量计算出的V值';
CREATE TABLE `compare_air_customer_result` (
`id` bigint NOT NULL AUTO_INCREMENT,
`number` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'name',
`name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'name',
`phone` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'phone',
`old_customer_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'old_customerName',
`customer_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'customerName',
`enter_open_sea_time` datetime DEFAULT NULL COMMENT '入公海时间',
`creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '创建者',
`create_time` datetime DEFAULT NULL COMMENT '创建时间',
`type` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'type',
PRIMARY KEY (`id`)
) ENGINE=InnoDB COMMENT='客户比对表结果表';
CREATE TABLE `customer_old_new_tmp` (
`id` int NOT NULL AUTO_INCREMENT,
`old_number` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
`old_id` int DEFAULT NULL,
`new_number` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
`new_id` int DEFAULT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB ;
CREATE TABLE `ecw_vz` (
`id` int NOT NULL AUTO_INCREMENT,
`title_zh` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '中文名称',
`title_en` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '英文名称',
`fuhao` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '单位符号',
`vz` float DEFAULT NULL COMMENT 'v值',
`status` tinyint(1) DEFAULT '0' COMMENT '0显示 1不显示',
`aorder` int DEFAULT NULL COMMENT '排序',
`create_time` datetime DEFAULT NULL,
`update_time` datetime DEFAULT NULL,
`creator` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
`updater` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
`deleted` tinyint(1) DEFAULT '0' COMMENT '0显示 1不显示',
PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB ROW_FORMAT=DYNAMIC COMMENT='计量单位表';
-- 新增订单产生业绩时归属客户状态
alter table `ecw_order`
add column `is_in_open_sea` tinyint DEFAULT '0' COMMENT '是否公海客户',
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/dal/dataobject/order/OrderDO.java
View file @ c5a0d0e2
......@@ -624,4 +624,7 @@ public class OrderDO extends BaseDO {
private BigDecimal calVValue;
@ApiModelProperty(value = "是否在公海")
private Boolean isInOpenSea;
}
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/dto/OrderBackInfoDto.java
View file @ c5a0d0e2
......@@ -527,6 +527,9 @@ public class OrderBackInfoDto {
@ApiModelProperty(value = "是否有收货人，1-是，0-否")
private Boolean hasConsignee = true;
@ApiModelProperty(value = "是否在公海")
private Boolean isInOpenSea;
public void setExceptionReason(String exceptionReason) {
this.exceptionReason = exceptionReason;
if (StringUtils.isNotBlank(exceptionReason) && Objects.nonNull(this.lang)) {
......
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/targetLog/TargetLogServiceImpl.java
View file @ c5a0d0e2
......@@ -148,24 +148,28 @@ public class TargetLogServiceImpl extends AbstractService<TargetLogMapper, Targe
return;
}
OrderBackInfoDto info = orderQueryService.info(orderId);
if (info != null && info.getSalesmanId()!=null && info.getSalesmanId()>0L) {//客户经理
Long customerId = 0L;
if (info.getType().contains("2")) {//海外仓归属发货人
customerId = info.getConsignorVO().getCustomerId();
} else {
if (info.getIsCargoControl()) {//非海外控货归属发货人
customerId = info.getConsignorVO().getCustomerId();
} else {
if (info.getDrawee() == 1) {//非海外非控货 付款人为发货人 归属发货人
customerId = info.getConsignorVO().getCustomerId();
} else { //非海外非控货 付款人为其他 归属收货人
customerId = info.getConsigneeVO().getCustomerId();
}
}
if (info.getIsInOpenSea()){
// 订单归属客户产生业绩时在公海池，不添加业绩日志
return;
}
// if (info != null && info.getSalesmanId()!=null && info.getSalesmanId()>0L) {//客户经理
// Long customerId = info.getCustomerId();
// if (info.getType().contains("2")) {//海外仓归属发货人
// customerId = info.getConsignorVO().getCustomerId();
// } else {
// if (info.getIsCargoControl()) {//非海外控货归属发货人
// customerId = info.getConsignorVO().getCustomerId();
// } else {
// if (info.getDrawee() == 1) {//非海外非控货 付款人为发货人 归属发货人
// customerId = info.getConsignorVO().getCustomerId();
// } else { //非海外非控货 付款人为其他 归属收货人
// customerId = info.getConsigneeVO().getCustomerId();
// }
// }
// }
TargetLogDO targetLogDO = new TargetLogDO();
targetLogDO.setOrderId(orderId);
targetLogDO.setCustomerId(customerId);
targetLogDO.setCustomerId(info.getCustomerId());
targetLogDO.setUserId(info.getSalesmanId());
targetLogDO.setAchievementTime(achievementTime);
if (info.getTransportId() == 3) {
......@@ -178,6 +182,6 @@ public class TargetLogServiceImpl extends AbstractService<TargetLogMapper, Targe
targetLogDO.setType(type);
targetLogMapper.insert(targetLogDO);
// customerService.updateCustomerIsNewToOld(customerId);
}
// }
}
}
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/order/OrderBackVO.java
View file @ c5a0d0e2
......@@ -583,6 +583,10 @@ public class OrderBackVO {
private List<OrderItemDO> orderItemDOList;
@ApiModelProperty(value = "是否在公海")
private Boolean isInOpenSea;
public void setExternalWarehouseJson(String externalWarehouseJson) {
this.externalWarehouseJson = externalWarehouseJson;
if (StringUtils.isNotBlank(externalWarehouseJson)) {
......
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/order/OrderBaseVO.java
View file @ c5a0d0e2
......@@ -352,6 +352,9 @@ public class OrderBaseVO {
@ApiModelProperty(value = "是否显示提单金额")
private Boolean displayBillLadingPrice;
@ApiModelProperty(value = "是否在公海")
private Boolean isInOpenSea;
public void setExceptionReason(String exceptionReason) {
this.exceptionReason = StringUtils.isNotBlank(exceptionReason) ? I18nMessage.getMessage(exceptionReason) : exceptionReason;
}
......
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/order/OrderExcelVO.java
View file @ c5a0d0e2
......@@ -283,6 +283,10 @@ public class OrderExcelVO {
@ApiModelProperty(value = "关联订单状态")
private List<GuanLianOrderStatusVO> guanLianOrderStatusVOList;
@ExcelIgnore
@ApiModelProperty(value = "是否在公海")
private Boolean isInOpenSea;
public void setWarehouseInInfo(String warehouseInInfo) {
this.warehouseInInfo = warehouseInInfo;
if (StringUtils.isNotBlank(warehouseInInfo)) {
......
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/order/OrderQueryVO.java
View file @ c5a0d0e2
......@@ -521,6 +521,10 @@ public class OrderQueryVO {
private Integer asStatus;
@ApiModelProperty(value = "是否在公海")
private Boolean isInOpenSea;
public void setStatus(Integer status) {
this.status = status;
this.asStatus = status;
......
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