Skip to content

Y
yd-backend
Commit a564b03d by Water Wang
Options

Merge remote-tracking branch 'refs/remotes/origin/dev' into dev

parents 4fc39a38 28aa51ac
Showing with 772 additions and 101 deletions
yd-api/src/main/java/com/yd/dal/entity/order/PoOrder.java
package com.yd.dal.entity.order;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import lombok.Data;
/**
* ag_po_order
* @author
* Purchase Order 訂單
*/
@Data
public class PoOrder implements Serializable {
public class PoOrder {
private static final long serialVersionUID = 1L;
/**
* serial id
*/
......@@ -128,6 +125,11 @@ 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;
......@@ -138,14 +140,19 @@ public class PoOrder implements Serializable {
private BigDecimal commissionAmount;
/**
* FK ag_product_plan_commission，ag_product_life_plan_commission公告佣金率
* 公告佣金率存百分值
*/
private BigDecimal announcementCommissionRate;
private BigDecimal fycRate;
/**
* 公告佣金
*/
private BigDecimal announcementCommissionAmount;
private BigDecimal fycAmount;
/**
* B2C Rate存百分值
*/
private BigDecimal b2cRate;
/**
* FK ag_acl_channel_referral_rate个人职级佣金率
......@@ -153,12 +160,12 @@ public class PoOrder implements Serializable {
private BigDecimal gradeCommissionRate;
/**
* 最终个人佣金率 = 银盾公告佣金率 * 个人职级佣金率
* 最终个人佣金率 = 银盾来佣率 * (1 + yd_value_added_tax) * 银盾公告佣金率 * 个人职级佣金率
*/
private BigDecimal referralRate;
/**
* 最终个人佣金 = order_price / 银盾公告佣金率 * 个人职级佣金率
* 最终个人佣金 = order_price / (1 + yd_value_added_tax) * 银盾来佣率 * 银盾公告佣金率 * 个人职级佣金率
*/
private BigDecimal referralAmount;
......@@ -380,5 +387,643 @@ public class PoOrder implements Serializable {
*/
private String autoPayFlag;
private static final long serialVersionUID = 1L;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public Integer getConfigLevel() {
return configLevel;
}
public void setConfigLevel(Integer configLevel) {
this.configLevel = configLevel;
}
public Long getProductId() {
return productId;
}
public void setProductId(Long productId) {
this.productId = productId;
}
public Long getPlanId() {
return planId;
}
public void setPlanId(Long planId) {
this.planId = planId;
}
public String getOrderNo() {
return orderNo;
}
public void setOrderNo(String orderNo) {
this.orderNo = orderNo;
}
public Date getOrderDate() {
return orderDate;
}
public void setOrderDate(Date orderDate) {
this.orderDate = orderDate;
}
public BigDecimal getOrderPrice() {
return orderPrice;
}
public void setOrderPrice(BigDecimal orderPrice) {
this.orderPrice = orderPrice;
}
public Long getQuotationId() {
return quotationId;
}
public void setQuotationId(Long quotationId) {
this.quotationId = quotationId;
}
public Long getQuoteNo() {
return quoteNo;
}
public void setQuoteNo(Long quoteNo) {
this.quoteNo = quoteNo;
}
public Long getProductCategoryId() {
return productCategoryId;
}
public void setProductCategoryId(Long productCategoryId) {
this.productCategoryId = productCategoryId;
}
public String getDestination() {
return destination;
}
public void setDestination(String destination) {
this.destination = destination;
}
public Long getDestinationContinentId() {
return destinationContinentId;
}
public void setDestinationContinentId(Long destinationContinentId) {
this.destinationContinentId = destinationContinentId;
}
public Long getDestinationRegionId() {
return destinationRegionId;
}
public void setDestinationRegionId(Long destinationRegionId) {
this.destinationRegionId = destinationRegionId;
}
public Long getDestinationCountryId() {
return destinationCountryId;
}
public void setDestinationCountryId(Long destinationCountryId) {
this.destinationCountryId = destinationCountryId;
}
public Date getEffectiveStartDate() {
return effectiveStartDate;
}
public void setEffectiveStartDate(Date effectiveStartDate) {
this.effectiveStartDate = effectiveStartDate;
}
public Date getEffectiveEndDate() {
return effectiveEndDate;
}
public void setEffectiveEndDate(Date effectiveEndDate) {
this.effectiveEndDate = effectiveEndDate;
}
public Integer getCoverLength() {
return coverLength;
}
public void setCoverLength(Integer coverLength) {
this.coverLength = coverLength;
}
public Integer getCoverAdultQty() {
return coverAdultQty;
}
public void setCoverAdultQty(Integer coverAdultQty) {
this.coverAdultQty = coverAdultQty;
}
public Integer getCoverUnderageQty() {
return coverUnderageQty;
}
public void setCoverUnderageQty(Integer coverUnderageQty) {
this.coverUnderageQty = coverUnderageQty;
}
public Long getPaymentMethodId() {
return paymentMethodId;
}
public void setPaymentMethodId(Long paymentMethodId) {
this.paymentMethodId = paymentMethodId;
}
public String getPayUrl() {
return payUrl;
}
public void setPayUrl(String payUrl) {
this.payUrl = payUrl;
}
public Integer getPayFrom() {
return payFrom;
}
public void setPayFrom(Integer payFrom) {
this.payFrom = payFrom;
}
public String getInsurerPdfUrl() {
return insurerPdfUrl;
}
public void setInsurerPdfUrl(String insurerPdfUrl) {
this.insurerPdfUrl = insurerPdfUrl;
}
public Integer getIsMsgSent() {
return isMsgSent;
}
public void setIsMsgSent(Integer isMsgSent) {
this.isMsgSent = isMsgSent;
}
public Integer getIsCarTax() {
return isCarTax;
}
public void setIsCarTax(Integer isCarTax) {
this.isCarTax = isCarTax;
}
public BigDecimal getYdValueAddedTax() {
return ydValueAddedTax;
}
public void setYdValueAddedTax(BigDecimal ydValueAddedTax) {
this.ydValueAddedTax = ydValueAddedTax;
}
public BigDecimal getCommissionRate() {
return commissionRate;
}
public void setCommissionRate(BigDecimal commissionRate) {
this.commissionRate = commissionRate;
}
public BigDecimal getCommissionAmount() {
return commissionAmount;
}
public void setCommissionAmount(BigDecimal commissionAmount) {
this.commissionAmount = commissionAmount;
}
public BigDecimal getFycRate() {
return fycRate;
}
public void setFycRate(BigDecimal fycRate) {
this.fycRate = fycRate;
}
public BigDecimal getFycAmount() {
return fycAmount;
}
public void setFycAmount(BigDecimal fycAmount) {
this.fycAmount = fycAmount;
}
public BigDecimal getB2cRate() {
return b2cRate;
}
public void setB2cRate(BigDecimal b2cRate) {
this.b2cRate = b2cRate;
}
public BigDecimal getGradeCommissionRate() {
return gradeCommissionRate;
}
public void setGradeCommissionRate(BigDecimal gradeCommissionRate) {
this.gradeCommissionRate = gradeCommissionRate;
}
public BigDecimal getReferralRate() {
return referralRate;
}
public void setReferralRate(BigDecimal referralRate) {
this.referralRate = referralRate;
}
public BigDecimal getReferralAmount() {
return referralAmount;
}
public void setReferralAmount(BigDecimal referralAmount) {
this.referralAmount = referralAmount;
}
public Long getPolicyId() {
return policyId;
}
public void setPolicyId(Long policyId) {
this.policyId = policyId;
}
public String getPolicyNo() {
return policyNo;
}
public void setPolicyNo(String policyNo) {
this.policyNo = policyNo;
}
public String getMktCampaign() {
return mktCampaign;
}
public void setMktCampaign(String mktCampaign) {
this.mktCampaign = mktCampaign;
}
public String getMktTask() {
return mktTask;
}
public void setMktTask(String mktTask) {
this.mktTask = mktTask;
}
public Integer getIsConverted() {
return isConverted;
}
public void setIsConverted(Integer isConverted) {
this.isConverted = isConverted;
}
public Integer getStatus() {
return status;
}
public void setStatus(Integer status) {
this.status = status;
}
public Integer getPaymentStatus() {
return paymentStatus;
}
public void setPaymentStatus(Integer paymentStatus) {
this.paymentStatus = paymentStatus;
}
public String getFlag() {
return flag;
}
public void setFlag(String flag) {
this.flag = flag;
}
public Long getCustomerId() {
return customerId;
}
public void setCustomerId(Long customerId) {
this.customerId = customerId;
}
public Long getReferralCustomerId() {
return referralCustomerId;
}
public void setReferralCustomerId(Long referralCustomerId) {
this.referralCustomerId = referralCustomerId;
}
public String getShareCode() {
return shareCode;
}
public void setShareCode(String shareCode) {
this.shareCode = shareCode;
}
public Long getInsurerId() {
return insurerId;
}
public void setInsurerId(Long insurerId) {
this.insurerId = insurerId;
}
public String getDataSource() {
return dataSource;
}
public void setDataSource(String dataSource) {
this.dataSource = dataSource;
}
public Integer getIsSocialInsured() {
return isSocialInsured;
}
public void setIsSocialInsured(Integer isSocialInsured) {
this.isSocialInsured = isSocialInsured;
}
public Integer getCoverTerm() {
return coverTerm;
}
public void setCoverTerm(Integer coverTerm) {
this.coverTerm = coverTerm;
}
public Integer getPaymentTerm() {
return paymentTerm;
}
public void setPaymentTerm(Integer paymentTerm) {
this.paymentTerm = paymentTerm;
}
public String getPaymentTermUnit() {
return paymentTermUnit;
}
public void setPaymentTermUnit(String paymentTermUnit) {
this.paymentTermUnit = paymentTermUnit;
}
public Integer getPayInterval() {
return payInterval;
}
public void setPayInterval(Integer payInterval) {
this.payInterval = payInterval;
}
public String getViewFlag() {
return viewFlag;
}
public void setViewFlag(String viewFlag) {
this.viewFlag = viewFlag;
}
public String getDynamicFieldA() {
return dynamicFieldA;
}
public void setDynamicFieldA(String dynamicFieldA) {
this.dynamicFieldA = dynamicFieldA;
}
public String getDynamicFieldB() {
return dynamicFieldB;
}
public void setDynamicFieldB(String dynamicFieldB) {
this.dynamicFieldB = dynamicFieldB;
}
public String getDynamicFieldC() {
return dynamicFieldC;
}
public void setDynamicFieldC(String dynamicFieldC) {
this.dynamicFieldC = dynamicFieldC;
}
public String getDynamicFieldD() {
return dynamicFieldD;
}
public void setDynamicFieldD(String dynamicFieldD) {
this.dynamicFieldD = dynamicFieldD;
}
public String getPlateNo() {
return plateNo;
}
public void setPlateNo(String plateNo) {
this.plateNo = plateNo;
}
public String getMemo() {
return memo;
}
public void setMemo(String memo) {
this.memo = memo;
}
public String getProductTableRequestJson() {
return productTableRequestJson;
}
public void setProductTableRequestJson(String productTableRequestJson) {
this.productTableRequestJson = productTableRequestJson;
}
public Integer getVerifiedSeats() {
return verifiedSeats;
}
public void setVerifiedSeats(Integer verifiedSeats) {
this.verifiedSeats = verifiedSeats;
}
public String getFrameNo() {
return frameNo;
}
public void setFrameNo(String frameNo) {
this.frameNo = frameNo;
}
public Long getSubjectProvinceId() {
return subjectProvinceId;
}
public void setSubjectProvinceId(Long subjectProvinceId) {
this.subjectProvinceId = subjectProvinceId;
}
public Long getSubjectCityId() {
return subjectCityId;
}
public void setSubjectCityId(Long subjectCityId) {
this.subjectCityId = subjectCityId;
}
public String getSubjectAddress() {
return subjectAddress;
}
public void setSubjectAddress(String subjectAddress) {
this.subjectAddress = subjectAddress;
}
public String getRoomQty() {
return roomQty;
}
public void setRoomQty(String roomQty) {
this.roomQty = roomQty;
}
public Date getCreatedAt() {
return createdAt;
}
public void setCreatedAt(Date createdAt) {
this.createdAt = createdAt;
}
public Long getCreatedBy() {
return createdBy;
}
public void setCreatedBy(Long createdBy) {
this.createdBy = createdBy;
}
public Date getUpdatedAt() {
return updatedAt;
}
public void setUpdatedAt(Date updatedAt) {
this.updatedAt = updatedAt;
}
public Long getUpdatedBy() {
return updatedBy;
}
public void setUpdatedBy(Long updatedBy) {
this.updatedBy = updatedBy;
}
public String getSourceChannel() {
return sourceChannel;
}
public void setSourceChannel(String sourceChannel) {
this.sourceChannel = sourceChannel;
}
public String getSourcePlanName() {
return sourcePlanName;
}
public void setSourcePlanName(String sourcePlanName) {
this.sourcePlanName = sourcePlanName;
}
public String getSourcePublishdate() {
return sourcePublishdate;
}
public void setSourcePublishdate(String sourcePublishdate) {
this.sourcePublishdate = sourcePublishdate;
}
public String getSourceArticle() {
return sourceArticle;
}
public void setSourceArticle(String sourceArticle) {
this.sourceArticle = sourceArticle;
}
public String getIpAddress() {
return ipAddress;
}
public void setIpAddress(String ipAddress) {
this.ipAddress = ipAddress;
}
public String getIpRegion() {
return ipRegion;
}
public void setIpRegion(String ipRegion) {
this.ipRegion = ipRegion;
}
public Long getRenewOrderId() {
return renewOrderId;
}
public void setRenewOrderId(Long renewOrderId) {
this.renewOrderId = renewOrderId;
}
public Integer getIsRenewComplete() {
return isRenewComplete;
}
public void setIsRenewComplete(Integer isRenewComplete) {
this.isRenewComplete = isRenewComplete;
}
public Integer getIsPayToYd() {
return isPayToYd;
}
public void setIsPayToYd(Integer isPayToYd) {
this.isPayToYd = isPayToYd;
}
public String getAutoPayFlag() {
return autoPayFlag;
}
public void setAutoPayFlag(String autoPayFlag) {
this.autoPayFlag = autoPayFlag;
}
}
\ No newline at end of file
yd-api/src/main/java/com/yd/dal/mapper/order/PoOrderMapper.java
package com.yd.dal.mapper.order;
import com.yd.dal.entity.order.CustomerPolicyInfo;
import com.yd.dal.entity.order.PoOrder;
import com.yd.dal.entity.order.PolicyDetailInfoE;
import com.yd.dal.entity.order.PolicyFactorInfoE;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import com.yd.dal.entity.order.CustomerPolicyInfo;import com.yd.dal.entity.order.PoOrder;import com.yd.dal.entity.order.PolicyDetailInfoE;import com.yd.dal.entity.order.PolicyFactorInfoE;import org.apache.ibatis.annotations.Param;import java.util.List;
public interface PoOrderMapper {
int deleteByPrimaryKey(Long id);
......@@ -23,13 +17,13 @@ public interface PoOrderMapper {
List<PoOrder> findByStatusAndShareCodeInGroupByCustomerId(@Param("status") int status, @Param("customerShareCodes") List<String> customerShareCodes);
List<CustomerPolicyInfo> findPolicyInfoByCustomerId(@Param("customerId")Long customerId, @Param("time")Integer time);
List<CustomerPolicyInfo> findPolicyInfoByCustomerId(@Param("customerId") Long customerId, @Param("time") Integer time);
List<CustomerPolicyInfo> findPolicyInfoByMobileNoE(@Param("mobileNo")String mobileNo, @Param("time")Integer time);
List<CustomerPolicyInfo> findPolicyInfoByMobileNoE(@Param("mobileNo") String mobileNo, @Param("time") Integer time);
String findOrderNoByPolicyNo(@Param("policyNo")String policyNo);
String findOrderNoByPolicyNo(@Param("policyNo") String policyNo);
List<PolicyDetailInfoE> findPolicyDetailsInfoByOrderNoE(@Param("orderNo")String orderNo);
List<PolicyDetailInfoE> findPolicyDetailsInfoByOrderNoE(@Param("orderNo") String orderNo);
List<PolicyFactorInfoE> findPolicyFactorByOrderNosE(@Param("orderNoList")List<String> orderNoList);
List<PolicyFactorInfoE> findPolicyFactorByOrderNosE(@Param("orderNoList") List<String> orderNoList);
}
\ No newline at end of file
yd-api/src/main/resources/mapper/order/PoOrderMapper.xml
......@@ -2,6 +2,8 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yd.dal.mapper.order.PoOrderMapper">
<resultMap id="BaseResultMap" type="com.yd.dal.entity.order.PoOrder">
<!--@mbg.generated-->
<!--@Table ag_po_order-->
<id column="id" jdbcType="BIGINT" property="id" />
<result column="config_level" jdbcType="INTEGER" property="configLevel" />
<result column="product_id" jdbcType="BIGINT" property="productId" />
......@@ -27,10 +29,12 @@
<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" />
<result column="announcement_commission_amount" jdbcType="DECIMAL" property="announcementCommissionAmount" />
<result column="fyc_rate" jdbcType="DECIMAL" property="fycRate" />
<result column="fyc_amount" jdbcType="DECIMAL" property="fycAmount" />
<result column="b2c_rate" jdbcType="DECIMAL" property="b2cRate" />
<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" />
......@@ -58,8 +62,8 @@
<result column="dynamic_field_c" jdbcType="VARCHAR" property="dynamicFieldC" />
<result column="dynamic_field_d" jdbcType="VARCHAR" property="dynamicFieldD" />
<result column="plate_no" jdbcType="VARCHAR" property="plateNo" />
<result column="memo" jdbcType="VARCHAR" property="memo" />
<result column="product_table_request_json" jdbcType="VARCHAR" property="productTableRequestJson" />
<result column="memo" jdbcType="LONGVARCHAR" property="memo" />
<result column="product_table_request_json" jdbcType="LONGVARCHAR" property="productTableRequestJson" />
<result column="verified_seats" jdbcType="INTEGER" property="verifiedSeats" />
<result column="frame_no" jdbcType="VARCHAR" property="frameNo" />
<result column="subject_province_id" jdbcType="BIGINT" property="subjectProvinceId" />
......@@ -82,32 +86,36 @@
<result column="auto_pay_flag" jdbcType="VARCHAR" property="autoPayFlag" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
id, config_level, product_id, plan_id, order_no, order_date, order_price, quotation_id,
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, 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,
cover_term, payment_term, payment_term_unit, pay_interval, view_flag, dynamic_field_a,
dynamic_field_b, dynamic_field_c, dynamic_field_d, plate_no, memo, product_table_request_json,
verified_seats, frame_no, subject_province_id, subject_city_id, subject_address,
room_qty, created_at, created_by, updated_at, updated_by, source_channel, source_plan_name,
source_publishdate, source_article, ip_address, ip_region, renew_order_id, is_renew_complete,
is_pay_to_yd, auto_pay_flag
is_car_tax, yd_value_added_tax, commission_rate, commission_amount, fyc_rate, fyc_amount,
b2c_rate, 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, cover_term,
payment_term, payment_term_unit, pay_interval, view_flag, dynamic_field_a, dynamic_field_b,
dynamic_field_c, dynamic_field_d, plate_no, memo, product_table_request_json, verified_seats,
frame_no, subject_province_id, subject_city_id, subject_address, room_qty, created_at,
created_by, updated_at, updated_by, source_channel, source_plan_name, source_publishdate,
source_article, ip_address, ip_region, renew_order_id, is_renew_complete, is_pay_to_yd,
auto_pay_flag
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--@mbg.generated-->
select
<include refid="Base_Column_List" />
from ag_po_order
where id = #{id,jdbcType=BIGINT}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
<!--@mbg.generated-->
delete from ag_po_order
where id = #{id,jdbcType=BIGINT}
</delete>
<insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.yd.dal.entity.order.PoOrder" useGeneratedKeys="true">
<!--@mbg.generated-->
insert into ag_po_order (config_level, product_id, plan_id,
order_no, order_date, order_price,
quotation_id, quote_no, product_category_id,
......@@ -116,26 +124,25 @@
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, 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, cover_term, payment_term,
payment_term_unit, pay_interval, view_flag,
dynamic_field_a, dynamic_field_b, dynamic_field_c,
dynamic_field_d, plate_no, memo,
product_table_request_json, verified_seats,
frame_no, subject_province_id, subject_city_id,
subject_address, room_qty, created_at,
created_by, updated_at, updated_by,
source_channel, source_plan_name, source_publishdate,
source_article, ip_address, ip_region,
renew_order_id, is_renew_complete, is_pay_to_yd,
auto_pay_flag)
is_car_tax, yd_value_added_tax, commission_rate,
commission_amount, fyc_rate, fyc_amount,
b2c_rate, 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,
cover_term, payment_term, payment_term_unit,
pay_interval, view_flag, dynamic_field_a,
dynamic_field_b, dynamic_field_c, dynamic_field_d,
plate_no, memo, product_table_request_json,
verified_seats, frame_no, subject_province_id,
subject_city_id, subject_address, room_qty,
created_at, created_by, updated_at,
updated_by, source_channel, source_plan_name,
source_publishdate, source_article, ip_address,
ip_region, renew_order_id, is_renew_complete,
is_pay_to_yd, auto_pay_flag)
values (#{configLevel,jdbcType=INTEGER}, #{productId,jdbcType=BIGINT}, #{planId,jdbcType=BIGINT},
#{orderNo,jdbcType=VARCHAR}, #{orderDate,jdbcType=TIMESTAMP}, #{orderPrice,jdbcType=DECIMAL},
#{quotationId,jdbcType=BIGINT}, #{quoteNo,jdbcType=BIGINT}, #{productCategoryId,jdbcType=BIGINT},
......@@ -144,28 +151,28 @@
#{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},#{commissionRate,jdbcType=DECIMAL},
#{commissionAmount,jdbcType=DECIMAL}, #{announcementCommissionRate,jdbcType=DECIMAL},
#{announcementCommissionAmount,jdbcType=DECIMAL}, #{gradeCommissionRate,jdbcType=DECIMAL},
#{referralRate,jdbcType=DECIMAL}, #{referralAmount,jdbcType=DECIMAL}, #{policyId,jdbcType=BIGINT},
#{policyNo,jdbcType=VARCHAR}, #{mktCampaign,jdbcType=VARCHAR}, #{mktTask,jdbcType=VARCHAR},
#{isConverted,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, #{paymentStatus,jdbcType=INTEGER},
#{flag,jdbcType=VARCHAR}, #{customerId,jdbcType=BIGINT}, #{referralCustomerId,jdbcType=BIGINT},
#{shareCode,jdbcType=VARCHAR}, #{insurerId,jdbcType=BIGINT}, #{dataSource,jdbcType=VARCHAR},
#{isSocialInsured,jdbcType=INTEGER}, #{coverTerm,jdbcType=INTEGER}, #{paymentTerm,jdbcType=INTEGER},
#{paymentTermUnit,jdbcType=VARCHAR}, #{payInterval,jdbcType=INTEGER}, #{viewFlag,jdbcType=VARCHAR},
#{dynamicFieldA,jdbcType=VARCHAR}, #{dynamicFieldB,jdbcType=VARCHAR}, #{dynamicFieldC,jdbcType=VARCHAR},
#{dynamicFieldD,jdbcType=VARCHAR}, #{plateNo,jdbcType=VARCHAR}, #{memo,jdbcType=VARCHAR},
#{productTableRequestJson,jdbcType=VARCHAR}, #{verifiedSeats,jdbcType=INTEGER},
#{frameNo,jdbcType=VARCHAR}, #{subjectProvinceId,jdbcType=BIGINT}, #{subjectCityId,jdbcType=BIGINT},
#{subjectAddress,jdbcType=VARCHAR}, #{roomQty,jdbcType=VARCHAR}, #{createdAt,jdbcType=TIMESTAMP},
#{createdBy,jdbcType=BIGINT}, #{updatedAt,jdbcType=TIMESTAMP}, #{updatedBy,jdbcType=BIGINT},
#{sourceChannel,jdbcType=VARCHAR}, #{sourcePlanName,jdbcType=VARCHAR}, #{sourcePublishdate,jdbcType=VARCHAR},
#{sourceArticle,jdbcType=VARCHAR}, #{ipAddress,jdbcType=VARCHAR}, #{ipRegion,jdbcType=VARCHAR},
#{renewOrderId,jdbcType=BIGINT}, #{isRenewComplete,jdbcType=INTEGER}, #{isPayToYd,jdbcType=INTEGER},
#{autoPayFlag,jdbcType=VARCHAR})
#{isCarTax,jdbcType=INTEGER}, #{ydValueAddedTax,jdbcType=DECIMAL}, #{commissionRate,jdbcType=DECIMAL},
#{commissionAmount,jdbcType=DECIMAL}, #{fycRate,jdbcType=DECIMAL}, #{fycAmount,jdbcType=DECIMAL},
#{b2cRate,jdbcType=DECIMAL}, #{gradeCommissionRate,jdbcType=DECIMAL}, #{referralRate,jdbcType=DECIMAL},
#{referralAmount,jdbcType=DECIMAL}, #{policyId,jdbcType=BIGINT}, #{policyNo,jdbcType=VARCHAR},
#{mktCampaign,jdbcType=VARCHAR}, #{mktTask,jdbcType=VARCHAR}, #{isConverted,jdbcType=INTEGER},
#{status,jdbcType=INTEGER}, #{paymentStatus,jdbcType=INTEGER}, #{flag,jdbcType=VARCHAR},
#{customerId,jdbcType=BIGINT}, #{referralCustomerId,jdbcType=BIGINT}, #{shareCode,jdbcType=VARCHAR},
#{insurerId,jdbcType=BIGINT}, #{dataSource,jdbcType=VARCHAR}, #{isSocialInsured,jdbcType=INTEGER},
#{coverTerm,jdbcType=INTEGER}, #{paymentTerm,jdbcType=INTEGER}, #{paymentTermUnit,jdbcType=VARCHAR},
#{payInterval,jdbcType=INTEGER}, #{viewFlag,jdbcType=VARCHAR}, #{dynamicFieldA,jdbcType=VARCHAR},
#{dynamicFieldB,jdbcType=VARCHAR}, #{dynamicFieldC,jdbcType=VARCHAR}, #{dynamicFieldD,jdbcType=VARCHAR},
#{plateNo,jdbcType=VARCHAR}, #{memo,jdbcType=LONGVARCHAR}, #{productTableRequestJson,jdbcType=LONGVARCHAR},
#{verifiedSeats,jdbcType=INTEGER}, #{frameNo,jdbcType=VARCHAR}, #{subjectProvinceId,jdbcType=BIGINT},
#{subjectCityId,jdbcType=BIGINT}, #{subjectAddress,jdbcType=VARCHAR}, #{roomQty,jdbcType=VARCHAR},
#{createdAt,jdbcType=TIMESTAMP}, #{createdBy,jdbcType=BIGINT}, #{updatedAt,jdbcType=TIMESTAMP},
#{updatedBy,jdbcType=BIGINT}, #{sourceChannel,jdbcType=VARCHAR}, #{sourcePlanName,jdbcType=VARCHAR},
#{sourcePublishdate,jdbcType=VARCHAR}, #{sourceArticle,jdbcType=VARCHAR}, #{ipAddress,jdbcType=VARCHAR},
#{ipRegion,jdbcType=VARCHAR}, #{renewOrderId,jdbcType=BIGINT}, #{isRenewComplete,jdbcType=INTEGER},
#{isPayToYd,jdbcType=INTEGER}, #{autoPayFlag,jdbcType=VARCHAR})
</insert>
<insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.yd.dal.entity.order.PoOrder" useGeneratedKeys="true">
<!--@mbg.generated-->
insert into ag_po_order
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="configLevel != null">
......@@ -240,17 +247,23 @@
<if test="isCarTax != null">
is_car_tax,
</if>
<if test="ydValueAddedTax != null">
yd_value_added_tax,
</if>
<if test="commissionRate != null">
commission_rate,
</if>
<if test="commissionAmount != null">
commission_amount,
</if>
<if test="announcementCommissionRate != null">
announcement_commission_rate,
<if test="fycRate != null">
fyc_rate,
</if>
<if test="fycAmount != null">
fyc_amount,
</if>
<if test="announcementCommissionAmount != null">
announcement_commission_amount,
<if test="b2cRate != null">
b2c_rate,
</if>
<if test="gradeCommissionRate != null">
grade_commission_rate,
......@@ -473,17 +486,23 @@
<if test="isCarTax != null">
#{isCarTax,jdbcType=INTEGER},
</if>
<if test="ydValueAddedTax != null">
#{ydValueAddedTax,jdbcType=DECIMAL},
</if>
<if test="commissionRate != null">
#{commissionRate,jdbcType=DECIMAL},
</if>
<if test="commissionAmount != null">
#{commissionAmount,jdbcType=DECIMAL},
</if>
<if test="announcementCommissionRate != null">
#{announcementCommissionRate,jdbcType=DECIMAL},
<if test="fycRate != null">
#{fycRate,jdbcType=DECIMAL},
</if>
<if test="announcementCommissionAmount != null">
#{announcementCommissionAmount,jdbcType=DECIMAL},
<if test="fycAmount != null">
#{fycAmount,jdbcType=DECIMAL},
</if>
<if test="b2cRate != null">
#{b2cRate,jdbcType=DECIMAL},
</if>
<if test="gradeCommissionRate != null">
#{gradeCommissionRate,jdbcType=DECIMAL},
......@@ -567,10 +586,10 @@
#{plateNo,jdbcType=VARCHAR},
</if>
<if test="memo != null">
#{memo,jdbcType=VARCHAR},
#{memo,jdbcType=LONGVARCHAR},
</if>
<if test="productTableRequestJson != null">
#{productTableRequestJson,jdbcType=VARCHAR},
#{productTableRequestJson,jdbcType=LONGVARCHAR},
</if>
<if test="verifiedSeats != null">
#{verifiedSeats,jdbcType=INTEGER},
......@@ -635,6 +654,7 @@
</trim>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="com.yd.dal.entity.order.PoOrder">
<!--@mbg.generated-->
update ag_po_order
<set>
<if test="configLevel != null">
......@@ -709,17 +729,23 @@
<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>
<if test="commissionAmount != null">
commission_amount = #{commissionAmount,jdbcType=DECIMAL},
</if>
<if test="announcementCommissionRate != null">
announcement_commission_rate = #{announcementCommissionRate,jdbcType=DECIMAL},
<if test="fycRate != null">
fyc_rate = #{fycRate,jdbcType=DECIMAL},
</if>
<if test="fycAmount != null">
fyc_amount = #{fycAmount,jdbcType=DECIMAL},
</if>
<if test="announcementCommissionAmount != null">
announcement_commission_amount = #{announcementCommissionAmount,jdbcType=DECIMAL},
<if test="b2cRate != null">
b2c_rate = #{b2cRate,jdbcType=DECIMAL},
</if>
<if test="gradeCommissionRate != null">
grade_commission_rate = #{gradeCommissionRate,jdbcType=DECIMAL},
......@@ -803,10 +829,10 @@
plate_no = #{plateNo,jdbcType=VARCHAR},
</if>
<if test="memo != null">
memo = #{memo,jdbcType=VARCHAR},
memo = #{memo,jdbcType=LONGVARCHAR},
</if>
<if test="productTableRequestJson != null">
product_table_request_json = #{productTableRequestJson,jdbcType=VARCHAR},
product_table_request_json = #{productTableRequestJson,jdbcType=LONGVARCHAR},
</if>
<if test="verifiedSeats != null">
verified_seats = #{verifiedSeats,jdbcType=INTEGER},
......@@ -872,6 +898,7 @@
where id = #{id,jdbcType=BIGINT}
</update>
<update id="updateByPrimaryKey" parameterType="com.yd.dal.entity.order.PoOrder">
<!--@mbg.generated-->
update ag_po_order
set config_level = #{configLevel,jdbcType=INTEGER},
product_id = #{productId,jdbcType=BIGINT},
......@@ -897,10 +924,12 @@
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},
announcement_commission_amount = #{announcementCommissionAmount,jdbcType=DECIMAL},
fyc_rate = #{fycRate,jdbcType=DECIMAL},
fyc_amount = #{fycAmount,jdbcType=DECIMAL},
b2c_rate = #{b2cRate,jdbcType=DECIMAL},
grade_commission_rate = #{gradeCommissionRate,jdbcType=DECIMAL},
referral_rate = #{referralRate,jdbcType=DECIMAL},
referral_amount = #{referralAmount,jdbcType=DECIMAL},
......@@ -928,8 +957,8 @@
dynamic_field_c = #{dynamicFieldC,jdbcType=VARCHAR},
dynamic_field_d = #{dynamicFieldD,jdbcType=VARCHAR},
plate_no = #{plateNo,jdbcType=VARCHAR},
memo = #{memo,jdbcType=VARCHAR},
product_table_request_json = #{productTableRequestJson,jdbcType=VARCHAR},
memo = #{memo,jdbcType=LONGVARCHAR},
product_table_request_json = #{productTableRequestJson,jdbcType=LONGVARCHAR},
verified_seats = #{verifiedSeats,jdbcType=INTEGER},
frame_no = #{frameNo,jdbcType=VARCHAR},
subject_province_id = #{subjectProvinceId,jdbcType=BIGINT},
......@@ -952,6 +981,7 @@
auto_pay_flag = #{autoPayFlag,jdbcType=VARCHAR}
where id = #{id,jdbcType=BIGINT}
</update>
<select id="findByStatusAndShareCodeInGroupByCustomerId" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
......@@ -960,7 +990,7 @@
status = #{status}
<if test="customerShareCodes != null">
and share_code in
<foreach item="item" collection="customerShareCodes" separator="," open="(" close=")" index="index">
<foreach close=")" collection="customerShareCodes" index="index" item="item" open="(" separator=",">
#{item}
</foreach>
</if>
......@@ -979,7 +1009,7 @@
f.order_price as orderPrice,
o.plan_id as planId,
o.product_id as productId
FROM ag_acl_customer_fortune f INNER JOIN ag_po_order o ON f.order_id = o.id and o.status = 3 and o.order_price > 0 and o.insurer_id != 888
FROM ag_acl_customer_fortune f INNER JOIN ag_po_order o ON f.order_id = o.id and o.status = 3 and o.order_price &gt; 0 and o.insurer_id != 888
inner JOIN ag_acl_policyholder p ON o.id = p.order_id and p.type = 2
WHERE f.customer_id = #{customerId,jdbcType=BIGINT}
<choose>
......@@ -1082,7 +1112,7 @@
policy2.INS_IND_AMOUNT_UNIT as amountUnit, -- 保费单位
policy2.INS_IND_PERIOD as period -- 缴费年限
from ins002 policy2 where policy2.FK_INS_MST_ID in
<foreach collection="orderNoList" index="index" item="item" open="(" separator="," close=")">
<foreach close=")" collection="orderNoList" index="index" item="item" open="(" separator=",">
#{item}
</foreach>
</select>
......
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