Merge branches 'develop' and 'feature/20220524_新商城_wuping' of…

Merge branches 'develop' and 'feature/20220524_新商城_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

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/CallbackUrlRequestDto.java

@@ -31,7 +31,7 @@ public class CallbackUrlRequestDto {
      */
     private String channelDeliveryId;
     /**
-     * 订单状态枚举值
+     * 状态枚举值
      */
     private int deliveryStatus;
     /**

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/entities/vo/order/DirectDeliveryReq.java

+package cn.freemud.entities.vo.order;
+
+import lombok.Data;
+
+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @version V1.0
+ * @Title: DirectDeliveryReq
+ * @Package cn.freemud.entities.vo.order
+ * @Description:
+ * @author: ping.wu
+ * @date: 22-5-30 上午10:06
+ * @Copyright: 2022 www.freemud.cn Inc. All rights reserved.
+ */
+@Data
+public class DirectDeliveryReq {
+
+    private  String orderCode;
+
+    private  String partnerId;
+
+    private String operator;
+
+    /**
+     * 自动收货任务执行时间毫秒时间戳
+     */
+    private Long taskTime;
+
+}

order-application-service/src/main/java/cn/freemud/entities/vo/order/EditLogisticsReq.java

+package cn.freemud.entities.vo.order;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @version V1.0
+ * @Title: EditLogisticsReq
+ * @Package cn.freemud.entities.vo
+ * @Description:
+ * @author: ping.wu
+ * @date: 22-5-26 下午10:24
+ * @Copyright: 2022 www.freemud.cn Inc. All rights reserved.
+ */
+@Data
+public class EditLogisticsReq {
+
+    /**
+     * 【必填】订单编号
+     */
+    private String orderCode;
+
+    /**
+     * 【必填】物流接入渠道 1.人工 2.旺店通ERP
+     */
+    private Integer logisticsAccessChannel;
+
+    /**
+     * 【非必填】操作人
+     */
+    private String operator;
+
+    /**
+     * 【必填】商户编号
+     */
+    private String partnerId;
+
+    /**
+     * 物流
+     */
+    private List<LogisticsList> logisticsList;
+
+}

order-application-service/src/main/java/cn/freemud/entities/vo/order/LogisticsList.java

+package cn.freemud.entities.vo.order;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @version V1.0
+ * @Title: LogisticsList
+ * @Package cn.freemud.entities.vo.order
+ * @Description:
+ * @author: ping.wu
+ * @date: 22-5-30 上午11:12
+ * @Copyright: 2022 www.freemud.cn Inc. All rights reserved.
+ */
+@Data
+public class LogisticsList {
+
+    /**
+     * 【非必填】物流公司编号
+     */
+    private String logisticsCompanyCode;
+
+    /**
+     * 【必填】物流公司名称
+     */
+    private String logisticsCompanyName;
+
+    /**
+     * 【必填】物流单号
+     */
+    private String expressNo;
+
+    /**
+     * 【必填】物流状态 1:已发货 2:已签收 4:异常 5:取消
+     */
+    private Integer state;
+
+    /**
+     * 物流商品
+     */
+    private List<OrderPack> orderPackList;
+
+}

order-application-service/src/main/java/cn/freemud/entities/vo/order/OrderPack.java

+package cn.freemud.entities.vo.order;
+
+import lombok.Data;
+
+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @version V1.0
+ * @Title: OrderPack
+ * @Package cn.freemud.entities.vo.order
+ * @Description:
+ * @author: ping.wu
+ * @date: 22-5-30 上午11:13
+ * @Copyright: 2022 www.freemud.cn Inc. All rights reserved.
+ */
+@Data
+public class OrderPack {
+
+    /**
+     * 订单商品明细ID
+     */
+    private String orderItemId;
+
+    /**
+     * 商品编号
+     */
+    private String productId;
+
+    /**
+     * 商品序号
+     */
+    private String productSeq;
+
+
+    /**
+     *
+     *
+     */
+
+}

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

@@ -3,10 +3,15 @@ package cn.freemud.service.delivery;
 import cn.freemud.adapter.MessageNoticeAdapter;
 import cn.freemud.amp.service.ProduceMQService;
 import cn.freemud.base.entity.BaseResponse;
+import cn.freemud.base.util.DateUtil;
 import cn.freemud.entities.dto.delivery.*;
 import cn.freemud.entities.dto.ecology.*;
 import cn.freemud.entities.dto.pos.PosBaseRequestDto;
+import cn.freemud.entities.vo.order.EditLogisticsReq;
 import cn.freemud.entities.vo.delivery.DeliveryAmountVo;
+import cn.freemud.entities.vo.order.DirectDeliveryReq;
+import cn.freemud.entities.vo.order.LogisticsList;
+import cn.freemud.entities.vo.order.OrderPack;
 import cn.freemud.enums.*;
 import cn.freemud.interceptor.ServiceException;
 import cn.freemud.management.entities.dto.request.order.OrderManagerRequest;
@@ -16,6 +21,7 @@ import cn.freemud.management.service.adapter.OrderManagerAdapter;
 import cn.freemud.service.ThirdDeliveryService;
 import cn.freemud.service.thirdparty.DeliveryFeiginClient;
 import cn.freemud.service.thirdparty.EcologyAdminApplicationClient;
+import cn.freemud.service.thirdparty.OrderServiceClient;
 import cn.freemud.service.thirdparty.PosClient;
 import cn.freemud.utils.AppLogUtil;
 import cn.freemud.utils.DateTimeUtil;
@@ -36,6 +42,8 @@ import com.freemud.application.sdk.api.ordercenter.enums.OrderType;
 import com.freemud.application.sdk.api.ordercenter.request.OrderCollectReq;
 import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto;
 import com.freemud.application.sdk.api.ordercenter.response.OrderBaseResp;
+import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInfoReqs;
+import com.freemud.application.sdk.api.ordercenter.response.orderInfo.QueryByCodeResponse;
 import com.freemud.application.sdk.api.ordercenter.service.OrderSdkService;
 import com.freemud.application.sdk.api.storecenter.request.StoreInfoRequest;
 import com.freemud.application.sdk.api.storecenter.response.StoreResponse;
@@ -60,6 +68,7 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 
 /**
@@ -91,6 +100,7 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
     private OrderManagerAdapter orderManagerAdapter;
     @Autowired
     private OrderSdkService orderSdkService;
+    OrderServiceClient orderServiceClient;
     @Autowired
     private MessageNoticeAdapter messageNoticeAdapter;
     @Autowired
@@ -307,8 +317,47 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
     }
 
     @Override
-    public BaseResponse mallCallbackUrl(CallbackUrlRequestDto request) {
+    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

order-application-service/src/main/java/cn/freemud/service/thirdparty/OrderServiceClient.java

 package cn.freemud.service.thirdparty;
 
+import cn.freemud.entities.vo.order.EditLogisticsReq;
+import cn.freemud.entities.vo.order.DirectDeliveryReq;
 import com.freemud.application.sdk.api.ordercenter.annotation.LogIgnoreFeign;
 import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.entities.dto.QueryInvoiceRepDto;
@@ -65,4 +67,18 @@ public interface OrderServiceClient {
     @PostMapping(value = "/order/v2/refundFailures/successful")
     BaseResponse refundFailuresSuccessful(@RequestBody RefundFailuresSuccessfulReq refundFailuresSuccessfulReq);
 
+    /**
+     * 订单物流推送订单
+     */
+    @LogIgnoreFeign(logMessage="editLogistics")
+    @PostMapping(value = "/order/v2/editLogistics")
+    BaseResponse editLogistics(@RequestBody EditLogisticsReq editLogisticsReq);
+
+    /**
+     * 订单发货
+     */
+    @LogIgnoreFeign(logMessage="directDelivery")
+    @PostMapping(value = "/order/v2/directDelivery")
+    BaseResponse directDelivery(@RequestBody DirectDeliveryReq DeditLogisticsReq);
+
 }