Merge branch 'tps'

netflix-dao/src/main/java/com/cyksj/model/views/OrderDonTransportView.java

@@ -0,0 +1,77 @@
+package com.cyksj.model.views;
+
+import com.ejlchina.searcher.bean.DbField;
+import com.ejlchina.searcher.bean.SearchBean;
+import lombok.Getter;
+import lombok.Setter;
+
+/*
+ *项目名: netflix
+ *文件名: OrderDonTransportView
+ *创建者: JavaZou
+ *创建时间:2022/11/16 14:43
+ */
+@Getter
+@Setter
+@SearchBean(tables = "order_don_transport odt left join order_don_waybill odw on odw.order_id = odt.order_id")
+public class OrderDonTransportView {
+	/**
+	 * 订单id
+	 */
+	@DbField("odt.order_id")
+	private Long orderId;
+
+	/**
+	 * 收货人
+	 */
+	@DbField("odt.receiver")
+	private String receiver;
+
+	/**
+	 * 手机号
+	 */
+	@DbField("odt.phone")
+	private String phone;
+
+	/**
+	 * 省份
+	 */
+	@DbField("odt.province")
+	private String province;
+
+	/**
+	 * 城市
+	 */
+	@DbField("odt.city")
+	private String city;
+
+	/**
+	 * 区/县
+	 */
+	@DbField("odt.district")
+	private String district;
+
+	/**
+	 * 详细地址
+	 */
+	@DbField("odt.address")
+	private String address;
+
+	/**
+	 * 物流公司code码
+	 */
+	@DbField("odw.code")
+	private String code;
+
+	/**
+	 * 物流公司中文码
+	 */
+	@DbField("odw.code_cn")
+	private String codeCn;
+
+	/**
+	 * 物流单号
+	 */
+	@DbField("odw.tracking_number")
+	private String trackingNumber;
+}

netflix-web/src/main/java/com/cyksj/web/controller/manage/CmsOrderController.java

@@ -1,30 +1,23 @@
 package com.cyksj.web.controller.manage;
 
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.excel.support.ExcelTypeEnum;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.cyksj.dto.Result;
 import com.cyksj.enums.GatewayResponse;
 import com.cyksj.model.entity.OrderDon;
-import com.cyksj.model.entity.OrderDonTransport;
 import com.cyksj.model.entity.OrderDonWaybill;
-import com.cyksj.model.excel.ExcelOrderDonInfo;
 import com.cyksj.model.manage.request.ReqSetLogisticsPost;
 import com.cyksj.model.manage.views.OrderDonView;
+import com.cyksj.model.views.OrderDonTransportView;
 import com.cyksj.service.mange.CmsOrderDonService;
 import com.cyksj.service.user.UserService;
-import com.cyksj.web.util.EasyExcelUtils;
 import com.ejlchina.searcher.BeanSearcher;
 import com.ejlchina.searcher.SearchResult;
 import com.ejlchina.searcher.util.MapUtils;
 import lombok.RequiredArgsConstructor;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.util.Date;
-import java.util.List;
 
 /**
  * @author chan
@@ -60,10 +53,10 @@ public class CmsOrderController {
 
 
     @GetMapping("/get/transport/{orderId}")
-    public Result<OrderDonTransport> getTransport(@PathVariable Long orderId){
-        OrderDonTransport transport = cmsOrderDonService.getTransport(orderId);
-
-        return GatewayResponse.SUCCESS.newBuilder().toResult(transport);
+    public Result<OrderDonTransportView> getTransport(@PathVariable Long orderId){
+//        OrderDonTransport transport = cmsOrderDonService.getTransport(orderId);
+        OrderDonTransportView transportView = beanSearcher.searchFirst(OrderDonTransportView.class, MapUtils.builder().field(OrderDonTransportView::getOrderId, orderId).build());
+        return GatewayResponse.SUCCESS.newBuilder().toResult(transportView);
     }
 
     @PostMapping("/post/setWaybill")