diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/orderCatch/DouDianOrderCatchServiceImpl.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/orderCatch/DouDianOrderCatchServiceImpl.java index dc7eb6f7e8..a5cc6035b9 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/orderCatch/DouDianOrderCatchServiceImpl.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/orderCatch/DouDianOrderCatchServiceImpl.java @@ -834,7 +834,7 @@ public class DouDianOrderCatchServiceImpl implements OrderCatchService { * @param companyCode 快递公司编码 * @param logisticsCode 物流单号 */ - public void logisticsAdd(String OrderId,String company,String companyCode,String logisticsCode){ + public OrderLogisticsAddResponse logisticsAdd(String OrderId,String company,String companyCode,String logisticsCode){ try { OrderLogisticsAddRequest request = new OrderLogisticsAddRequest(); OrderLogisticsAddParam param = request.getParam(); @@ -849,9 +849,11 @@ public class DouDianOrderCatchServiceImpl implements OrderCatchService { //入参为code AccessToken accessToken= AccessTokenBuilder.build(SYNC_SHOP_ID); OrderLogisticsAddResponse response = request.execute(accessToken); + return response; } catch (Exception e) { log.error("订单发货失败,{}",e.getMessage()); } + return null; } } diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/orders/OrdersServiceImpl.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/orders/OrdersServiceImpl.java index 2ae7a6dbfa..6e534e16b9 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/orders/OrdersServiceImpl.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/orders/OrdersServiceImpl.java @@ -27,6 +27,7 @@ import cn.iocoder.yudao.module.haoka.utils.SnowflakeId; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.doudian.open.api.order_addOrderRemark.param.OrderAddOrderRemarkParam; +import com.doudian.open.api.order_logisticsAdd.OrderLogisticsAddResponse; import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -431,7 +432,26 @@ public class OrdersServiceImpl extends ServiceImpl imple String otherSystemCode = LogisticsCompany.getOtherSystemCode(trackingCompanyId); String otherSystemName = LogisticsCompany.getOtherSystemName(trackingCompanyId); DouDianOrderCatchServiceImpl douDianOrderCatchService = new DouDianOrderCatchServiceImpl(); - douDianOrderCatchService.logisticsAdd(updateObj.getRealSourceId(),otherSystemName,otherSystemCode,trackingNumber); + OrderLogisticsAddResponse response = douDianOrderCatchService.logisticsAdd(updateObj.getRealSourceId(), otherSystemName, otherSystemCode, trackingNumber); + if(response!= null){ + if("10000".equals(response.getCode())){ +// 订单发货成功 + updateObj.setStatus(550L); + updateObj.setUpstreamOrderStatus(550); + updateObj.setSellerMemo(oldOrderDo+"\n"+"订单发货成功"); + }else { + String subMsg = response.getSubMsg(); + OrderOperateLogSaveReqVO logSaveReqVO = new OrderOperateLogSaveReqVO(); + logSaveReqVO.setOrderId(updateObj.getId()); + logSaveReqVO.setMsg("订单发货失败:"+subMsg); + logSaveReqVO.setMsgType("0"); + logSaveReqVO.setMsgSource("1"); + log.error("订单发货失败,{}",subMsg); + updateObj.setReason(oldOrderDo.getReason() + "\n"+ "订单发货失败:"+subMsg); + orderOperateLogService.createOrderOperateLog(logSaveReqVO); + } + updateOrderById(updateObj); + } } } }