Commit 81eb9455 by guanzhenshan

采购单详情增加采购额,已付款额,快递费

parent a8f63e36
...@@ -371,5 +371,14 @@ public class PurchaseDetailDTO { ...@@ -371,5 +371,14 @@ public class PurchaseDetailDTO {
@JSONField(name = "arrivalstatus") @JSONField(name = "arrivalstatus")
private Integer arrivalStatus; private Integer arrivalStatus;
@JSONField(name = "buyamount")
private Integer amountBuy;
@JSONField(name = "payamount")
private Integer amountPayed;
@JSONField(name = "expressfee")
private Integer amountExpress;
} }
PURCHASE_DETAILS_URL=http://purchase.bailuntec.com/api/GetPagePurchaseSkuInfo PURCHASE_DETAILS_URL=http://api.purchase.bailuntec.com/api/GetPagePurchaseSkuInfo
SEMI_PURCHASE_DETAILS_URL=http://mjcg.bailuntec.com/Api/GetPagePurchaseSkuInfo SEMI_PURCHASE_DETAILS_URL=http://mjcg.bailuntec.com/Api/GetPagePurchaseSkuInfo
#PURCHASE_DETAILS_URL=http://10.0.6.15:3333/api/GetPagePurchaseSkuInfo #PURCHASE_DETAILS_URL=http://10.0.6.15:3333/api/GetPagePurchaseSkuInfo
PURCHASE_AIMS_URL=http://api.purchase.bailuntec.com/Api/PurchaseSource PURCHASE_AIMS_URL=http://api.purchase.bailuntec.com/Api/PurchaseSource
\ No newline at end of file
package com.bailuntec.domain.entity; package com.bailuntec.domain.entity;
import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
...@@ -422,6 +423,16 @@ public class DcBasePurchaseDetails { ...@@ -422,6 +423,16 @@ public class DcBasePurchaseDetails {
*/ */
private Integer arrivalStatus; private Integer arrivalStatus;
private Integer amountBuy;
private Integer amountPayed;
private Integer amountExpress;
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_base_purchase_details * This method corresponds to the database table dc_base_purchase_details
......
...@@ -52,6 +52,9 @@ ...@@ -52,6 +52,9 @@
<result column="pay_status" jdbcType="INTEGER" property="payStatus" /> <result column="pay_status" jdbcType="INTEGER" property="payStatus" />
<result column="last_signtime" jdbcType="TIMESTAMP" property="lastSigntime" /> <result column="last_signtime" jdbcType="TIMESTAMP" property="lastSigntime" />
<result column="arrival_status" jdbcType="INTEGER" property="arrivalStatus" /> <result column="arrival_status" jdbcType="INTEGER" property="arrivalStatus" />
<result column="amount_buy" jdbcType="DECIMAL" property="amountBuy" />
<result column="amount_payed" jdbcType="DECIMAL" property="amountPayed" />
<result column="amount_express" jdbcType="DECIMAL" property="amountExpress" />
</resultMap> </resultMap>
<sql id="Example_Where_Clause"> <sql id="Example_Where_Clause">
<!-- <!--
...@@ -209,7 +212,9 @@ ...@@ -209,7 +212,9 @@
logistics_order_id, logistics_company_name, logistics_order_id, logistics_company_name,
company_id, ispush, isallot, company_id, ispush, isallot,
isaims, pay_type, pay_status, isaims, pay_type, pay_status,
last_signtime, arrival_status) last_signtime, arrival_status
)
values (#{id,jdbcType=INTEGER}, #{purchaseId,jdbcType=VARCHAR}, #{status,jdbcType=TINYINT}, values (#{id,jdbcType=INTEGER}, #{purchaseId,jdbcType=VARCHAR}, #{status,jdbcType=TINYINT},
#{purchaseCategoryName,jdbcType=VARCHAR}, #{deliverId,jdbcType=INTEGER}, #{deliverName,jdbcType=VARCHAR}, #{purchaseCategoryName,jdbcType=VARCHAR}, #{deliverId,jdbcType=INTEGER}, #{deliverName,jdbcType=VARCHAR},
#{deliverValue,jdbcType=INTEGER}, #{buyerName,jdbcType=VARCHAR}, #{warehouseFromCode,jdbcType=VARCHAR}, #{deliverValue,jdbcType=INTEGER}, #{buyerName,jdbcType=VARCHAR}, #{warehouseFromCode,jdbcType=VARCHAR},
...@@ -373,6 +378,15 @@ ...@@ -373,6 +378,15 @@
<if test="arrivalStatus != null"> <if test="arrivalStatus != null">
arrival_status, arrival_status,
</if> </if>
<if test="amountBuy != null">
amount_buy,
</if>
<if test="amountPayed != null">
amount_payed,
</if>
<if test="amountExpress != null">
amount_express
</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null"> <if test="id != null">
...@@ -513,6 +527,15 @@ ...@@ -513,6 +527,15 @@
<if test="arrivalStatus != null"> <if test="arrivalStatus != null">
#{arrivalStatus,jdbcType=INTEGER}, #{arrivalStatus,jdbcType=INTEGER},
</if> </if>
<if test="amountBuy != null">
#{amountBuy,jdbcType=DECIMAL},
</if>
<if test="amountPayed != null">
#{amountPayed,jdbcType=DECIMAL},
</if>
<if test="amountExpress != null">
#{amountExpress,jdbcType=DECIMAL},
</if>
</trim> </trim>
</insert> </insert>
<select id="countByExample" parameterType="com.bailuntec.domain.example.DcBasePurchaseDetailsExample" resultType="java.lang.Long"> <select id="countByExample" parameterType="com.bailuntec.domain.example.DcBasePurchaseDetailsExample" resultType="java.lang.Long">
...@@ -670,6 +693,19 @@ ...@@ -670,6 +693,19 @@
<if test="record.arrivalStatus != null"> <if test="record.arrivalStatus != null">
arrival_status = #{record.arrivalStatus,jdbcType=INTEGER}, arrival_status = #{record.arrivalStatus,jdbcType=INTEGER},
</if> </if>
<if test="record.arrivalStatus != null">
amount_buy = #{record.amountBuy,jdbcType=DECIMAL},
</if>
<if test="record.arrivalStatus != null">
amount_payed = #{record.amountPayed,jdbcType=DECIMAL},
</if>
<if test="record.arrivalStatus != null">
amount_express = #{record.amountExpress,jdbcType=DECIMAL},
</if>
</set> </set>
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment