瀏覽代碼

添加字段

于继渤 1 年之前
父節點
當前提交
d2d8e86e63

+ 2 - 1
src/main/java/com/dk/mdm/mapper/ivt/OutboundItemMapper.xml

@@ -101,6 +101,7 @@
         <result column="sku_images" property="skuImages" typeHandler="JsonTypeHandler"/>
         <result column="sku_images" property="skuImages" typeHandler="JsonTypeHandler"/>
         <result column="skuModel" property="skuModel"/>
         <result column="skuModel" property="skuModel"/>
         <result column="skuName" property="skuName"/>
         <result column="skuName" property="skuName"/>
+        <result column="priceStandard" property="priceStandard"/>
         <result column="brandName" property="brandName"/>
         <result column="brandName" property="brandName"/>
         <result column="brand_name" property="brandName"/>
         <result column="brand_name" property="brandName"/>
         <result column="shortName" property="shortName"/>
         <result column="shortName" property="shortName"/>
@@ -371,7 +372,7 @@
                t.item_index,
                t.item_index,
                t.sku_id,
                t.sku_id,
                tmgs.sku_images,
                tmgs.sku_images,
-
+               tmgs.price_standard AS "priceStandard",
                tmgs.sku_code                                                             as "skuCode",
                tmgs.sku_code                                                             as "skuCode",
                tmgs.sku_model                                                            as "skuModel",
                tmgs.sku_model                                                            as "skuModel",
                tmgs.sku_name                                                             as "skuName",
                tmgs.sku_name                                                             as "skuName",

+ 19 - 0
src/main/java/com/dk/mdm/mapper/sale/OrderMapper.xml

@@ -175,6 +175,20 @@
             <result column="org_name" property="orgName"/>
             <result column="org_name" property="orgName"/>
             <result column="staff_name" property="staffName"/>
             <result column="staff_name" property="staffName"/>
 
 
+
+        <result column="cus_code" property="cusCode"/>
+        <result column="cus_name" property="cusName"/>
+        <result column="cus_phone" property="cusPhone"/>
+        <result column="address_area" property="addressArea" typeHandler="JsonTypeHandler"/>
+        <result column="address_name" property="addressName"/>
+        <result column="address_no" property="addressNo"/>
+        <result column="address_gcj02" property="addressGcj02" typeHandler="JsonTypeHandler"/>
+        <result column="address_full" property="addressFull"/>
+        <result column="contact_name" property="contactName"/>
+        <result column="contact_phone" property="contactPhone"/>
+        <result column="cus_from" property="cusFrom" typeHandler="UuidTypeHandler"/>
+        <result column="channel_id" property="channelId" typeHandler="UuidTypeHandler"/>
+
             <collection property="orderItemResponseList" resultMap="itemListMap" columnPrefix="list_"/>
             <collection property="orderItemResponseList" resultMap="itemListMap" columnPrefix="list_"/>
     </resultMap>
     </resultMap>
     <!--小程序用 关联映射-->
     <!--小程序用 关联映射-->
@@ -966,8 +980,13 @@
     <select id="selectByCondDetail" resultMap="BaseResultMapDetailResponse">
     <select id="selectByCondDetail" resultMap="BaseResultMapDetailResponse">
         SELECT
         SELECT
         <include refid="Base_Column_List_Detail_Join"/>,
         <include refid="Base_Column_List_Detail_Join"/>,
+        tmc.cus_code,tmc.cus_name, tmc.cus_phone, tmc.address_area, tmc.address_name, tmc.address_no,
+        tmc.address_gcj02, tmc.address_full, tmc.contact_name, tmc.contact_phone, tmc.cus_from, tmc.channel_id,
+
+
         <include refid="Base_Column_List_Item_Response_Detail_Join"/>
         <include refid="Base_Column_List_Item_Response_Detail_Join"/>
         FROM dkic_b.t_psi_order as t
         FROM dkic_b.t_psi_order as t
+        left join dkic_b.t_mst_customer tmc on tmc.cus_id = t.cus_id
         left join dkic_b.t_psi_order_item toi on toi.order_id  = t.order_id
         left join dkic_b.t_psi_order_item toi on toi.order_id  = t.order_id
         inner join dkic_b.t_mst_goods_sku tmgs on tmgs.sku_id  = toi.sku_id
         inner join dkic_b.t_mst_goods_sku tmgs on tmgs.sku_id  = toi.sku_id
         left join dkic_b.t_mst_goods_brand tmgb on tmgb.brand_id  = tmgs.brand_id
         left join dkic_b.t_mst_goods_brand tmgb on tmgb.brand_id  = tmgs.brand_id

+ 3 - 0
src/main/java/com/dk/mdm/model/response/ivt/OutboundItemResponse.java

@@ -318,6 +318,9 @@ public class OutboundItemResponse {
     @ApiModelProperty(value = "已出库数量")
     @ApiModelProperty(value = "已出库数量")
     private BigDecimal outboundOutQty;
     private BigDecimal outboundOutQty;
 
 
+    @ApiModelProperty(value = "标价")
+    private BigDecimal priceStandard;
+
     @ApiModelProperty(value = "可退货数量")
     @ApiModelProperty(value = "可退货数量")
     private BigDecimal canReturnQty;
     private BigDecimal canReturnQty;
 
 

+ 2 - 0
src/main/java/com/dk/mdm/model/response/sale/OrderResponse.java

@@ -398,6 +398,8 @@ public class OrderResponse extends PageInfo<OrderResponse> implements Serializab
     @ApiModelProperty(value = "实收金额")
     @ApiModelProperty(value = "实收金额")
     private BigDecimal amtFactReceipt;
     private BigDecimal amtFactReceipt;
 
 
+    private String channelId;
+
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 
 
 }
 }