update:运费与商品单价

fengliang
1 parent e01a85ed
Showing 14 changed files with 108 additions and 31 deletions
etrade-order/src/main/java/com/diligrp/etrade/order/domain/OrderDto.java
etrade-order/src/main/java/com/diligrp/etrade/order/domain/OrderPaymentDto.java
etrade-order/src/main/java/com/diligrp/etrade/order/domain/ProductDto.java
etrade-order/src/main/java/com/diligrp/etrade/order/domain/ProductExtDto.java
etrade-order/src/main/java/com/diligrp/etrade/order/model/OrderGoods.java
etrade-order/src/main/java/com/diligrp/etrade/order/service/impl/OrderGoodsServiceImpl.java
etrade-order/src/main/java/com/diligrp/etrade/order/type/BizNumberTypeEnum.java
etrade-order/src/main/java/com/diligrp/etrade/order/util/NumberTransform.java
etrade-order/src/main/resources/com/diligrp/etrade/dao/mapper/order/OrderGoodsMapper.xml
etrade-order/src/main/resources/com/diligrp/etrade/dao/mapper/order/OrderMapper.xml
etrade-order/src/main/resources/com/diligrp/etrade/dao/mapper/order/OrderPaymentMapper.xml
etrade-order/src/main/resources/com/diligrp/etrade/dao/mapper/order/OrderQueryBuyerMapper.xml
etrade-order/src/main/resources/com/diligrp/etrade/dao/mapper/order/OrderQueryMapper.xml
etrade-order/src/main/resources/com/diligrp/etrade/dao/mapper/order/OrderQuerySellerMapper.xml
@@ -237,6 +237,8 @@ public class OrderDto {
     /** 订单配送状态 */
     private Integer achieveState;
+    /** 运费 */
+    private Long transportFee;
     public Integer getAchieveType() {
         return achieveType;
@@ -715,4 +717,12 @@ public class OrderDto {
     public void setRelationId(Long relationId) {
         this.relationId = relationId;
     }
+
+    public Long getTransportFee() {
+        return transportFee;
+    }
+
+    public void setTransportFee(Long transportFee) {
+        this.transportFee = transportFee;
+    }
 }
@@ -80,6 +80,9 @@ public class OrderPaymentDto {
     /** 订单卖家手续费收费状态 */
     private Integer sellerFeeState;
+    /** 运费 */
+    private Long transportFee;
+
     public BigDecimal getTotleSellerFee() {
         return totleSellerFee;
     }
@@ -319,4 +322,12 @@ public class OrderPaymentDto {
     public void setTradeId(String tradeId) {
         this.tradeId = tradeId;
     }
+
+    public Long getTransportFee() {
+        return transportFee;
+    }
+
+    public void setTransportFee(Long transportFee) {
+        this.transportFee = transportFee;
+    }
 }
@@ -70,6 +70,7 @@ public class ProductDto {
     @NotNull(message = "店铺id不能为空",groups = {MultipleOrderDto.class})
     private Long shopId;
+    private String productUnit;
     public String getCode() {
         return code;
@@ -222,4 +223,12 @@ public class ProductDto {
     public void setSalesMode(Integer salesMode) {
         this.salesMode = salesMode;
     }
+
+    public String getProductUnit() {
+        return productUnit;
+    }
+
+    public void setProductUnit(String productUnit) {
+        this.productUnit = productUnit;
+    }
 }
@@ -73,6 +73,8 @@ public class ProductExtDto {
     private String orderCode;
+    private String productUnit;
+
     /** 下单提货方式（1自提，2配送） */
     private Integer achieveType = 1;
@@ -251,4 +253,12 @@ public class ProductExtDto {
     public void setShopId(Long shopId) {
         this.shopId = shopId;
     }
+
+    public String getProductUnit() {
+        return productUnit;
+    }
+
+    public void setProductUnit(String productUnit) {
+        this.productUnit = productUnit;
+    }
 }
@@ -94,6 +94,10 @@ public class OrderGoods {
      * 关联订单id
      */
     private Long relationId;
+    /**
+     * 商品单位
+     */
+    private String productUnit;
     public Integer getSalesMode() {
         return salesMode;
@@ -310,4 +314,12 @@ public class OrderGoods {
     public void setRelationId(Long relationId) {
         this.relationId = relationId;
     }
+
+    public String getProductUnit() {
+        return productUnit;
+    }
+
+    public void setProductUnit(String productUnit) {
+        this.productUnit = productUnit;
+    }
 }
 \ No newline at end of file
@@ -185,7 +185,7 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
                 waitCouponAmount = waitCouponAmount.subtract(couponAmount);
             }
         }
-        //配送情况增加计算运费
+        //TODO 配送情况增加计算运费
         if(buyerOrderDto.getAchieveType().equals(OrderAchieveType.SELLER_DELIVERY.getCodeInteger())){
             allmount.add(buyerOrderDto.getTransportFee());
         }
@@ -12,6 +12,7 @@ public enum BizNumberTypeEnum {
     HK("5503", "赊销回款"),
     ETRADE_TRADE("5502", "交易"),
     ETRADE_TRADE_SELLER("5504", "卖方交易"),
+    ETRADE_TRADE_TRANSPORT("5506", "交易运费"),
     ETRADE_TRADE_BUYER("5505", "买方交易");
     private String name;
@@ -4,13 +4,13 @@ import java.math.BigDecimal;
 public class NumberTransform {
     /** 500 */
-    public static BigDecimal FIVE_HUNDERD = new BigDecimal(500);
+    public static BigDecimal FIVE_HUNDERD = new BigDecimal(100);
     /** 100 */
     public static BigDecimal ONE_HUNDERD = new BigDecimal(100);
     /** 200 */
-    public static BigDecimal TWO_HUNDERD = new BigDecimal(200);
+    public static BigDecimal TWO_HUNDERD = new BigDecimal(100);
     /** 10 */
     public static BigDecimal TEN = new BigDecimal(10);
@@ -27,12 +27,13 @@
     <result column="product_seller_fee_state" jdbcType="TINYINT" property="productSellerFeeState" />
     <result column="order_status" jdbcType="TINYINT" property="orderStatus" />
     <result column="relation_id" jdbcType="BIGINT" property="relationId" />
+    <result column="product_unit" jdbcType="VARCHAR" property="productUnit" />
   </resultMap>
   <sql id="Base_Column_List">
     id, market_id, order_id, order_code, product_id, product_code,product_category_id, product_name, product_price,
     product_total_price, product_weight, product_pieces, product_piece_weight, product_piece_price,
     product_trade_type,product_coupon_amount, product_img_url, `state`, created_time, modified_time, version,product_seller_fee
-    ,product_seller_fee_state,`code`,order_status,relation_id
+    ,product_seller_fee_state,`code`,order_status,relation_id,product_unit
   </sql>
     <insert id="saveBatch" useGeneratedKeys="true" keyProperty="id">
       insert into order_goods (id, market_id, order_id,
@@ -40,7 +41,7 @@
       product_name, product_price, product_total_price,
       product_weight, product_pieces, product_piece_weight,
       product_piece_price,product_coupon_amount, product_trade_type, product_img_url,
-      state, version,product_seller_fee,product_seller_fee_state,`code`,order_status,relation_id)
+      state, version,product_seller_fee,product_seller_fee_state,`code`,order_status,relation_id,product_unit)
       values
       <foreach collection="list" item="goods" separator=",">
        (#{goods.id,jdbcType=BIGINT}, #{goods.marketId,jdbcType=BIGINT}, #{goods.orderId,jdbcType=BIGINT},
@@ -48,7 +49,7 @@
       #{goods.productName,jdbcType=VARCHAR}, #{goods.productPrice,jdbcType=BIGINT}, #{goods.productTotalPrice,jdbcType=BIGINT},
       #{goods.productWeight,jdbcType=BIGINT}, #{goods.productPieces,jdbcType=BIGINT}, #{goods.productPieceWeight,jdbcType=BIGINT},
       #{goods.productPiecePrice,jdbcType=BIGINT},#{goods.productCouponAmount,jdbcType=BIGINT}, #{goods.productTradeType,jdbcType=TINYINT}, #{goods.productImgUrl,jdbcType=VARCHAR},
-      #{goods.state,jdbcType=TINYINT}, #{goods.version,jdbcType=INTEGER},#{goods.productSellerFee,jdbcType=BIGINT},#{goods.productSellerFeeState,jdbcType=TINYINT}, #{goods.code,jdbcType=VARCHAR},#{goods.orderStatus,jdbcType=TINYINT}, #{goods.relationId,jdbcType=BIGINT})
+      #{goods.state,jdbcType=TINYINT}, #{goods.version,jdbcType=INTEGER},#{goods.productSellerFee,jdbcType=BIGINT},#{goods.productSellerFeeState,jdbcType=TINYINT}, #{goods.code,jdbcType=VARCHAR},#{goods.orderStatus,jdbcType=TINYINT}, #{goods.relationId,jdbcType=BIGINT}, #{goods.productUnit,jdbcType=VARCHAR})
       </foreach>
     </insert>
   <update id="updateOrderGoodsState">
@@ -67,11 +68,11 @@
         product_code,
         product_category_id,
         product_name,
-        convert(product_price, decimal(20,2))/200 as product_price,
+        convert(product_price, decimal(20,2))/100 as product_price,
         convert(product_total_price, decimal(20,2))/100 as product_total_price,
-        convert(product_weight, decimal(20,2))/500 as product_weight,
+        convert(product_weight, decimal(20,2))/100 as product_weight,
         convert(product_pieces, decimal(20,2))/100 as product_pieces,
-        convert(product_piece_weight, decimal(20,2))/500 as product_piece_weight,
+        convert(product_piece_weight, decimal(20,2))/100 as product_piece_weight,
         convert(product_piece_price, decimal(20,2))/100 as product_piece_price,
         convert(product_coupon_amount, decimal(20,2))/100 as coupon_amount,
         product_trade_type,
@@ -82,7 +83,8 @@
         version,
         convert(product_seller_fee, decimal(20,2))/100 as product_seller_fee,
         product_seller_fee_state,
-        `code`
+        `code`,
+        product_unit
       from order_goods
       where order_id =  #{orderId,jdbcType=BIGINT} and `state` = #{state}
     </select>
@@ -110,9 +112,9 @@
       product_name,
       convert(product_price, decimal(20,2))/100 as product_price,
       convert(product_total_price, decimal(20,2))/100 as product_total_price,
-      convert(product_weight, decimal(20,2))/1000 as product_weight,
+      convert(product_weight, decimal(20,2))/100 as product_weight,
       convert(product_pieces, decimal(20,2))/100 as product_pieces,
-      convert(product_piece_weight, decimal(20,2))/1000 as product_piece_weight,
+      convert(product_piece_weight, decimal(20,2))/100 as product_piece_weight,
       convert(product_piece_price, decimal(20,2))/100 as product_piece_price,
       convert(product_coupon_amount, decimal(20,2))/100 as coupon_amount,
       product_trade_type,
@@ -123,7 +125,8 @@
       version,
       convert(product_seller_fee, decimal(20,2))/100 as product_seller_fee,
       product_seller_fee_state,
-      `code`
+      `code`,
+      product_unit
     from order_goods
     where order_id =  #{orderId,jdbcType=BIGINT} and `state` = #{state}
   </select>
@@ -139,9 +142,9 @@
       product_name,
       convert(product_price, decimal(20,2))/100 as product_price,
       convert(product_total_price, decimal(20,2))/100 as product_total_price,
-      convert(product_weight, decimal(20,2))/1000 as product_weight,
+      convert(product_weight, decimal(20,2))/100 as product_weight,
       convert(product_pieces, decimal(20,2))/100 as product_pieces,
-      convert(product_piece_weight, decimal(20,2))/1000 as product_piece_weight,
+      convert(product_piece_weight, decimal(20,2))/100 as product_piece_weight,
       convert(product_piece_price, decimal(20,2))/100 as product_piece_price,
       convert(product_coupon_amount, decimal(20,2))/100 as coupon_amount,
       product_trade_type,
@@ -153,6 +156,7 @@
       convert(product_seller_fee, decimal(20,2))/100 as product_seller_fee,
       product_seller_fee_state,
       `code`,
+      product_unit,
       #{shopId} shop_id,
       #{shopCustomerId} shop_customer_id
     from order_goods
@@ -58,6 +58,7 @@
       <result column="achieve_type" jdbcType="INTEGER" property="achieveType" />
       <result column="achieve_address" jdbcType="VARCHAR" property="achieveAddress" />
       <result column="achieve_state" jdbcType="INTEGER" property="achieveState" />
+      <result column="transport_fee" jdbcType="BIGINT" property="transportFee" />
   </resultMap>
   <sql id="Base_Column_List">
     id, code, mapping_code, market_id, buyer_code, buyer_id,buyer_store_customer_id, buyer_name, buyer_account_id,
@@ -67,7 +68,7 @@
     pay_time, order_state, `state`, version, creater_id, creater, created_time, modifier_id,
     modifier, modified_time, verify_ids, verifier,verify_state, verifier_time, cancel_id, cancel_name,
     cancel_time, out_time,`source`,totle_seller_fee,district_id,district_name,sub_district_id,sub_district_name,location
-        ,order_status,relation_id,achieve_type,achieve_address,achieve_state
+        ,order_status,relation_id,achieve_type,achieve_address,achieve_state,transport_fee
   </sql>
     <sql id="Dto_Column_List">
             id,
@@ -94,7 +95,7 @@
             convert(totle_pay_amount, decimal(20,2))/100 as totle_pay_amount,
             convert(totle_paid_amount, decimal(20,2))/100 as totle_paid_amount,
             convert(totle_discount, decimal(20,2))/100 as totle_discount,
-            convert(totle_weight, decimal(20,2))/500 as totle_weight,
+            convert(totle_weight, decimal(20,2))/100 as totle_weight,
             order_type,
             pay_state,
             pay_time,
@@ -124,7 +125,8 @@
             location,
                 achieve_type,
                 achieve_address,
-                achieve_state
+                achieve_state,
+                transport_fee
     </sql>
     <insert id="saveOrder" parameterType="com.diligrp.etrade.order.model.Order" useGeneratedKeys="true" keyProperty="id" >
       insert into `order` (id, code, mapping_code,
@@ -143,7 +145,7 @@
                          cancel_id, cancel_name, cancel_time,
                          out_time,`source`,totle_seller_fee,
                          district_id,district_name,sub_district_id,sub_district_name,location
-                         ,order_status,relation_id,achieve_type,achieve_address,achieve_state)
+                         ,order_status,relation_id,achieve_type,achieve_address,achieve_state,transport_fee)
       values (#{id,jdbcType=BIGINT}, #{code,jdbcType=VARCHAR}, #{mappingCode,jdbcType=VARCHAR},
               #{marketId,jdbcType=BIGINT}, #{buyerCode,jdbcType=VARCHAR}, #{buyerId,jdbcType=BIGINT},#{buyerStoreCustomerId,jdbcType=BIGINT},
               #{buyerName,jdbcType=VARCHAR}, #{buyerAccountId,jdbcType=BIGINT}, #{buyerCardNo,jdbcType=VARCHAR},
@@ -160,7 +162,7 @@
               #{cancelId,jdbcType=BIGINT}, #{cancelName,jdbcType=VARCHAR}, #{cancelTime,jdbcType=TIMESTAMP},
               #{outTime,jdbcType=TIMESTAMP},#{source,jdbcType=TINYINT}, #{totleSellerFee,jdbcType=BIGINT},
               #{districtId,jdbcType=BIGINT},#{districtName},#{subDistrictId,jdbcType=BIGINT},#{subDistrictName},#{location}
-              ,#{orderStatus,jdbcType=TINYINT}, #{relationId,jdbcType=BIGINT}, #{achieveType,jdbcType=TINYINT},#{achieveAddress,jdbcType=VARCHAR},#{achieveState,jdbcType=TINYINT})
+              ,#{orderStatus,jdbcType=TINYINT}, #{relationId,jdbcType=BIGINT}, #{achieveType,jdbcType=TINYINT},#{achieveAddress,jdbcType=VARCHAR},#{achieveState,jdbcType=TINYINT},#{transportFee,jdbcType=VARCHAR})
     </insert>
     <update id="updateOrderById" parameterType="com.diligrp.etrade.order.model.Order">
         update `order`
@@ -212,7 +214,8 @@
             location = #{location},
             achieve_type = #{achieveType,jdbcType=TINYINT},
             achieve_address = #{achieveAddress,jdbcType=VARCHAR},
-            achieve_state = #{achieveState,jdbcType=TINYINT}
+            achieve_state = #{achieveState,jdbcType=TINYINT},
+            transport_fee = #{transportFee,jdbcType=VARCHAR}
         where id = #{id,jdbcType=BIGINT} and version = #{version,jdbcType=BIGINT}
     </update>
@@ -369,6 +372,9 @@
             <if test="achieveState != null">
                 achieve_state = #{achieveState,jdbcType=TINYINT},
             </if>
+            <if test="transportFee != null">
+                transport_fee = #{transportFee,jdbcType=VARCHAR},
+            </if>
         </set>
         where id = #{id,jdbcType=BIGINT} and version = #{version,jdbcType=INTEGER}
     </update>
@@ -34,20 +34,21 @@
     <result column="seller_fee_state" jdbcType="VARCHAR" property="sellerFeeState" />
     <result column="order_status" jdbcType="TINYINT" property="orderStatus" />
     <result column="relation_id" jdbcType="BIGINT" property="relationId" />
+      <result column="transport_fee" jdbcType="BIGINT" property="transportFee" />
   </resultMap>
     <sql id="Base_Column_List">
         id, `code`, order_id, order_code,market_id, pay_amount, pay_discount, payer_customer_id, payer_store_customer_id,
         payer_customer_name, payer_card_no, payer_account_id, payer_fund_account_id, payee_shop_id,
         payee_shop_name, payee_card_no, payee_account_id, payee_fund_account_id, payee_seller_id,
         payee_seller_name, pay_time, pay_mode, pay_channel, version, created_time, modified_time,
-        `state`, trade_id,totle_seller_fee,seller_fee_state,order_status,relation_id
+        `state`, trade_id,totle_seller_fee,seller_fee_state,order_status,relation_id,transport_fee
     </sql>
     <sql id="VO_Column_List">
         id, `code`, order_id, order_code, convert(pay_amount, decimal(20,2))/100 as pay_amount, convert(pay_discount, decimal(20,2))/100 as pay_discount, payer_customer_id, payer_store_customer_id,
         payer_customer_name, payer_card_no, payer_account_id, payer_fund_account_id, payee_shop_id,
         payee_shop_name, payee_card_no, payee_account_id, payee_fund_account_id, payee_seller_id,
         payee_seller_name, pay_time, pay_mode, pay_channel, version, created_time, modified_time,
-        `state`, trade_id,convert(totle_seller_fee, decimal(20,2))/100 as totle_seller_fee,seller_fee_state
+        `state`, trade_id,convert(totle_seller_fee, decimal(20,2))/100 as totle_seller_fee,seller_fee_state,transport_fee
     </sql>
   <insert id="save" parameterType="com.diligrp.etrade.order.model.OrderPayment" useGeneratedKeys="true" keyProperty="id" >
     insert into order_payment (id, code, order_id,market_id,
@@ -59,6 +60,7 @@
                                payee_seller_name, pay_time, pay_mode,
                                pay_channel, version,  state, trade_id,
                                totle_seller_fee,seller_fee_state,order_status,relation_id
+                               ,transport_fee
     )
     values (#{id,jdbcType=BIGINT}, #{code,jdbcType=VARCHAR}, #{orderId,jdbcType=INTEGER},#{marketId,jdbcType=BIGINT},
             #{orderCode,jdbcType=VARCHAR}, #{payAmount,jdbcType=BIGINT}, #{payDiscount,jdbcType=BIGINT},
@@ -68,7 +70,8 @@
             #{payeeAccountId,jdbcType=BIGINT}, #{payeeFundAccountId,jdbcType=BIGINT}, #{payeeSellerId,jdbcType=BIGINT},
             #{payeeSellerName,jdbcType=VARCHAR}, #{payTime,jdbcType=TIMESTAMP}, #{payMode,jdbcType=INTEGER},
             #{payChannel,jdbcType=INTEGER}, #{version,jdbcType=INTEGER}, #{state,jdbcType=TINYINT}, #{tradeId,jdbcType=VARCHAR},
-            #{totleSellerFee,jdbcType=BIGINT}, #{sellerFeeState,jdbcType=TINYINT},#{orderStatus,jdbcType=TINYINT}, #{relationId,jdbcType=BIGINT})
+            #{totleSellerFee,jdbcType=BIGINT}, #{sellerFeeState,jdbcType=TINYINT},#{orderStatus,jdbcType=TINYINT}, #{relationId,jdbcType=BIGINT}
+            ,#{transportFee,jdbcType=BIGINT})
   </insert>
     <insert id="saveBatch" useGeneratedKeys="true" keyProperty="id">
         insert into order_payment (id, code, order_id,market_id,
@@ -80,6 +83,7 @@
                                    payee_seller_name, pay_time, pay_mode,
                                    pay_channel, version,  state, trade_id,
                                    totle_seller_fee,seller_fee_state,order_status,relation_id
+                                   ,transport_fee
         )
         values
         <foreach collection="list" item="payment" separator=",">
@@ -91,7 +95,8 @@
                 #{payment.payeeAccountId,jdbcType=BIGINT}, #{payment.payeeFundAccountId,jdbcType=BIGINT}, #{payment.payeeSellerId,jdbcType=BIGINT},
                 #{payment.payeeSellerName,jdbcType=VARCHAR}, #{payment.payTime,jdbcType=TIMESTAMP}, #{payment.payMode,jdbcType=INTEGER},
                 #{payment.payChannel,jdbcType=INTEGER}, #{payment.version,jdbcType=INTEGER}, #{payment.state,jdbcType=TINYINT}, #{payment.tradeId,jdbcType=VARCHAR},
-                #{payment.totleSellerFee,jdbcType=BIGINT}, #{payment.sellerFeeState,jdbcType=TINYINT},#{payment.orderStatus,jdbcType=TINYINT}, #{payment.relationId,jdbcType=BIGINT})
+                #{payment.totleSellerFee,jdbcType=BIGINT}, #{payment.sellerFeeState,jdbcType=TINYINT},#{payment.orderStatus,jdbcType=TINYINT}, #{payment.relationId,jdbcType=BIGINT}
+                ,#{payment.transportFee,jdbcType=BIGINT})
         </foreach>
     </insert>
     <update id="updatepayment" parameterType="com.diligrp.etrade.order.model.OrderPayment">
@@ -120,7 +125,8 @@
             state = #{state,jdbcType=TINYINT},
             trade_id = #{tradeId,jdbcType=VARCHAR},
             totle_seller_fee = #{totleSellerFee,jdbcType=BIGINT},
-            seller_fee_state = #{sellerFeeState,jdbcType=TINYINT}
+            seller_fee_state = #{sellerFeeState,jdbcType=TINYINT},
+            transport_fee = #{transportFee,jdbcType=BIGINT}
         where id = #{id,jdbcType=BIGINT}
     </update>
     <update id="finishPayUpdata" >
@@ -49,6 +49,7 @@
         <result column="source" jdbcType="TIMESTAMP" property="source" />
         <result column="achieve_type" jdbcType="TIMESTAMP" property="achieveType" />
         <result column="achieve_state" jdbcType="TIMESTAMP" property="achieveState" />
+        <result column="transport_fee" jdbcType="BIGINT" property="transportFee" />
         <collection property="productList" ofType="com.diligrp.etrade.order.domain.ProductDto">
           <result property="productId" column="id"/>
           <result property="productImgUrl" column="product_img_url"/>
@@ -107,7 +108,7 @@
         convert(ord.totle_pay_amount, decimal(20,2))/100 as totle_pay_amount,
         convert(ord.totle_paid_amount, decimal(20,2))/100 as totle_paid_amount,
         convert(ord.totle_discount, decimal(20,2))/100 as totle_discount,
-        convert(ord.totle_weight, decimal(20,2))/500 as totle_weight,
+        convert(ord.totle_weight, decimal(20,2))/100 as totle_weight,
         ord.order_type as order_type,
         ord.pay_state as pay_state,
         ord.pay_time as pay_time,
@@ -130,7 +131,9 @@
         ord.out_time as out_time,
         ord.`source` as `source`,
         ord.achieve_type as achieve_type,
-        ord.achieve_state as achieve_state
+        ord.achieve_state as achieve_state,
+        ord.transport_fee as transport_fee
+
     </sql>
     <select id="queryOrderStateNumberBuyer" resultType="com.diligrp.etrade.order.domain.OrderStateNumberDto"
             parameterType="com.diligrp.etrade.order.domain.OrderQueryBuyerDto">
@@ -54,6 +54,7 @@
         <result column="relation_id" jdbcType="DECIMAL" property="relationId" />
         <result column="achieve_type" jdbcType="DECIMAL" property="achieveType" />
         <result column="achieve_state" jdbcType="DECIMAL" property="achieveState" />
+        <result column="transport_fee" jdbcType="BIGINT" property="transportFee" />
     </resultMap>
   <sql id="Base_Column_List">
     id, `code`, mapping_code, market_id, buyer_code, buyer_id,buyer_store_customer_id, buyer_name, buyer_account_id,
@@ -119,7 +120,8 @@
             `relation_id`,
             location,
             achieve_type,
-            achieve_state
+            achieve_state,
+            transport_fee
     </sql>
     <select id="queryOrderStateNumber" resultType="com.diligrp.etrade.order.domain.OrderStateNumberDto"
             parameterType="com.diligrp.etrade.order.domain.OrderQueryDto">
@@ -210,6 +212,7 @@
         opa.pay_channel as pay_channel,
         ord.achieve_type as achieve_type,
         ord.achieve_state as achieve_state,
+        ord.transport_fee as transport_fee,
         (CASE WHEN opa.payee_seller_name IS NULL OR opa.payee_seller_name = '' THEN ord.shop_customer_name ELSE opa.payee_seller_name END) AS payee_seller_name
         from `order` ord
         left join order_payment opa on opa.order_id = ord.id and opa.`state` = 2
@@ -49,6 +49,7 @@
         <result column="source" jdbcType="TINYINT" property="source" />
         <result column="achieve_type" jdbcType="TINYINT" property="achieveType" />
         <result column="achieve_state" jdbcType="TINYINT" property="achieveState" />
+        <result column="transport_fee" jdbcType="BIGINT" property="transportFee" />
         <collection property="productList" ofType="com.diligrp.etrade.order.domain.ProductDto">
             <result property="productId" column="id"/>
             <result property="productImgUrl" column="product_img_url"/>
@@ -89,7 +90,7 @@
             convert(ord.totle_pay_amount, decimal(20,2))/100 as totle_pay_amount,
             convert(ord.totle_paid_amount, decimal(20,2))/100 as totle_paid_amount,
             convert(ord.totle_discount, decimal(20,2))/100 as totle_discount,
-            convert(ord.totle_weight, decimal(20,2))/500 as totle_weight,
+            convert(ord.totle_weight, decimal(20,2))/100 as totle_weight,
             ord.order_type,
             ord.pay_state,
             ord.pay_time,
@@ -112,7 +113,8 @@
             ord.out_time,
             ord.achieve_type,
             ord.achieve_state,
-            ord.`source`
+            ord.`source`,
+            ord.transport_fee
     </sql>
     <!--<update id="updateOrderById" parameterType="com.diligrp.etrade.order.model.Order">
         update `order`