Skip to content

J
jiedao-api-boot-master
Commit 3e19f25c authored by zhengyi's avatar zhengyi
Browse files
Options

Merge branch 'master' into order-update

parents b26c164d 771f9571
Hide whitespace changes
Inline Side-by-side
Showing with 222 additions and 210 deletions
sql/update_2024-07.sql
View file @ 3e19f25c
......@@ -13,17 +13,17 @@ alter table `ecw_order`
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`)
`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='客户比对表结果表';
......
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderServiceImpl.java
View file @ 3e19f25c
......@@ -2544,7 +2544,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
}
} else if (vo.getDrawee() == 2) {//收货人付款 层级5 第一个
if (consigneeDO != null) {
vo.setCustomerId(orderConsignorBackVO.getCustomerId());
vo.setCustomerId(orderConsigneeBackVO.getCustomerId());
} else {
//没有收货人
vo.setCustomerId(0L);
......@@ -2555,7 +2555,6 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
} else if (vo.getDrawee() == 3) { //自定义付款
List<CustomDraweeVO> list = JSONObject.parseArray(vo.getCustomDrawee(), CustomDraweeVO.class);
if (CollectionUtil.isNotEmpty(list)) {
List<CustomDraweeVO> freightList = list.stream().filter(s -> s.getName().equals("freight")).collect(Collectors.toList());
List<CustomDraweeVO> clearanceFeeList = list.stream().filter(s -> s.getName().equals("clearanceFee")).collect(Collectors.toList());
int freight = freightList.get(0).getValue();//运费
......@@ -2577,7 +2576,6 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
} else {
//业绩归收货人
vo.setCustomerId(orderConsigneeBackVO.getCustomerId() != null ? orderConsigneeBackVO.getCustomerId() : 0);
customerType = 2;
}
}
......@@ -4257,6 +4255,11 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
case UNLOADED_CABINET:
// if (Objects.isNull(currentOrderDO.getUnloadTime())) {
currentOrderDO.setUnloadTime(now);
// }
break;
case UNLOADED_CABINET_AIR:
// if (Objects.isNull(currentOrderDO.getUnloadTime())) {
currentOrderDO.setUnloadTime(now);
// }
break;
case PICKED_UP:
......
yudao-module-order/yudao-module-order-rest/src/main/java/cn/iocoder/yudao/module/order/controller/app/order/MyOrderController.java
View file @ 3e19f25c
......@@ -336,8 +336,9 @@ public class MyOrderController {
OrderBackInfoDto dto = orderQueryService.info(orderId);
dto.setUserType(UserTypeEnum.MEMBER.getValue());
if (CollectionUtil.isNotEmpty(dto.getOrderTimeVOList())) {
List<OrderTimeBackVO> orderTimeVOList = dto.getOrderTimeVOList().stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(OrderTimeBackVO::getStatusType))), ArrayList::new));
dto.setOrderTimeVOList(orderTimeVOList.stream().sorted(Comparator.comparing(OrderTimeBackVO::getId).reversed()).collect(Collectors.toList()));
List<OrderTimeBackVO> orderTimeVOList = dto.getOrderTimeVOList().stream()
.collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(OrderTimeBackVO::getStatusType))), ArrayList::new));
dto.setOrderTimeVOList(orderTimeVOList.stream().filter(t -> t.getStatus() != 15 && t.getStatus() != 150330).sorted(Comparator.comparing(OrderTimeBackVO::getId).reversed()).collect(Collectors.toList()));
}
return success(dto);
}
......
yudao-module-product/yudao-module-product-core/src/main/java/cn/iocoder/yudao/module/product/listener/ProductPriceExcelExportListener.java
View file @ 3e19f25c
......@@ -78,7 +78,7 @@ public class ProductPriceExcelExportListener {
String nowTime = formatter.format(LocalDateTime.now());
String dir = ueProperties.getTempDir().concat("/productPrice/excel/");
File fileDir = new File(dir);
if(!fileDir.exists()) {
if (!fileDir.exists()) {
fileDir.mkdirs();
}
......@@ -89,11 +89,11 @@ public class ProductPriceExcelExportListener {
long total = productPriceService.getExcelListCount(exportReqVO);
int pageNumber = (int) Math.ceil((double) total / (double) pageSize);
String sheetName = "路线价格第{0}页";
String sheetName = "路线价格第{0}页";
List<CurrencyDO> currencyList = currencyService.getCurrencyList();
Map<Integer, CurrencyDO> currencyMap = currencyList.stream()
.collect(Collectors.toMap(CurrencyDO::getId, v->v));
.collect(Collectors.toMap(CurrencyDO::getId, v -> v));
List<UnitDO> unitList = unitService.getUnitList();
Map<Integer, UnitDO> unitMap = unitList.stream()
......@@ -113,7 +113,7 @@ public class ProductPriceExcelExportListener {
List<ProductPriceExcelData> list =
productPriceService.getExcelList(pageSize, maxId, exportReqVO);
log.error("路线价格数据{}-{}处理成功", start, end);
if(CollectionUtil.isEmpty(list)) continue;
if (CollectionUtil.isEmpty(list)) continue;
maxId = list.get(list.size() - 1).getId();
for (ProductPriceExcelData item : list) {
......@@ -121,7 +121,7 @@ public class ProductPriceExcelExportListener {
String transportPrice = "";
String clearancePrice = "";
if(item.getStepPrice() == 0) {
if (item.getStepPrice() == 0) {
transportPrice = getPrice(item.getTransportPrice(),
item.getTransportPriceUnit().intValue(),
item.getTransportVolumeUnit().intValue(), currencyMap, unitMap);
......@@ -132,13 +132,13 @@ public class ProductPriceExcelExportListener {
String allPrice = getPrice(item.getAllPrice(), item.getAllPriceUnit().intValue(),
item.getAllVolumeUnit().intValue(), currencyMap, unitMap);
if(item.getPriceType() == 1) {
if (item.getPriceType() == 1) {
transportPrice = allPrice;
clearancePrice = "";
}
List<ProductPriceSpecialDO> specialList = item.getSpecialList();
if(CollectionUtil.isNotEmpty(specialList)) {
if (CollectionUtil.isNotEmpty(specialList)) {
for (ProductPriceSpecialDO specialDO : specialList) {
String key = specialDO.getSpecialDictType();
String specialTransportPrice = getPrice(specialDO.getTransportPrice(),
......@@ -151,31 +151,31 @@ public class ProductPriceExcelExportListener {
String specialAllPrice = getPrice(specialDO.getAllPrice(), specialDO.getAllPriceUnit().intValue(),
specialDO.getAllVolumeUnit().intValue(), currencyMap, unitMap);
if(item.getPriceType() == 1) {
if (item.getPriceType() == 1) {
specialTransportPrice = specialAllPrice;
specialClearancePrice = "";
}
if(key.equals("licensed_price")) {
if (key.equals("licensed_price")) {
item.setYpTransportPrice(specialTransportPrice);
item.setYpClearancePrice(specialClearancePrice);
} else if(key.equals("neutral_brand_prices")) {
} else if (key.equals("neutral_brand_prices")) {
item.setZxTransportPrice(specialTransportPrice);
item.setZxClearancePrice(specialClearancePrice);
} else if(key.equals("liquid_price")) {
} else if (key.equals("liquid_price")) {
item.setYtTransportPrice(specialTransportPrice);
item.setYtClearancePrice(specialClearancePrice);
} else if(key.equals("live_price")) {
} else if (key.equals("live_price")) {
item.setDdTransportPrice(specialTransportPrice);
item.setDdClearancePrice(specialClearancePrice);
}
}
}
} else if(item.getStepPrice() == 1) {
} else if (item.getStepPrice() == 1) {
//阶梯价格
List<ProductPriceStepDO> stepList = item.getStepList();
if(CollectionUtil.isNotEmpty(stepList)) {
if (CollectionUtil.isNotEmpty(stepList)) {
Map<Integer, List<ProductPriceStepDO>> stepTypeMap = stepList.stream()
.collect(Collectors.groupingBy(ProductPriceStepDO::getPriceType));
List<ProductPriceStepDO> yfStepList = stepTypeMap.get(PriceTypeEnum.FREIGHT.getPriceType());
......@@ -193,157 +193,158 @@ public class ProductPriceExcelExportListener {
StringBuilder ytqgfSb = new StringBuilder();
StringBuilder ddyfSb = new StringBuilder();
StringBuilder ddqgfSb = new StringBuilder();
if(CollectionUtil.isNotEmpty(yfStepList)) {
yfStepList.sort(Comparator.comparing(ProductPriceStepDO::getRankNum));
for (int j = 1; j <= yfStepList.size(); j++) {
ProductPriceStepDO stepDO = yfStepList.get(j - 1);
List<ProductPriceStepSpecialDO> stepSpecialDOS = stepDO.getSpecialList();
if(CollectionUtil.isNotEmpty(stepSpecialDOS)) {
Map<String, ProductPriceStepSpecialDO> stepSpecialDOMap = stepSpecialDOS.stream()
.collect(Collectors.toMap(ProductPriceStepSpecialDO::getSpecialDictType, v -> v, (v1,v2) -> v2));
//有牌
ProductPriceStepSpecialDO yp = stepSpecialDOMap.get("licensed_price");
//中性
ProductPriceStepSpecialDO zx = stepSpecialDOMap.get("neutral_brand_prices");
//液体
ProductPriceStepSpecialDO yt = stepSpecialDOMap.get("liquid_price");
//带电
ProductPriceStepSpecialDO dd = stepSpecialDOMap.get("live_price");
String stepInfo = "第" + j + "阶梯： ";
addStepSpecialPrice(yp, currencyMap, unitMap, ypyfSb, stepInfo, PriceTypeEnum.FREIGHT);
addStepSpecialPrice(zx, currencyMap, unitMap, zxyfSb, stepInfo, PriceTypeEnum.FREIGHT);
addStepSpecialPrice(yt, currencyMap, unitMap, ytyfSb, stepInfo, PriceTypeEnum.FREIGHT);
addStepSpecialPrice(dd, currencyMap, unitMap, ddyfSb, stepInfo, PriceTypeEnum.FREIGHT);
if(i != yfStepList.size()) {
ypyfSb.append((char)10);
zxyfSb.append((char)10);
ytyfSb.append((char)10);
ddyfSb.append((char)10);
if (item.getPriceType() == 0) {
if (CollectionUtil.isNotEmpty(yfStepList)) {
yfStepList.sort(Comparator.comparing(ProductPriceStepDO::getRankNum));
for (int j = 1; j <= yfStepList.size(); j++) {
ProductPriceStepDO stepDO = yfStepList.get(j - 1);
List<ProductPriceStepSpecialDO> stepSpecialDOS = stepDO.getSpecialList();
if (CollectionUtil.isNotEmpty(stepSpecialDOS)) {
Map<String, ProductPriceStepSpecialDO> stepSpecialDOMap = stepSpecialDOS.stream()
.collect(Collectors.toMap(ProductPriceStepSpecialDO::getSpecialDictType, v -> v, (v1, v2) -> v2));
//有牌
ProductPriceStepSpecialDO yp = stepSpecialDOMap.get("licensed_price");
//中性
ProductPriceStepSpecialDO zx = stepSpecialDOMap.get("neutral_brand_prices");
//液体
ProductPriceStepSpecialDO yt = stepSpecialDOMap.get("liquid_price");
//带电
ProductPriceStepSpecialDO dd = stepSpecialDOMap.get("live_price");
String stepInfo = "第" + j + "阶梯： ";
addStepSpecialPrice(yp, currencyMap, unitMap, ypyfSb, stepInfo, PriceTypeEnum.FREIGHT);
addStepSpecialPrice(zx, currencyMap, unitMap, zxyfSb, stepInfo, PriceTypeEnum.FREIGHT);
addStepSpecialPrice(yt, currencyMap, unitMap, ytyfSb, stepInfo, PriceTypeEnum.FREIGHT);
addStepSpecialPrice(dd, currencyMap, unitMap, ddyfSb, stepInfo, PriceTypeEnum.FREIGHT);
if (i != yfStepList.size()) {
ypyfSb.append((char) 10);
zxyfSb.append((char) 10);
ytyfSb.append((char) 10);
ddyfSb.append((char) 10);
}
}
}
String stepTransportPrice = getPrice(stepDO.getTransportPrice(),
stepDO.getTransportPriceUnit().intValue(),
stepDO.getTransportVolumeUnit().intValue(), currencyMap, unitMap);
String stepTransportPrice = getPrice(stepDO.getTransportPrice(),
stepDO.getTransportPriceUnit().intValue(),
stepDO.getTransportVolumeUnit().intValue(), currencyMap, unitMap);
Long weightUnit = stepDO.getWeightUnit();
String unit = "";
if(weightUnit != null) {
UnitDO unitDO = unitMap.get(weightUnit.intValue());
unit = unitDO.getTitleZh();
}
BigDecimal startNum = stepDO.getStartNum();
BigDecimal endNum = stepDO.getEndNum();
transportPriceSb.append("第").append(j).append("阶梯：").append(startNum)
.append("-").append(endNum).append(unit).append(" ").append(stepTransportPrice);
if(i != stepList.size()) {
transportPriceSb.append((char)10);
Long weightUnit = stepDO.getWeightUnit();
String unit = "";
if (weightUnit != null) {
UnitDO unitDO = unitMap.get(weightUnit.intValue());
unit = Objects.nonNull(unitDO) ? unitDO.getTitleZh() : "空";
}
BigDecimal startNum = stepDO.getStartNum();
BigDecimal endNum = stepDO.getEndNum();
transportPriceSb.append("第").append(j).append("阶梯：").append(startNum)
.append("-").append(endNum).append(unit).append(" ").append(stepTransportPrice);
if (i != stepList.size()) {
transportPriceSb.append((char) 10);
}
}
}
}
if(CollectionUtil.isNotEmpty(qgfStepList)) {
qgfStepList.sort(Comparator.comparing(ProductPriceStepDO::getRankNum));
for (int j = 1; j <= qgfStepList.size(); j++) {
ProductPriceStepDO stepDO = qgfStepList.get(j - 1);
List<ProductPriceStepSpecialDO> stepSpecialDOS = stepDO.getSpecialList();
if(CollectionUtil.isNotEmpty(stepSpecialDOS)) {
Map<String, ProductPriceStepSpecialDO> stepSpecialDOMap = stepSpecialDOS.stream()
.collect(Collectors.toMap(ProductPriceStepSpecialDO::getSpecialDictType, v -> v, (v1,v2) -> v2));
//有牌
ProductPriceStepSpecialDO yp = stepSpecialDOMap.get("licensed_price");
//中性
ProductPriceStepSpecialDO zx = stepSpecialDOMap.get("neutral_brand_prices");
//液体
ProductPriceStepSpecialDO yt = stepSpecialDOMap.get("liquid_price");
//带电
ProductPriceStepSpecialDO dd = stepSpecialDOMap.get("live_price");
String stepInfo = "第" + j + "阶梯： ";
addStepSpecialPrice(yp, currencyMap, unitMap, ypqgfSb, stepInfo, PriceTypeEnum.CLEARANCE);
addStepSpecialPrice(zx, currencyMap, unitMap, zxqgfSb, stepInfo, PriceTypeEnum.CLEARANCE);
addStepSpecialPrice(yt, currencyMap, unitMap, ytqgfSb, stepInfo, PriceTypeEnum.CLEARANCE);
addStepSpecialPrice(dd, currencyMap, unitMap, ddqgfSb, stepInfo, PriceTypeEnum.CLEARANCE);
if(i != qgfStepList.size()) {
ypqgfSb.append((char)10);
zxqgfSb.append((char)10);
ytqgfSb.append((char)10);
ddqgfSb.append((char)10);
if (CollectionUtil.isNotEmpty(qgfStepList)) {
qgfStepList.sort(Comparator.comparing(ProductPriceStepDO::getRankNum));
for (int j = 1; j <= qgfStepList.size(); j++) {
ProductPriceStepDO stepDO = qgfStepList.get(j - 1);
List<ProductPriceStepSpecialDO> stepSpecialDOS = stepDO.getSpecialList();
if (CollectionUtil.isNotEmpty(stepSpecialDOS)) {
Map<String, ProductPriceStepSpecialDO> stepSpecialDOMap = stepSpecialDOS.stream()
.collect(Collectors.toMap(ProductPriceStepSpecialDO::getSpecialDictType, v -> v, (v1, v2) -> v2));
//有牌
ProductPriceStepSpecialDO yp = stepSpecialDOMap.get("licensed_price");
//中性
ProductPriceStepSpecialDO zx = stepSpecialDOMap.get("neutral_brand_prices");
//液体
ProductPriceStepSpecialDO yt = stepSpecialDOMap.get("liquid_price");
//带电
ProductPriceStepSpecialDO dd = stepSpecialDOMap.get("live_price");
String stepInfo = "第" + j + "阶梯： ";
addStepSpecialPrice(yp, currencyMap, unitMap, ypqgfSb, stepInfo, PriceTypeEnum.CLEARANCE);
addStepSpecialPrice(zx, currencyMap, unitMap, zxqgfSb, stepInfo, PriceTypeEnum.CLEARANCE);
addStepSpecialPrice(yt, currencyMap, unitMap, ytqgfSb, stepInfo, PriceTypeEnum.CLEARANCE);
addStepSpecialPrice(dd, currencyMap, unitMap, ddqgfSb, stepInfo, PriceTypeEnum.CLEARANCE);
if (i != qgfStepList.size()) {
ypqgfSb.append((char) 10);
zxqgfSb.append((char) 10);
ytqgfSb.append((char) 10);
ddqgfSb.append((char) 10);
}
}
}
String stepClearancePrice = getPrice(stepDO.getClearancePrice(),
stepDO.getClearancePriceUnit().intValue(),
stepDO.getClearanceVolumeUnit().intValue(), currencyMap, unitMap);
String stepClearancePrice = getPrice(stepDO.getClearancePrice(),
stepDO.getClearancePriceUnit().intValue(),
stepDO.getClearanceVolumeUnit().intValue(), currencyMap, unitMap);
//
Long weightUnit = stepDO.getWeightUnit();
String unit = "";
if(weightUnit != null) {
UnitDO unitDO = unitMap.get(weightUnit.intValue());
unit = unitDO.getTitleZh();
}
BigDecimal startNum = stepDO.getStartNum();
BigDecimal endNum = stepDO.getEndNum();
clearancePriceSb.append("第").append(j).append("阶梯：").append(startNum)
.append("-").append(endNum).append(unit).append(" ").append(stepClearancePrice);
if(i != stepList.size()) {
clearancePriceSb.append((char)10);
Long weightUnit = stepDO.getWeightUnit();
String unit = "";
if (weightUnit != null) {
UnitDO unitDO = unitMap.get(weightUnit.intValue());
unit = Objects.nonNull(unitDO) ? unitDO.getTitleZh() : "空";
}
BigDecimal startNum = stepDO.getStartNum();
BigDecimal endNum = stepDO.getEndNum();
clearancePriceSb.append("第").append(j).append("阶梯：").append(startNum)
.append("-").append(endNum).append(unit).append(" ").append(stepClearancePrice);
if (i != stepList.size()) {
clearancePriceSb.append((char) 10);
}
}
}
}
if(CollectionUtil.isNotEmpty(qbjStepList) && item.getPriceType() == 1) {
qbjStepList.sort(Comparator.comparing(ProductPriceStepDO::getRankNum));
for (int j = 1; j <= qbjStepList.size(); j++) {
ProductPriceStepDO stepDO = qbjStepList.get(j - 1);
List<ProductPriceStepSpecialDO> stepSpecialDOS = stepDO.getSpecialList();
if(CollectionUtil.isNotEmpty(stepSpecialDOS)) {
Map<String, ProductPriceStepSpecialDO> stepSpecialDOMap = stepSpecialDOS.stream()
.collect(Collectors.toMap(ProductPriceStepSpecialDO::getSpecialDictType, v -> v, (v1,v2) -> v2));
//有牌
ProductPriceStepSpecialDO yp = stepSpecialDOMap.get("licensed_price");
//中性
ProductPriceStepSpecialDO zx = stepSpecialDOMap.get("neutral_brand_prices");
//液体
ProductPriceStepSpecialDO yt = stepSpecialDOMap.get("liquid_price");
//带电
ProductPriceStepSpecialDO dd = stepSpecialDOMap.get("live_price");
String stepInfo = "第" + j + "阶梯： ";
addStepSpecialPrice(yp, currencyMap, unitMap, ypyfSb, stepInfo, PriceTypeEnum.FULL_PRICE);
addStepSpecialPrice(zx, currencyMap, unitMap, zxyfSb, stepInfo, PriceTypeEnum.FULL_PRICE);
addStepSpecialPrice(yt, currencyMap, unitMap, ytyfSb, stepInfo, PriceTypeEnum.FULL_PRICE);
addStepSpecialPrice(dd, currencyMap, unitMap, ddyfSb, stepInfo, PriceTypeEnum.FULL_PRICE);
if(i != qbjStepList.size()) {
ypyfSb.append((char)10);
zxyfSb.append((char)10);
ytyfSb.append((char)10);
ddyfSb.append((char)10);
if (item.getPriceType() == 1) {
if (CollectionUtil.isNotEmpty(qbjStepList) && item.getPriceType() == 1) {
qbjStepList.sort(Comparator.comparing(ProductPriceStepDO::getRankNum));
for (int j = 1; j <= qbjStepList.size(); j++) {
ProductPriceStepDO stepDO = qbjStepList.get(j - 1);
List<ProductPriceStepSpecialDO> stepSpecialDOS = stepDO.getSpecialList();
if (CollectionUtil.isNotEmpty(stepSpecialDOS)) {
Map<String, ProductPriceStepSpecialDO> stepSpecialDOMap = stepSpecialDOS.stream()
.collect(Collectors.toMap(ProductPriceStepSpecialDO::getSpecialDictType, v -> v, (v1, v2) -> v2));
//有牌
ProductPriceStepSpecialDO yp = stepSpecialDOMap.get("licensed_price");
//中性
ProductPriceStepSpecialDO zx = stepSpecialDOMap.get("neutral_brand_prices");
//液体
ProductPriceStepSpecialDO yt = stepSpecialDOMap.get("liquid_price");
//带电
ProductPriceStepSpecialDO dd = stepSpecialDOMap.get("live_price");
String stepInfo = "第" + j + "阶梯： ";
addStepSpecialPrice(yp, currencyMap, unitMap, ypyfSb, stepInfo, PriceTypeEnum.FULL_PRICE);
addStepSpecialPrice(zx, currencyMap, unitMap, zxyfSb, stepInfo, PriceTypeEnum.FULL_PRICE);
addStepSpecialPrice(yt, currencyMap, unitMap, ytyfSb, stepInfo, PriceTypeEnum.FULL_PRICE);
addStepSpecialPrice(dd, currencyMap, unitMap, ddyfSb, stepInfo, PriceTypeEnum.FULL_PRICE);
if (i != qbjStepList.size()) {
ypyfSb.append((char) 10);
zxyfSb.append((char) 10);
ytyfSb.append((char) 10);
ddyfSb.append((char) 10);
}
}
}
//
String stepTransportPrice = getPrice(stepDO.getAllPrice(), stepDO.getAllPriceUnit().intValue(),
stepDO.getAllVolumeUnit().intValue(), currencyMap, unitMap);
String stepTransportPrice = getPrice(stepDO.getAllPrice(), stepDO.getAllPriceUnit().intValue(),
stepDO.getAllVolumeUnit().intValue(), currencyMap, unitMap);
//
Long weightUnit = stepDO.getWeightUnit();
String unit = "";
if(weightUnit != null) {
UnitDO unitDO = unitMap.get(weightUnit.intValue());
unit = unitDO.getTitleZh();
}
BigDecimal startNum = stepDO.getStartNum();
BigDecimal endNum = stepDO.getEndNum();
transportPriceSb.append("第").append(j).append("阶梯：").append(startNum)
.append("-").append(endNum).append(unit).append(" ").append(stepTransportPrice);
if(i != stepList.size()) {
transportPriceSb.append((char)10);
Long weightUnit = stepDO.getWeightUnit();
String unit = "";
if (weightUnit != null) {
UnitDO unitDO = unitMap.get(weightUnit.intValue());
unit = Objects.nonNull(unitDO) ? unitDO.getTitleZh() : "空";
}
BigDecimal startNum = stepDO.getStartNum();
BigDecimal endNum = stepDO.getEndNum();
transportPriceSb.append("第").append(j).append("阶梯：").append(startNum)
.append("-").append(endNum).append(unit).append(" ").append(stepTransportPrice);
if (i != stepList.size()) {
transportPriceSb.append((char) 10);
}
}
}
}
transportPrice = transportPriceSb.toString();
clearancePrice = clearancePriceSb.toString();
......@@ -363,9 +364,9 @@ public class ProductPriceExcelExportListener {
statusName(item);
if(item.getNeedPay() == 0) {
if (item.getNeedPay() == 0) {
item.setPayType("到付");
} else if(item.getNeedPay() == 1) {
} else if (item.getNeedPay() == 1) {
item.setPayType("预付");
}
String date = DateUtil.format(item.getUpdateTime(), "yyyy-MM-dd HH:mm:ss");
......@@ -374,12 +375,12 @@ public class ProductPriceExcelExportListener {
Date startDate = item.getValidateStartDate();
Date endDate = item.getValidateEndDate();
StringBuilder expireSb = new StringBuilder();
if(startDate != null) {
if (startDate != null) {
String startDateStr = DateUtil.format(startDate, "yyyy-MM-dd");
expireSb.append(startDateStr);
}
expireSb.append("~");
if(endDate != null) {
if (endDate != null) {
String endDateStr = DateUtil.format(endDate, "yyyy-MM-dd");
expireSb.append(endDateStr);
}
......@@ -388,10 +389,10 @@ public class ProductPriceExcelExportListener {
List<ProductPriceExcelVO> datas = ProductPriceConvert.INSTANCE.convertList02(list);
excelWriter.write(datas, writeSheet);
list.forEach(m -> {
if(m.getSpecialList() != null) {
if (m.getSpecialList() != null) {
m.getSpecialList().clear();
}
if(m.getStepList() != null) {
if (m.getStepList() != null) {
m.getStepList().clear();
}
});
......@@ -417,8 +418,8 @@ public class ProductPriceExcelExportListener {
event.setFileId(fileDO.getId());
} catch (Exception e) {
// TODO 测试阶段打印堆栈错误信息，便于分析原因
e.printStackTrace();
event.setResult(e.getMessage());
log.error(e + "");
event.setResult(e + "");
}
} else {
event.setResult("param fail");
......@@ -427,20 +428,20 @@ public class ProductPriceExcelExportListener {
}
private void addStepSpecialPrice(ProductPriceStepSpecialDO stepSpecialDO, Map<Integer, CurrencyDO> currencyMap,
Map<Integer, UnitDO> unitMap, StringBuilder sb, String stepInfo, PriceTypeEnum priceTypeEnum) {
Map<Integer, UnitDO> unitMap, StringBuilder sb, String stepInfo, PriceTypeEnum priceTypeEnum) {
sb.append(stepInfo);
if(stepSpecialDO != null) {
if(priceTypeEnum == PriceTypeEnum.FREIGHT) {
if (stepSpecialDO != null) {
if (priceTypeEnum == PriceTypeEnum.FREIGHT) {
String specialTransportPrice = getPrice(stepSpecialDO.getTransportPrice(),
stepSpecialDO.getTransportPriceUnit().intValue(),
stepSpecialDO.getTransportVolumeUnit().intValue(), currencyMap, unitMap);
sb.append(specialTransportPrice);
} else if(priceTypeEnum == PriceTypeEnum.CLEARANCE) {
} else if (priceTypeEnum == PriceTypeEnum.CLEARANCE) {
String specialClearancePrice = getPrice(stepSpecialDO.getClearancePrice(),
stepSpecialDO.getClearancePriceUnit().intValue(),
stepSpecialDO.getClearanceVolumeUnit().intValue(), currencyMap, unitMap);
sb.append(specialClearancePrice);
} else if(priceTypeEnum == PriceTypeEnum.FULL_PRICE) {
} else if (priceTypeEnum == PriceTypeEnum.FULL_PRICE) {
String specialAllPrice = getPrice(stepSpecialDO.getAllPrice(), stepSpecialDO.getAllPriceUnit().intValue(),
stepSpecialDO.getAllVolumeUnit().intValue(), currencyMap, unitMap);
sb.append(specialAllPrice);
......@@ -452,8 +453,8 @@ public class ProductPriceExcelExportListener {
CurrencyDO currencyDO = currencyMap.get(priceUnit);
UnitDO unitDO = unitMap.get(volumeUnit);
return (currencyDO != null ? currencyDO.getFuhao() : "") + price.toString() + (currencyDO != null ? currencyDO.getTitleZh() : "") + "/" +
(unitDO != null ? unitDO.getTitleZh() : "");
return (currencyDO != null ? currencyDO.getFuhao() : "空") + price.toString() + (currencyDO != null ? currencyDO.getTitleZh() : "空") + "/" +
(unitDO != null ? unitDO.getTitleZh() : "空");
}
private void statusName(ProductPriceExcelData item) {
......@@ -461,18 +462,18 @@ public class ProductPriceExcelExportListener {
Date endDate = item.getValidateEndDate();
boolean notSetPrice = false;
long now = new Date().getTime();
if(startDate != null && startDate.getTime() > now) {
if (startDate != null && startDate.getTime() > now) {
notSetPrice = true;
}
if(endDate != null && endDate.getTime() < now) {
if (endDate != null && endDate.getTime() < now) {
notSetPrice = true;
}
String setPriceText = notSetPrice ? "（未设置价格）" : "";
if(item.getBlacklist() == 1) {
if (item.getBlacklist() == 1) {
item.setStatusName("黑名单" + setPriceText);
return;
}
if(item.getAuditStatus() == 0) {
if (item.getAuditStatus() == 0) {
item.setStatusName("已审核" + setPriceText);
return;
}
......
yudao-module-product/yudao-module-product-core/src/main/java/cn/iocoder/yudao/module/product/service/product/impl/ProductPriceServiceImpl.java
View file @ 3e19f25c
......@@ -3468,29 +3468,29 @@ public class ProductPriceServiceImpl extends AbstractService<ProductPriceMapper,
ProductPriceStepDO clear = new ProductPriceStepDO();
if (createReqVO.getPriceType() == 1) {
if (CollectionUtil.isNotEmpty(respVO.getFullPriceStepList())) {
respVO.getFullPriceStepList().forEach(pack -> {
ProductPriceStepDO priceStepDO = new ProductPriceStepDO();
BeanUtils.copyProperties(pack, priceStepDO);
priceStepDO.setId(null);
priceStepDO.setStartNum(BigDecimal.valueOf(0));
priceStepDO.setEndNum(BigDecimal.valueOf(0));
priceStepDO.setWeightUnit(price.getTransportPriceUnit());
priceStepDO.setAllPrice(respVO.getAllPrice());
priceStepDO.setAllPriceUnit(respVO.getAllPriceUnit());
priceStepDO.setAllVolumeUnit(respVO.getAllVolumeUnit());
if (CollectionUtil.isNotEmpty(respVO.getSpecialList())) {
List<ProductPriceStepSpecialDO> specialList = new ArrayList<>();
respVO.getSpecialList().forEach(sp -> {
ProductPriceStepSpecialDO specialDO = new ProductPriceStepSpecialDO();
BeanUtils.copyProperties(sp, specialDO);
specialDO.setId(null);
specialList.add(specialDO);
});
priceStepDO.setSpecialList(specialList);
}
fullPriceStepList.add(priceStepDO);
});
createReqVO.setFullPriceStepList(fullPriceStepList);
// respVO.getFullPriceStepList().forEach(pack -> {
// ProductPriceStepDO priceStepDO = new ProductPriceStepDO();
// BeanUtils.copyProperties(pack, priceStepDO);
// priceStepDO.setId(null);
// priceStepDO.setStartNum(BigDecimal.valueOf(0));
// priceStepDO.setEndNum(BigDecimal.valueOf(0));
// priceStepDO.setWeightUnit(price.getTransportPriceUnit());
// priceStepDO.setAllPrice(respVO.getAllPrice());
// priceStepDO.setAllPriceUnit(respVO.getAllPriceUnit());
// priceStepDO.setAllVolumeUnit(respVO.getAllVolumeUnit());
// if (CollectionUtil.isNotEmpty(respVO.getSpecialList())) {
// List<ProductPriceStepSpecialDO> specialList = new ArrayList<>();
// respVO.getSpecialList().forEach(sp -> {
// ProductPriceStepSpecialDO specialDO = new ProductPriceStepSpecialDO();
// BeanUtils.copyProperties(sp, specialDO);
// specialDO.setId(null);
// specialList.add(specialDO);
// });
// priceStepDO.setSpecialList(specialList);
// }
// fullPriceStepList.add(priceStepDO);
// });
createReqVO.setFullPriceStepList(respVO.getFullPriceStepList());
}
} else {
// if (CollectionUtil.isEmpty(respVO.getFreightPriceStepList())) {
......
yudao-module-sale/yudao-module-sale-rest/src/main/java/cn/iocoder/yudao/module/sale/controller/admin/listener/AchievementDetailExcelListener.java
View file @ 3e19f25c
......@@ -69,9 +69,8 @@ public class AchievementDetailExcelListener {
event.setUrl(fileDO.getUrl());
event.setFileId(fileDO.getId());
} catch (Exception e) {
log.info("业绩明细导出失败",e);
e.printStackTrace();
event.setResult(e.getMessage());
log.error("业绩明细导出失败",e);
event.setResult(e + "");
}
}
}
yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/box/BoxServiceImpl.java
View file @ 3e19f25c
......@@ -1914,7 +1914,7 @@ public class BoxServiceImpl extends AbstractService<BoxMapper, BoxDO> implements
orderService.updateStatus(orderId, null, orderStatus, null, inWarehouseState, shipmentState, auditType, auditResult, businessTime, "出货操作", null);
}
// 卸柜/到仓操作时，不在此处更新动态
if (TO_WAREHOUSED.getStatus() != shipmentState) {
if (Objects.nonNull(shipmentState) && TO_WAREHOUSED.getStatus() != shipmentState) {
this.shipmentAirOrderTimeLog(orderIdList, null, businessTime, shipmentState);
}
......@@ -1966,6 +1966,10 @@ public class BoxServiceImpl extends AbstractService<BoxMapper, BoxDO> implements
orderSeaTimeEnum = OrderSeaTimeEnum.SEA_CLEARED;
break;
case UNLOADED:
if (Objects.isNull(businessTime)){
// 到仓业务时间为空时，不更新订单到仓动态
return;
}
orderSeaTimeEnum = OrderSeaTimeEnum.SEA_UNLOADED_CABINET;
break;
}
......@@ -2002,6 +2006,10 @@ public class BoxServiceImpl extends AbstractService<BoxMapper, BoxDO> implements
orderAirTimeEnum = OrderAirTimeEnum.AIR_ARRIVED;
break;
case TO_WAREHOUSED:
if (Objects.isNull(businessTime)){
// 到仓业务时间为空时，不在做订单到仓动态更新
return;
}
orderAirTimeEnum = OrderAirTimeEnum.AIR_UNLOADED_CABINET;
break;
}
......
yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/boxCabinetUnload/BoxCabinetUnloadServiceImpl.java
View file @ 3e19f25c
......@@ -137,14 +137,14 @@ public class BoxCabinetUnloadServiceImpl extends AbstractService<BoxCabinetUnloa
//修改订单状态为已到仓
boxService.updateOrderStatusByShipmentIdAndTransportType(shipmentId, OrderStatusEnum.UNLOADED_CABINET.getValue(),
OrderStatusMsgEnum.UNLOADED_CABINET.getInWarehouseState(),
BoxAirStatusEnum.TO_WAREHOUSED.getStatus(), null, null, ulBoxTime, null, Integer.parseInt(boxDO.getTransportType()));
BoxAirStatusEnum.TO_WAREHOUSED.getStatus(), null, null, null, null, Integer.parseInt(boxDO.getTransportType()));
boxService.addOrderLogByShipmentId(shipmentId, OrderShipmentLog.CABINET_WAREHOUSE, "");
} else {
//修改订单状态为已卸柜
boxService.updateOrderStatusByShipmentIdAndTransportType(shipmentId, OrderStatusEnum.UNLOADED_CABINET.getValue(),
OrderStatusMsgEnum.UNLOADED_CABINET.getInWarehouseState(),
BoxStatusEnum.UNLOADED.getStatus(), null, null, ulBoxTime, null, Integer.parseInt(boxDO.getTransportType()));
BoxStatusEnum.UNLOADED.getStatus(), null, null, null, null, Integer.parseInt(boxDO.getTransportType()));
boxService.addOrderLogByShipmentId(shipmentId, OrderShipmentLog.CABINET_UNLOAD, "");
}
......
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