Skip to content

Y
yd-backend
Commit 8f018c1f by yao.xiao
Options

修改-PoOrder表删除yd_value_added_tax/fortune删除referral_amount_after_valueadded

parent 4b318b44
Showing with 11 additions and 74 deletions
yd-api/src/main/java/com/yd/api/customer/vo/CustomerFortuneVO.java
......@@ -20,8 +20,6 @@ public class CustomerFortuneVO {
private BigDecimal referralAmount;
private BigDecimal referralAmountAfterValueadded;
private Integer isTax;
private BigDecimal taxAmount;
......@@ -104,14 +102,6 @@ public class CustomerFortuneVO {
this.referralAmount = referralAmount;
}
public BigDecimal getReferralAmountAfterValueadded() {
return referralAmountAfterValueadded;
}
public void setReferralAmountAfterValueadded(BigDecimal referralAmountAfterValueadded) {
this.referralAmountAfterValueadded = referralAmountAfterValueadded;
}
public Integer getIsTax() {
return isTax;
}
......
yd-api/src/main/java/com/yd/dal/entity/customer/AclCustomerFortune.java
......@@ -68,11 +68,6 @@ public class AclCustomerFortune implements Serializable {
private BigDecimal referralAmount;
/**
* 扣除6个点的企业增值税（6%）
*/
private BigDecimal referralAmountAfterValueadded;
/**
* 0=No, 1=Yes
*/
private Integer isTax;
......
yd-api/src/main/java/com/yd/dal/entity/customer/CustomerFortune.java
......@@ -20,8 +20,6 @@ public class CustomerFortune {
private BigDecimal referralAmount;
private BigDecimal referralAmountAfterValueadded;
private Integer isTax;
private BigDecimal taxAmount;
......@@ -104,14 +102,6 @@ public class CustomerFortune {
this.referralAmount = referralAmount;
}
public BigDecimal getReferralAmountAfterValueadded() {
return referralAmountAfterValueadded;
}
public void setReferralAmountAfterValueadded(BigDecimal referralAmountAfterValueadded) {
this.referralAmountAfterValueadded = referralAmountAfterValueadded;
}
public Integer getIsTax() {
return isTax;
}
......
yd-api/src/main/java/com/yd/dal/entity/order/PoOrder.java
......@@ -128,11 +128,6 @@ public class PoOrder implements Serializable {
private Integer isCarTax;
/**
* 银盾企业增值税缺省为0，小数
*/
private BigDecimal ydValueAddedTax;
/**
* FK ag_product_plan_commission，ag_product_life_plan_commission银盾来佣佣金率
*/
private BigDecimal commissionRate;
......@@ -158,12 +153,12 @@ public class PoOrder implements Serializable {
private BigDecimal gradeCommissionRate;
/**
* 最终个人佣金率 = 银盾来佣率 * (1 + yd_value_added_tax) * 银盾公告佣金率 * 个人职级佣金率
* 最终个人佣金率 = 银盾公告佣金率 * 个人职级佣金率
*/
private BigDecimal referralRate;
/**
* 最终个人佣金 = order_price / (1 + yd_value_added_tax) * 银盾来佣率 * 银盾公告佣金率 * 个人职级佣金率
* 最终个人佣金 = order_price / 银盾公告佣金率 * 个人职级佣金率
*/
private BigDecimal referralAmount;
......
yd-api/src/main/resources/mapper/customer/AclCustomerFortuneMapper.xml
......@@ -15,7 +15,6 @@
<result column="grade_commission_rate" jdbcType="DECIMAL" property="gradeCommissionRate" />
<result column="referral_rate" jdbcType="DECIMAL" property="referralRate" />
<result column="referral_amount" jdbcType="DECIMAL" property="referralAmount" />
<result column="referral_amount_after_valueadded" jdbcType="DECIMAL" property="referralAmountAfterValueadded" />
<result column="is_tax" jdbcType="INTEGER" property="isTax" />
<result column="tax_amount" jdbcType="DECIMAL" property="taxAmount" />
<result column="net_amount" jdbcType="DECIMAL" property="netAmount" />
......@@ -29,7 +28,7 @@
<sql id="Base_Column_List">
id, share_id, customer_id, order_id, order_date, order_price, commission_rate, commission_amount,
announcement_commission_rate, announcement_commission_amount, grade_commission_rate,
referral_rate, referral_amount, referral_amount_after_valueadded, is_tax, tax_amount,
referral_rate, referral_amount, is_tax, tax_amount,
net_amount, campaign_id, withdrawable_date, withdrawed_id, fortune_payed_id, created_at,
created_by
</sql>
......@@ -48,7 +47,7 @@
order_date, order_price, commission_rate,
commission_amount, announcement_commission_rate,
announcement_commission_amount, grade_commission_rate,
referral_rate, referral_amount, referral_amount_after_valueadded,
referral_rate, referral_amount,
is_tax, tax_amount, net_amount,
campaign_id, withdrawable_date, withdrawed_id,
fortune_payed_id, created_at, created_by
......@@ -57,7 +56,7 @@
#{orderDate,jdbcType=TIMESTAMP}, #{orderPrice,jdbcType=DECIMAL}, #{commissionRate,jdbcType=DECIMAL},
#{commissionAmount,jdbcType=DECIMAL}, #{announcementCommissionRate,jdbcType=DECIMAL},
#{announcementCommissionAmount,jdbcType=DECIMAL}, #{gradeCommissionRate,jdbcType=DECIMAL},
#{referralRate,jdbcType=DECIMAL}, #{referralAmount,jdbcType=DECIMAL}, #{referralAmountAfterValueadded,jdbcType=DECIMAL},
#{referralRate,jdbcType=DECIMAL}, #{referralAmount,jdbcType=DECIMAL},
#{isTax,jdbcType=INTEGER}, #{taxAmount,jdbcType=DECIMAL}, #{netAmount,jdbcType=DECIMAL},
#{campaignId,jdbcType=BIGINT}, #{withdrawableDate,jdbcType=TIMESTAMP}, #{withdrawedId,jdbcType=BIGINT},
#{fortunePayedId,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, #{createdBy,jdbcType=BIGINT}
......@@ -102,9 +101,6 @@
<if test="referralAmount != null">
referral_amount,
</if>
<if test="referralAmountAfterValueadded != null">
referral_amount_after_valueadded,
</if>
<if test="isTax != null">
is_tax,
</if>
......@@ -170,9 +166,6 @@
<if test="referralAmount != null">
#{referralAmount,jdbcType=DECIMAL},
</if>
<if test="referralAmountAfterValueadded != null">
#{referralAmountAfterValueadded,jdbcType=DECIMAL},
</if>
<if test="isTax != null">
#{isTax,jdbcType=INTEGER},
</if>
......@@ -241,9 +234,6 @@
<if test="referralAmount != null">
referral_amount = #{referralAmount,jdbcType=DECIMAL},
</if>
<if test="referralAmountAfterValueadded != null">
referral_amount_after_valueadded = #{referralAmountAfterValueadded,jdbcType=DECIMAL},
</if>
<if test="isTax != null">
is_tax = #{isTax,jdbcType=INTEGER},
</if>
......@@ -288,7 +278,6 @@
grade_commission_rate = #{gradeCommissionRate,jdbcType=DECIMAL},
referral_rate = #{referralRate,jdbcType=DECIMAL},
referral_amount = #{referralAmount,jdbcType=DECIMAL},
referral_amount_after_valueadded = #{referralAmountAfterValueadded,jdbcType=DECIMAL},
is_tax = #{isTax,jdbcType=INTEGER},
tax_amount = #{taxAmount,jdbcType=DECIMAL},
net_amount = #{netAmount,jdbcType=DECIMAL},
......
yd-api/src/main/resources/mapper/customer/CustomerFortuneMapper.xml
......@@ -10,7 +10,6 @@
<result column="order_price" jdbcType="DECIMAL" property="orderPrice" />
<result column="referral_rate" jdbcType="DECIMAL" property="referralRate" />
<result column="referral_amount" jdbcType="DECIMAL" property="referralAmount" />
<result column="referral_amount_after_valueadded" jdbcType="DECIMAL" property="referralAmountAfterValueadded" />
<result column="is_tax" jdbcType="INTEGER" property="isTax" />
<result column="tax_amount" jdbcType="DECIMAL" property="taxAmount" />
<result column="net_amount" jdbcType="DECIMAL" property="netAmount" />
......@@ -23,7 +22,7 @@
</resultMap>
<sql id="Base_Column_List">
id, share_id, customer_id, order_id, order_date, order_price, referral_rate, referral_amount,
referral_amount_after_valueadded, is_tax, tax_amount, net_amount, campaign_id, withdrawable_date,
is_tax, tax_amount, net_amount, campaign_id, withdrawable_date,
withdrawed_id, fortune_payed_id, created_at, created_by
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
......@@ -45,14 +44,14 @@
<insert id="insert" parameterType="com.yd.dal.entity.customer.CustomerFortune">
insert into ag_acl_customer_fortune (id, share_id, customer_id,
order_id, order_date, order_price,
referral_rate, referral_amount, referral_amount_after_valueadded,
referral_rate, referral_amount,
is_tax, tax_amount, net_amount,
campaign_id, withdrawable_date, withdrawed_id,
fortune_payed_id, created_at, created_by
)
values (#{id,jdbcType=BIGINT}, #{shareId,jdbcType=BIGINT}, #{customerId,jdbcType=BIGINT},
#{orderId,jdbcType=BIGINT}, #{orderDate,jdbcType=TIMESTAMP}, #{orderPrice,jdbcType=DECIMAL},
#{referralRate,jdbcType=DECIMAL}, #{referralAmount,jdbcType=DECIMAL}, #{referralAmountAfterValueadded,jdbcType=DECIMAL},
#{referralRate,jdbcType=DECIMAL}, #{referralAmount,jdbcType=DECIMAL},
#{isTax,jdbcType=INTEGER}, #{taxAmount,jdbcType=DECIMAL}, #{netAmount,jdbcType=DECIMAL},
#{campaignId,jdbcType=BIGINT}, #{withdrawableDate,jdbcType=TIMESTAMP}, #{withdrawedId,jdbcType=BIGINT},
#{fortunePayedId,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, #{createdBy,jdbcType=BIGINT}
......@@ -85,9 +84,6 @@
<if test="referralAmount != null">
referral_amount,
</if>
<if test="referralAmountAfterValueadded != null">
referral_amount_after_valueadded,
</if>
<if test="isTax != null">
is_tax,
</if>
......@@ -141,9 +137,6 @@
<if test="referralAmount != null">
#{referralAmount,jdbcType=DECIMAL},
</if>
<if test="referralAmountAfterValueadded != null">
#{referralAmountAfterValueadded,jdbcType=DECIMAL},
</if>
<if test="isTax != null">
#{isTax,jdbcType=INTEGER},
</if>
......@@ -197,9 +190,6 @@
<if test="referralAmount != null">
referral_amount = #{referralAmount,jdbcType=DECIMAL},
</if>
<if test="referralAmountAfterValueadded != null">
referral_amount_after_valueadded = #{referralAmountAfterValueadded,jdbcType=DECIMAL},
</if>
<if test="isTax != null">
is_tax = #{isTax,jdbcType=INTEGER},
</if>
......@@ -239,7 +229,6 @@
order_price = #{orderPrice,jdbcType=DECIMAL},
referral_rate = #{referralRate,jdbcType=DECIMAL},
referral_amount = #{referralAmount,jdbcType=DECIMAL},
referral_amount_after_valueadded = #{referralAmountAfterValueadded,jdbcType=DECIMAL},
is_tax = #{isTax,jdbcType=INTEGER},
tax_amount = #{taxAmount,jdbcType=DECIMAL},
net_amount = #{netAmount,jdbcType=DECIMAL},
......
yd-api/src/main/resources/mapper/order/PoOrderMapper.xml
......@@ -27,7 +27,6 @@
<result column="insurer_pdf_url" jdbcType="VARCHAR" property="insurerPdfUrl" />
<result column="is_msg_sent" jdbcType="INTEGER" property="isMsgSent" />
<result column="is_car_tax" jdbcType="INTEGER" property="isCarTax" />
<result column="yd_value_added_tax" jdbcType="DECIMAL" property="ydValueAddedTax" />
<result column="commission_rate" jdbcType="DECIMAL" property="commissionRate" />
<result column="commission_amount" jdbcType="DECIMAL" property="commissionAmount" />
<result column="announcement_commission_rate" jdbcType="DECIMAL" property="announcementCommissionRate" />
......@@ -87,7 +86,7 @@
quote_no, product_category_id, destination, destination_continent_id, destination_region_id,
destination_country_id, effective_start_date, effective_end_date, cover_length, cover_adult_qty,
cover_underage_qty, payment_method_id, pay_url, pay_from, insurer_pdf_url, is_msg_sent,
is_car_tax, yd_value_added_tax, commission_rate, commission_amount, announcement_commission_rate,
is_car_tax, commission_rate, commission_amount, announcement_commission_rate,
announcement_commission_amount, grade_commission_rate, referral_rate, referral_amount,
policy_id, policy_no, mkt_campaign, mkt_task, is_converted, `status`, payment_status,
flag, customer_id, referral_customer_id, share_code, insurer_id, data_source, is_social_insured,
......@@ -117,7 +116,7 @@
effective_end_date, cover_length, cover_adult_qty,
cover_underage_qty, payment_method_id, pay_url,
pay_from, insurer_pdf_url, is_msg_sent,
is_car_tax, yd_value_added_tax, commission_rate,
is_car_tax, commission_rate,
commission_amount, announcement_commission_rate,
announcement_commission_amount, grade_commission_rate,
referral_rate, referral_amount, policy_id,
......@@ -145,7 +144,7 @@
#{effectiveEndDate,jdbcType=TIMESTAMP}, #{coverLength,jdbcType=INTEGER}, #{coverAdultQty,jdbcType=INTEGER},
#{coverUnderageQty,jdbcType=INTEGER}, #{paymentMethodId,jdbcType=BIGINT}, #{payUrl,jdbcType=VARCHAR},
#{payFrom,jdbcType=INTEGER}, #{insurerPdfUrl,jdbcType=VARCHAR}, #{isMsgSent,jdbcType=INTEGER},
#{isCarTax,jdbcType=INTEGER}, #{ydValueAddedTax,jdbcType=DECIMAL}, #{commissionRate,jdbcType=DECIMAL},
#{isCarTax,jdbcType=INTEGER},#{commissionRate,jdbcType=DECIMAL},
#{commissionAmount,jdbcType=DECIMAL}, #{announcementCommissionRate,jdbcType=DECIMAL},
#{announcementCommissionAmount,jdbcType=DECIMAL}, #{gradeCommissionRate,jdbcType=DECIMAL},
#{referralRate,jdbcType=DECIMAL}, #{referralAmount,jdbcType=DECIMAL}, #{policyId,jdbcType=BIGINT},
......@@ -241,9 +240,6 @@
<if test="isCarTax != null">
is_car_tax,
</if>
<if test="ydValueAddedTax != null">
yd_value_added_tax,
</if>
<if test="commissionRate != null">
commission_rate,
</if>
......@@ -477,9 +473,6 @@
<if test="isCarTax != null">
#{isCarTax,jdbcType=INTEGER},
</if>
<if test="ydValueAddedTax != null">
#{ydValueAddedTax,jdbcType=DECIMAL},
</if>
<if test="commissionRate != null">
#{commissionRate,jdbcType=DECIMAL},
</if>
......@@ -716,9 +709,6 @@
<if test="isCarTax != null">
is_car_tax = #{isCarTax,jdbcType=INTEGER},
</if>
<if test="ydValueAddedTax != null">
yd_value_added_tax = #{ydValueAddedTax,jdbcType=DECIMAL},
</if>
<if test="commissionRate != null">
commission_rate = #{commissionRate,jdbcType=DECIMAL},
</if>
......@@ -907,7 +897,6 @@
insurer_pdf_url = #{insurerPdfUrl,jdbcType=VARCHAR},
is_msg_sent = #{isMsgSent,jdbcType=INTEGER},
is_car_tax = #{isCarTax,jdbcType=INTEGER},
yd_value_added_tax = #{ydValueAddedTax,jdbcType=DECIMAL},
commission_rate = #{commissionRate,jdbcType=DECIMAL},
commission_amount = #{commissionAmount,jdbcType=DECIMAL},
announcement_commission_rate = #{announcementCommissionRate,jdbcType=DECIMAL},
......
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