|
@@ -19,6 +19,8 @@ import com.yonge.cooleshow.admin.dto.search.UserStatisticalSearch;
|
|
|
import com.yonge.cooleshow.admin.enums.OrderStatisticalEnum;
|
|
|
import com.yonge.cooleshow.admin.service.*;
|
|
|
import com.yonge.cooleshow.admin.wrapper.OmsOrderWrapper;
|
|
|
+import com.yonge.cooleshow.mall.common.courier.enums.CompanyEnum;
|
|
|
+import com.yonge.cooleshow.mall.common.courier.service.CourierService;
|
|
|
import com.yonge.cooleshow.mbg.mapper.*;
|
|
|
import com.yonge.cooleshow.mbg.model.*;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
@@ -84,7 +86,14 @@ public class OmsOrderServiceImpl implements OmsOrderService {
|
|
|
@Autowired
|
|
|
private PmsProductMapper pmsProductMapper;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private CourierService courierService;
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ private SysConfigMapper sysConfigMapper;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private OmsOrderCourierMapper omsOrderCourierMapper;
|
|
|
|
|
|
@Override
|
|
|
public List<OrderVo> list(OmsOrderQueryParam queryParam, Integer pageSize, Integer pageNum) {
|
|
@@ -158,6 +167,26 @@ public class OmsOrderServiceImpl implements OmsOrderService {
|
|
|
}).collect(Collectors.toList());
|
|
|
orderOperateHistoryDao.insertList(operateHistoryList);
|
|
|
|
|
|
+
|
|
|
+ // 添加快递信息
|
|
|
+ List<OmsOrderCourier> omsOrderCouriers = new ArrayList<>();
|
|
|
+ for (OmsOrderDeliveryParam omsOrderDeliveryParam : deliveryParamList) {
|
|
|
+ OmsOrderCourier omsOrderCourier = new OmsOrderCourier();
|
|
|
+ omsOrderCourier.setOrderId(omsOrderDeliveryParam.getOrderId());
|
|
|
+ omsOrderCourier.setCourierNo(omsOrderDeliveryParam.getDeliverySn());
|
|
|
+ omsOrderCourier.setCompany(omsOrderDeliveryParam.getDeliveryCompany());
|
|
|
+ omsOrderCouriers.add(omsOrderCourier);
|
|
|
+ }
|
|
|
+ omsOrderCourierMapper.batchInsert(omsOrderCouriers);
|
|
|
+ for (OmsOrderCourier omsOrderCourier : omsOrderCouriers) {
|
|
|
+ try {
|
|
|
+ courierService.subscribe(CompanyEnum.descOf(omsOrderCourier.getCompany()),omsOrderCourier.getCourierNo(),sysConfigMapper.getConfig("kuaidiUrl"));
|
|
|
+
|
|
|
+ } catch (Exception e) {
|
|
|
+ log.error("快递订阅失败",e);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
return count;
|
|
|
}
|
|
|
|