|
@@ -325,6 +325,12 @@ public class KuaiDiNiaoServiceImpl implements KuaiDiNiaoService {
|
|
base.setKdnOrderCode(map.get("kdnOrderCode").toString());
|
|
base.setKdnOrderCode(map.get("kdnOrderCode").toString());
|
|
//验签
|
|
//验签
|
|
OrderSendDO aDo = orderSendManager.getOne(new LambdaQueryWrapper<OrderSendDO>().eq(OrderSendDO::getKdnOrderCode,map.get("kdnOrderCode").toString()));
|
|
OrderSendDO aDo = orderSendManager.getOne(new LambdaQueryWrapper<OrderSendDO>().eq(OrderSendDO::getKdnOrderCode,map.get("kdnOrderCode").toString()));
|
|
|
|
+ if (ObjectUtil.isNull(aDo)){
|
|
|
|
+// base.setRequestData("验签失败");
|
|
|
|
+ base.setResultCode(1002);
|
|
|
|
+ base.setReason("未找到对应的商家订单");
|
|
|
|
+ return base;
|
|
|
|
+ }
|
|
OrderDO orderDO = orderManager.getById(aDo.getOrderId());
|
|
OrderDO orderDO = orderManager.getById(aDo.getOrderId());
|
|
// if (!checkDesign(aDo, returnBackBase.getDataSign())) {
|
|
// if (!checkDesign(aDo, returnBackBase.getDataSign())) {
|
|
// base.setRequestData("验签失败");
|
|
// base.setRequestData("验签失败");
|
|
@@ -378,8 +384,8 @@ public class KuaiDiNiaoServiceImpl implements KuaiDiNiaoService {
|
|
aDo.setCancelOrderKdn(map);
|
|
aDo.setCancelOrderKdn(map);
|
|
break;
|
|
break;
|
|
case KdConstants.callBackCreateOrderFail:
|
|
case KdConstants.callBackCreateOrderFail:
|
|
- //如果下单失败更爱订单中黄台,清空快递鸟单号,让用户可以重新下单
|
|
|
|
- aDo.setKdnOrderCode(null);
|
|
|
|
|
|
+ //如果下单失败更爱订单状态,清空快递鸟单号,让用户可以重新下单
|
|
|
|
+ aDo.setKdnOrderCode("");
|
|
aDo.setStatus(SaleOrderSendStatusEnum.TO_BE_SEND);
|
|
aDo.setStatus(SaleOrderSendStatusEnum.TO_BE_SEND);
|
|
aDo.setCreateOrderFail(map);
|
|
aDo.setCreateOrderFail(map);
|
|
break;
|
|
break;
|