商城订单回调

order-application-service/src/main/java/cn/freemud/controller/delivery/DeliveryController.java

@@ -3,6 +3,7 @@ package cn.freemud.controller.delivery;
 import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.entities.dto.delivery.CallbackUrlRequestDto;
 import cn.freemud.entities.dto.delivery.MacCafeCallbackUrlRequestDto;
+import cn.freemud.entities.dto.delivery.MallCallbackRequestDto;
 import cn.freemud.entities.dto.delivery.WeixinDeliveryAddressDto;
 import cn.freemud.service.ThirdDeliveryService;
 import com.freemud.application.sdk.api.log.ApiAnnotation;
@@ -59,7 +60,7 @@ public class DeliveryController {
     @ApiAnnotation(logMessage = "商城配送回调")
     @ApiOperation(value = "商城配送回调", notes = "商城配送回调", produces = "application/json")
     @PostMapping("/delivery/mallCallbackUrl")
-    public BaseResponse mallCallbackUrl(@Valid @LogParams @RequestBody CallbackUrlRequestDto request) {
+    public BaseResponse mallCallbackUrl(@Valid @LogParams @RequestBody MallCallbackRequestDto request) {
         return deliveryService.mallCallbackUrl(request);
     }
 

order-application-service/src/main/java/cn/freemud/entities/dto/delivery/MallCallbackRequestDto.java

+package cn.freemud.entities.dto.delivery;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @version V1.0
+ * @Title: MallCallbackRequestDto
+ * @Package cn.freemud.entities.dto.delivery
+ * @Description:
+ * @author: ping.wu
+ * @date: 22-5-31 下午2:54
+ * @Copyright: 2022 www.freemud.cn Inc. All rights reserved.
+ */
+@Data
+public class MallCallbackRequestDto {
+
+    //商户号
+    private String partnerId;
+    //订单号
+    private String tid;
+    //物流状态：0-未发货 1-已发货
+    private Integer logisticsStatus;
+    //物流单号
+    private String logisticsNo;
+    //物流公司名称
+    private String logisticsName;
+    //子商品物流状态集合
+    private List<LogisticsDetail> goodsList;
+
+
+    @Data
+    public static class LogisticsDetail {
+        //原始单id
+        private String tid;
+        //原始子单id
+        private String oid;
+        //三方平台唯一编号
+        private String specId;
+        //非码spuId
+        private String spuId;
+        //非码skuId
+        private String skuId;
+        //物流状态：0-未发货 1-已发货
+        private Integer logisticsStatus;
+        //非码商品编号
+        private String productId;
+        //限购数量
+        private Integer limitNumber;
+
+        //物流单号
+        private String logisticsNo;
+        //物流公司名称
+        private String logisticsName;
+    }
+
+}

order-application-service/src/main/java/cn/freemud/service/ThirdDeliveryService.java

@@ -3,6 +3,7 @@ package cn.freemud.service;
 import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.entities.dto.delivery.CallbackUrlRequestDto;
 import cn.freemud.entities.dto.delivery.MacCafeCallbackUrlRequestDto;
+import cn.freemud.entities.dto.delivery.MallCallbackRequestDto;
 import cn.freemud.entities.dto.delivery.WeixinDeliveryAddressDto;
 import cn.freemud.entities.vo.delivery.DeliveryAmountVo;
 
@@ -25,7 +26,7 @@ public interface ThirdDeliveryService {
     /**
      * 商城配送回调
      */
-    BaseResponse mallCallbackUrl(CallbackUrlRequestDto request);
+    BaseResponse mallCallbackUrl(MallCallbackRequestDto request);
 
     /**
      * 查询微信配送地址配送费

order-application-service/src/main/java/cn/freemud/service/delivery/ThirdDeliveryServiceImpl.java

@@ -317,45 +317,47 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
     }
 
     @Override
-    public BaseResponse mallCallbackUrl(CallbackUrlRequestDto request) {
-
-        QueryByCodeResponse responseDto = orderSdkService.getOrderInfo(null, request.getOrderId(), null, null, null);
-        if (responseDto == null || !Objects.equals(SUCCESS_RESPONSE_CODE.toString(), responseDto.getCode())|| responseDto.getResult().getOrderCode() == null) {
-            return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST);
-        }
-        OrderInfoReqs orderInfoReqs = responseDto.getResult();
-        if (NewOrderStatus.PLACE_AN_ORDER.getIndex() == orderInfoReqs.getOrderState()){
-            DirectDeliveryReq directDeliveryReq = new DirectDeliveryReq();
-            directDeliveryReq.setOrderCode(request.getOrderId());
-            directDeliveryReq.setPartnerId(request.getPartnerId());
-            directDeliveryReq.setOperator("");
-            directDeliveryReq.setTaskTime(DateUtil.addDays(new Date(),15).getTime());
-            orderServiceClient.directDelivery(directDeliveryReq);
-        }
-
-        EditLogisticsReq editLogisticsReq = new EditLogisticsReq();
-        editLogisticsReq.setOrderCode(orderInfoReqs.getOrderCode());
-        editLogisticsReq.setLogisticsAccessChannel(2);
-        editLogisticsReq.setPartnerId(orderInfoReqs.getPartnerId());
-        editLogisticsReq.setOperator("");
-        List<LogisticsList> logisticsList = new ArrayList<>();
-        LogisticsList logistics = new LogisticsList();
-        logistics.setExpressNo("");
-        logistics.setLogisticsCompanyName("");
-        logistics.setLogisticsCompanyCode("");
-        logistics.setState(1);
-        logisticsList.add(logistics);
-        List<OrderPack> orderPackList = new ArrayList<>();
-
-        OrderPack orderPack = new OrderPack();
-        orderPackList.add(orderPack);
-        logistics.setOrderPackList(orderPackList);
-        logisticsList.add(logistics);
-
-        editLogisticsReq.setLogisticsList(logisticsList);
-        orderServiceClient.editLogistics(editLogisticsReq);
+    public BaseResponse mallCallbackUrl(MallCallbackRequestDto request) {
 
         return ResponseUtil.success();
+
+//        QueryByCodeResponse responseDto = orderSdkService.getOrderInfo(null, request.getTid(), null, null, null);
+//        if (responseDto == null || !Objects.equals(SUCCESS_RESPONSE_CODE.toString(), responseDto.getCode())|| responseDto.getResult().getOrderCode() == null) {
+//            return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST);
+//        }
+//        OrderInfoReqs orderInfoReqs = responseDto.getResult();
+//        if (NewOrderStatus.PLACE_AN_ORDER.getIndex() == orderInfoReqs.getOrderState()){
+//            DirectDeliveryReq directDeliveryReq = new DirectDeliveryReq();
+//            directDeliveryReq.setOrderCode(request.getTid());
+//            directDeliveryReq.setPartnerId(request.getPartnerId());
+//            directDeliveryReq.setOperator("");
+//            directDeliveryReq.setTaskTime(DateUtil.addDays(new Date(),15).getTime());
+//            orderServiceClient.directDelivery(directDeliveryReq);
+//        }
+//
+//        EditLogisticsReq editLogisticsReq = new EditLogisticsReq();
+//        editLogisticsReq.setOrderCode(orderInfoReqs.getOrderCode());
+//        editLogisticsReq.setLogisticsAccessChannel(2);
+//        editLogisticsReq.setPartnerId(orderInfoReqs.getPartnerId());
+//        editLogisticsReq.setOperator("");
+//        List<LogisticsList> logisticsList = new ArrayList<>();
+//        LogisticsList logistics = new LogisticsList();
+//        logistics.setExpressNo("");
+//        logistics.setLogisticsCompanyName("");
+//        logistics.setLogisticsCompanyCode("");
+//        logistics.setState(1);
+//        logisticsList.add(logistics);
+//        List<OrderPack> orderPackList = new ArrayList<>();
+//
+//        OrderPack orderPack = new OrderPack();
+//        orderPackList.add(orderPack);
+//        logistics.setOrderPackList(orderPackList);
+//        logisticsList.add(logistics);
+//
+//        editLogisticsReq.setLogisticsList(logisticsList);
+//        orderServiceClient.editLogistics(editLogisticsReq);
+//
+//        return ResponseUtil.success();
     }
 
     @Override