存放地和提货点新增

mallplus-mbg/src/main/java/com/zscat/mallplus/oms/entity/OmsOrderLocation.java

@@ -0,0 +1,14 @@
+package com.zscat.mallplus.oms.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+@Data
+public class OmsOrderLocation {
+
+    @TableField("id")
+    private String id;
+    @TableField("name")
+    private String name;
+}

mallplus-mbg/src/main/java/com/zscat/mallplus/oms/mapper/OmsOrderMapper.java

@@ -3,6 +3,7 @@ package com.zscat.mallplus.oms.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zscat.mallplus.oms.entity.OmsOrder;
 import com.zscat.mallplus.oms.entity.OmsOrderItem;
+import com.zscat.mallplus.oms.entity.OmsOrderLocation;
 import com.zscat.mallplus.oms.vo.OmsOrderDeliveryParam;
 import com.zscat.mallplus.oms.vo.OmsOrderDetail;
 import com.zscat.mallplus.oms.vo.OrderStstic;
@@ -75,4 +76,7 @@ public interface OmsOrderMapper extends BaseMapper<OmsOrder> {
 
     List<OrderStstic> listOrderGroupByStatus(Integer status);
 
+    List<OmsOrderLocation> getLocation();
+
+    List<OmsOrderLocation> getPickupPoint(String id);
 }

mallplus-mbg/src/main/java/com/zscat/mallplus/oms/query/OmsOrderLocationQuery.java

@@ -0,0 +1,20 @@
+package com.zscat.mallplus.oms.query;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/3/14 16:49
+ * @Description
+ */
+@Data
+public class OmsOrderLocationQuery {
+    @ApiModelProperty(value = "所在地id",required = false)
+    private String valueszd;
+    @ApiModelProperty(value = "取货点id",required = false)
+    private String valueqhd;
+    @ApiModelProperty(value = "收货人电话",required = false)
+    private String receiverPhone;
+    private String status;
+}

mallplus-mbg/src/main/resources/mapper/oms/OmsOrderDao.xml

@@ -230,4 +230,11 @@
 
     </select>
 
+    <select id="getPickupPoint" resultType="com.zscat.mallplus.oms.entity.OmsOrderLocation">
+        select id,name from building_community where company_id = #{id}
+    </select>
+
+    <select id="getLocation" resultType="com.zscat.mallplus.oms.entity.OmsOrderLocation">
+        select id,name from build_wuye_company
+    </select>
 </mapper>