caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

订单分包裹发货问题修复

Browse Source
This commit is contained in:
chc 2024-12-25 10:01:47 +08:00
parent 034f29c734
commit 586a507bb1
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
framework/src/main/java/cn/lili/common/validation/Phone.java
View File

@ -22,7 +22,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
@Constraint(validatedBy = {PhoneValidator.class})
public @interface Phone {
String regexp() default "1[3|4|5|7|8]\\d{9}";
String regexp() default "1[3|4|5|7|8|9]\\d{9}";
String message() default "手机号码格式不正确";

4
framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderPackageServiceImpl.java
View File

@ -54,8 +54,8 @@ public class OrderPackageServiceImpl extends ServiceImpl<OrderPackageMapper, Ord
orderPackageVO.setOrderPackageItemList(orderPackageItemList);
String str = orderPackage.getConsigneeMobile();
str = str.substring(str.length() - 4);
// Traces traces = logisticsService.getLogisticTrack(orderPackage.getLogisticsCode(), orderPackage.getLogisticsNo(), str);
// orderPackageVO.setTraces(traces);
Traces traces = logisticsService.getLogisticTrack(orderPackage.getLogisticsCode(), orderPackage.getLogisticsNo(), str);
orderPackageVO.setTraces(traces);
orderPackageVOS.add(orderPackageVO);
});

2
framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java
View File

@ -865,7 +865,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
orderPackage.setPackageNo(SnowFlake.createStr("OP"));
orderPackage.setOrderSn(orderSn);
orderPackage.setLogisticsNo(invoiceNumber);
orderPackage.setLogisticsCode(logistics.getCode());
orderPackage.setLogisticsCode(logistics.getId());
orderPackage.setLogisticsName(logistics.getName());
orderPackage.setStatus("1");
orderPackage.setConsigneeMobile(order.getConsigneeMobile());