|
@@ -43,6 +43,7 @@ public class FsStoreDeliversServiceImpl implements FsStoreDeliversService {
|
|
|
|
|
|
@Autowired
|
|
|
private IFsExpressService expressService;
|
|
|
+
|
|
|
@Override
|
|
|
public FsStoreDelivers findById(Integer id) {
|
|
|
return fsStoreDeliversMapper.findById(id);
|
|
@@ -158,7 +159,18 @@ public class FsStoreDeliversServiceImpl implements FsStoreDeliversService {
|
|
|
if(ObjectUtil.isNull(deliveryDTO.getId())){
|
|
|
deliveryDTO.setStatus(0);
|
|
|
deliveryDTO.setStateEx(0);
|
|
|
+ FsStoreOrder fsStoreOrder = orderService.selectFsStoreOrderById(deliveryDTO.getOrderId());
|
|
|
+ if(ObjectUtil.isNotNull(fsStoreOrder)){
|
|
|
+ deliveryDTO.setOrderCode(fsStoreOrder.getOrderCode());
|
|
|
+ }
|
|
|
+
|
|
|
fsStoreDeliversMapper.insert(deliveryDTO);
|
|
|
+
|
|
|
+ //新增的要订阅快递鸟监控
|
|
|
+ String lastFourNum = PhoneUtils.getLastFourNum(fsStoreOrder.getUserPhone());
|
|
|
+ expressService.subscribeEspress(deliveryDTO.getOrderCode(),
|
|
|
+ deliveryDTO.getDeliverSn(),
|
|
|
+ deliveryDTO.getDeliverId(),lastFourNum);
|
|
|
} else {
|
|
|
fsStoreDeliversMapper.update(deliveryDTO);
|
|
|
}
|