Commit 78e52aca by huluobin

# update

parent 804f3419
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<module>base-sync-shopify</module> <module>base-sync-shopify</module>
<!--deprecate--> <!--deprecate-->
<module>base-sync-purchase-details</module> <!-- <module>base-sync-purchase-details</module>-->
<!-- <module>base-sync-finance-fee</module>--> <!-- <module>base-sync-finance-fee</module>-->
<!-- <module>base-sync-amazon-ad</module>--> <!-- <module>base-sync-amazon-ad</module>-->
<!-- <module>base-sync-cashier</module>--> <!-- <module>base-sync-cashier</module>-->
......
...@@ -466,6 +466,15 @@ public class DcBasePurchaseDetails { ...@@ -466,6 +466,15 @@ public class DcBasePurchaseDetails {
private Integer can7dayRefund; private Integer can7dayRefund;
/** /**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_purchase_details.warehouse_code
*
* @mbg.generated
*/
private String warehouseCode;
/**
* 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
* *
...@@ -528,6 +537,7 @@ public class DcBasePurchaseDetails { ...@@ -528,6 +537,7 @@ public class DcBasePurchaseDetails {
sb.append(", amountExpress=").append(amountExpress); sb.append(", amountExpress=").append(amountExpress);
sb.append(", createusername=").append(createusername); sb.append(", createusername=").append(createusername);
sb.append(", can7dayRefund=").append(can7dayRefund); sb.append(", can7dayRefund=").append(can7dayRefund);
sb.append(", warehouseCode=").append(warehouseCode);
sb.append("]"); sb.append("]");
return sb.toString(); return sb.toString();
} }
...@@ -600,7 +610,8 @@ public class DcBasePurchaseDetails { ...@@ -600,7 +610,8 @@ public class DcBasePurchaseDetails {
&& (this.getAmountPayed() == null ? other.getAmountPayed() == null : this.getAmountPayed().equals(other.getAmountPayed())) && (this.getAmountPayed() == null ? other.getAmountPayed() == null : this.getAmountPayed().equals(other.getAmountPayed()))
&& (this.getAmountExpress() == null ? other.getAmountExpress() == null : this.getAmountExpress().equals(other.getAmountExpress())) && (this.getAmountExpress() == null ? other.getAmountExpress() == null : this.getAmountExpress().equals(other.getAmountExpress()))
&& (this.getCreateusername() == null ? other.getCreateusername() == null : this.getCreateusername().equals(other.getCreateusername())) && (this.getCreateusername() == null ? other.getCreateusername() == null : this.getCreateusername().equals(other.getCreateusername()))
&& (this.getCan7dayRefund() == null ? other.getCan7dayRefund() == null : this.getCan7dayRefund().equals(other.getCan7dayRefund())); && (this.getCan7dayRefund() == null ? other.getCan7dayRefund() == null : this.getCan7dayRefund().equals(other.getCan7dayRefund()))
&& (this.getWarehouseCode() == null ? other.getWarehouseCode() == null : this.getWarehouseCode().equals(other.getWarehouseCode()));
} }
/** /**
...@@ -664,6 +675,7 @@ public class DcBasePurchaseDetails { ...@@ -664,6 +675,7 @@ public class DcBasePurchaseDetails {
result = prime * result + ((getAmountExpress() == null) ? 0 : getAmountExpress().hashCode()); result = prime * result + ((getAmountExpress() == null) ? 0 : getAmountExpress().hashCode());
result = prime * result + ((getCreateusername() == null) ? 0 : getCreateusername().hashCode()); result = prime * result + ((getCreateusername() == null) ? 0 : getCreateusername().hashCode());
result = prime * result + ((getCan7dayRefund() == null) ? 0 : getCan7dayRefund().hashCode()); result = prime * result + ((getCan7dayRefund() == null) ? 0 : getCan7dayRefund().hashCode());
result = prime * result + ((getWarehouseCode() == null) ? 0 : getWarehouseCode().hashCode());
return result; return result;
} }
} }
\ No newline at end of file
...@@ -3580,6 +3580,76 @@ public class DcBasePurchaseDetailsExample { ...@@ -3580,6 +3580,76 @@ public class DcBasePurchaseDetailsExample {
addCriterion("can_7day_refund not between", value1, value2, "can7dayRefund"); addCriterion("can_7day_refund not between", value1, value2, "can7dayRefund");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andWarehouseCodeIsNull() {
addCriterion("warehouse_code is null");
return (Criteria) this;
}
public Criteria andWarehouseCodeIsNotNull() {
addCriterion("warehouse_code is not null");
return (Criteria) this;
}
public Criteria andWarehouseCodeEqualTo(String value) {
addCriterion("warehouse_code =", value, "warehouseCode");
return (Criteria) this;
}
public Criteria andWarehouseCodeNotEqualTo(String value) {
addCriterion("warehouse_code <>", value, "warehouseCode");
return (Criteria) this;
}
public Criteria andWarehouseCodeGreaterThan(String value) {
addCriterion("warehouse_code >", value, "warehouseCode");
return (Criteria) this;
}
public Criteria andWarehouseCodeGreaterThanOrEqualTo(String value) {
addCriterion("warehouse_code >=", value, "warehouseCode");
return (Criteria) this;
}
public Criteria andWarehouseCodeLessThan(String value) {
addCriterion("warehouse_code <", value, "warehouseCode");
return (Criteria) this;
}
public Criteria andWarehouseCodeLessThanOrEqualTo(String value) {
addCriterion("warehouse_code <=", value, "warehouseCode");
return (Criteria) this;
}
public Criteria andWarehouseCodeLike(String value) {
addCriterion("warehouse_code like", value, "warehouseCode");
return (Criteria) this;
}
public Criteria andWarehouseCodeNotLike(String value) {
addCriterion("warehouse_code not like", value, "warehouseCode");
return (Criteria) this;
}
public Criteria andWarehouseCodeIn(List<String> values) {
addCriterion("warehouse_code in", values, "warehouseCode");
return (Criteria) this;
}
public Criteria andWarehouseCodeNotIn(List<String> values) {
addCriterion("warehouse_code not in", values, "warehouseCode");
return (Criteria) this;
}
public Criteria andWarehouseCodeBetween(String value1, String value2) {
addCriterion("warehouse_code between", value1, value2, "warehouseCode");
return (Criteria) this;
}
public Criteria andWarehouseCodeNotBetween(String value1, String value2) {
addCriterion("warehouse_code not between", value1, value2, "warehouseCode");
return (Criteria) this;
}
} }
/** /**
......
...@@ -2,9 +2,8 @@ package com.bailuntec.mapper; ...@@ -2,9 +2,8 @@ package com.bailuntec.mapper;
import com.bailuntec.domain.entity.DcBasePurchaseDetails; import com.bailuntec.domain.entity.DcBasePurchaseDetails;
import com.bailuntec.domain.example.DcBasePurchaseDetailsExample; import com.bailuntec.domain.example.DcBasePurchaseDetailsExample;
import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
import org.apache.ibatis.annotations.Param;
public interface DcBasePurchaseDetailsMapper { public interface DcBasePurchaseDetailsMapper {
/** /**
...@@ -127,4 +126,5 @@ public interface DcBasePurchaseDetailsMapper { ...@@ -127,4 +126,5 @@ public interface DcBasePurchaseDetailsMapper {
List<String> selectPageByGroup(@Param("pageIndex") int pageIndex, @Param("pageSize") int pageSize); List<String> selectPageByGroup(@Param("pageIndex") int pageIndex, @Param("pageSize") int pageSize);
int updateByBuyNo(@Param("isaims") int isaims, @Param("purchaseId") String purchaseId); int updateByBuyNo(@Param("isaims") int isaims, @Param("purchaseId") String purchaseId);
} }
...@@ -57,6 +57,7 @@ ...@@ -57,6 +57,7 @@
<result column="amount_express" jdbcType="DECIMAL" property="amountExpress" /> <result column="amount_express" jdbcType="DECIMAL" property="amountExpress" />
<result column="createusername" jdbcType="VARCHAR" property="createusername" /> <result column="createusername" jdbcType="VARCHAR" property="createusername" />
<result column="can_7day_refund" jdbcType="INTEGER" property="can7dayRefund" /> <result column="can_7day_refund" jdbcType="INTEGER" property="can7dayRefund" />
<result column="warehouse_code" jdbcType="VARCHAR" property="warehouseCode" />
</resultMap> </resultMap>
<sql id="Example_Where_Clause"> <sql id="Example_Where_Clause">
<!-- <!--
...@@ -138,7 +139,7 @@ ...@@ -138,7 +139,7 @@
gmt_create, gmt_modified, quantity_not_inbound, alibaba_order_id, logistics_order_id, gmt_create, gmt_modified, quantity_not_inbound, alibaba_order_id, logistics_order_id,
logistics_company_name, company_id, ispush, isallot, isaims, pay_type, pay_status, logistics_company_name, company_id, ispush, isallot, isaims, pay_type, pay_status,
last_signtime, arrival_status, amount_buy, amount_payed, amount_express, createusername, last_signtime, arrival_status, amount_buy, amount_payed, amount_express, createusername,
can_7day_refund can_7day_refund, warehouse_code
</sql> </sql>
<select id="selectByExample" parameterType="com.bailuntec.domain.example.DcBasePurchaseDetailsExample" resultMap="BaseResultMap"> <select id="selectByExample" parameterType="com.bailuntec.domain.example.DcBasePurchaseDetailsExample" resultMap="BaseResultMap">
<!-- <!--
...@@ -217,7 +218,7 @@ ...@@ -217,7 +218,7 @@
isaims, pay_type, pay_status, isaims, pay_type, pay_status,
last_signtime, arrival_status, amount_buy, last_signtime, arrival_status, amount_buy,
amount_payed, amount_express, createusername, amount_payed, amount_express, createusername,
can_7day_refund) can_7day_refund, warehouse_code)
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},
...@@ -236,7 +237,7 @@ ...@@ -236,7 +237,7 @@
#{isaims,jdbcType=INTEGER}, #{payType,jdbcType=INTEGER}, #{payStatus,jdbcType=INTEGER}, #{isaims,jdbcType=INTEGER}, #{payType,jdbcType=INTEGER}, #{payStatus,jdbcType=INTEGER},
#{lastSigntime,jdbcType=TIMESTAMP}, #{arrivalStatus,jdbcType=INTEGER}, #{amountBuy,jdbcType=DECIMAL}, #{lastSigntime,jdbcType=TIMESTAMP}, #{arrivalStatus,jdbcType=INTEGER}, #{amountBuy,jdbcType=DECIMAL},
#{amountPayed,jdbcType=DECIMAL}, #{amountExpress,jdbcType=DECIMAL}, #{createusername,jdbcType=VARCHAR}, #{amountPayed,jdbcType=DECIMAL}, #{amountExpress,jdbcType=DECIMAL}, #{createusername,jdbcType=VARCHAR},
#{can7dayRefund,jdbcType=INTEGER}) #{can7dayRefund,jdbcType=INTEGER}, #{warehouseCode,jdbcType=VARCHAR})
</insert> </insert>
<insert id="insertSelective" parameterType="com.bailuntec.domain.entity.DcBasePurchaseDetails"> <insert id="insertSelective" parameterType="com.bailuntec.domain.entity.DcBasePurchaseDetails">
<!-- <!--
...@@ -398,6 +399,9 @@ ...@@ -398,6 +399,9 @@
<if test="can7dayRefund != null"> <if test="can7dayRefund != null">
can_7day_refund, can_7day_refund,
</if> </if>
<if test="warehouseCode != null">
warehouse_code,
</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null"> <if test="id != null">
...@@ -553,6 +557,9 @@ ...@@ -553,6 +557,9 @@
<if test="can7dayRefund != null"> <if test="can7dayRefund != null">
#{can7dayRefund,jdbcType=INTEGER}, #{can7dayRefund,jdbcType=INTEGER},
</if> </if>
<if test="warehouseCode != null">
#{warehouseCode,jdbcType=VARCHAR},
</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">
...@@ -725,6 +732,9 @@ ...@@ -725,6 +732,9 @@
<if test="record.can7dayRefund != null"> <if test="record.can7dayRefund != null">
can_7day_refund = #{record.can7dayRefund,jdbcType=INTEGER}, can_7day_refund = #{record.can7dayRefund,jdbcType=INTEGER},
</if> </if>
<if test="record.warehouseCode != null">
warehouse_code = #{record.warehouseCode,jdbcType=VARCHAR},
</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" />
...@@ -786,7 +796,8 @@ ...@@ -786,7 +796,8 @@
amount_payed = #{record.amountPayed,jdbcType=DECIMAL}, amount_payed = #{record.amountPayed,jdbcType=DECIMAL},
amount_express = #{record.amountExpress,jdbcType=DECIMAL}, amount_express = #{record.amountExpress,jdbcType=DECIMAL},
createusername = #{record.createusername,jdbcType=VARCHAR}, createusername = #{record.createusername,jdbcType=VARCHAR},
can_7day_refund = #{record.can7dayRefund,jdbcType=INTEGER} can_7day_refund = #{record.can7dayRefund,jdbcType=INTEGER},
warehouse_code = #{record.warehouseCode,jdbcType=VARCHAR}
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
</if> </if>
...@@ -948,6 +959,9 @@ ...@@ -948,6 +959,9 @@
<if test="can7dayRefund != null"> <if test="can7dayRefund != null">
can_7day_refund = #{can7dayRefund,jdbcType=INTEGER}, can_7day_refund = #{can7dayRefund,jdbcType=INTEGER},
</if> </if>
<if test="warehouseCode != null">
warehouse_code = #{warehouseCode,jdbcType=VARCHAR},
</if>
</set> </set>
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</update> </update>
...@@ -1006,7 +1020,8 @@ ...@@ -1006,7 +1020,8 @@
amount_payed = #{amountPayed,jdbcType=DECIMAL}, amount_payed = #{amountPayed,jdbcType=DECIMAL},
amount_express = #{amountExpress,jdbcType=DECIMAL}, amount_express = #{amountExpress,jdbcType=DECIMAL},
createusername = #{createusername,jdbcType=VARCHAR}, createusername = #{createusername,jdbcType=VARCHAR},
can_7day_refund = #{can7dayRefund,jdbcType=INTEGER} can_7day_refund = #{can7dayRefund,jdbcType=INTEGER},
warehouse_code = #{warehouseCode,jdbcType=VARCHAR}
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</update> </update>
<insert id="upsertSelective" parameterType="com.bailuntec.domain.entity.DcBasePurchaseDetails"> <insert id="upsertSelective" parameterType="com.bailuntec.domain.entity.DcBasePurchaseDetails">
...@@ -1170,6 +1185,9 @@ ...@@ -1170,6 +1185,9 @@
<if test="can7dayRefund != null"> <if test="can7dayRefund != null">
can_7day_refund, can_7day_refund,
</if> </if>
<if test="warehouseCode != null">
warehouse_code,
</if>
</trim> </trim>
values values
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
...@@ -1326,6 +1344,9 @@ ...@@ -1326,6 +1344,9 @@
<if test="can7dayRefund != null"> <if test="can7dayRefund != null">
#{can7dayRefund,jdbcType=INTEGER}, #{can7dayRefund,jdbcType=INTEGER},
</if> </if>
<if test="warehouseCode != null">
#{warehouseCode,jdbcType=VARCHAR},
</if>
</trim> </trim>
on duplicate key update on duplicate key update
<trim suffixOverrides=","> <trim suffixOverrides=",">
...@@ -1482,6 +1503,9 @@ ...@@ -1482,6 +1503,9 @@
<if test="can7dayRefund != null"> <if test="can7dayRefund != null">
can_7day_refund = #{can7dayRefund,jdbcType=INTEGER}, can_7day_refund = #{can7dayRefund,jdbcType=INTEGER},
</if> </if>
<if test="warehouseCode != null">
warehouse_code = #{warehouseCode,jdbcType=VARCHAR},
</if>
</trim> </trim>
</insert> </insert>
<insert id="upsert" parameterType="com.bailuntec.domain.entity.DcBasePurchaseDetails"> <insert id="upsert" parameterType="com.bailuntec.domain.entity.DcBasePurchaseDetails">
...@@ -1500,7 +1524,7 @@ ...@@ -1500,7 +1524,7 @@
update_time, gmt_create, gmt_modified, quantity_not_inbound, alibaba_order_id, update_time, gmt_create, gmt_modified, quantity_not_inbound, alibaba_order_id,
logistics_order_id, logistics_company_name, company_id, ispush, isallot, isaims, logistics_order_id, logistics_company_name, company_id, ispush, isallot, isaims,
pay_type, pay_status, last_signtime, arrival_status, amount_buy, amount_payed, pay_type, pay_status, last_signtime, arrival_status, amount_buy, amount_payed,
amount_express, createusername, can_7day_refund) amount_express, createusername, can_7day_refund, warehouse_code)
values values
(#{id,jdbcType=INTEGER}, #{purchaseId,jdbcType=VARCHAR}, #{status,jdbcType=TINYINT}, (#{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},
...@@ -1520,7 +1544,7 @@ ...@@ -1520,7 +1544,7 @@
#{isaims,jdbcType=INTEGER}, #{payType,jdbcType=INTEGER}, #{payStatus,jdbcType=INTEGER}, #{isaims,jdbcType=INTEGER}, #{payType,jdbcType=INTEGER}, #{payStatus,jdbcType=INTEGER},
#{lastSigntime,jdbcType=TIMESTAMP}, #{arrivalStatus,jdbcType=INTEGER}, #{amountBuy,jdbcType=DECIMAL}, #{lastSigntime,jdbcType=TIMESTAMP}, #{arrivalStatus,jdbcType=INTEGER}, #{amountBuy,jdbcType=DECIMAL},
#{amountPayed,jdbcType=DECIMAL}, #{amountExpress,jdbcType=DECIMAL}, #{createusername,jdbcType=VARCHAR}, #{amountPayed,jdbcType=DECIMAL}, #{amountExpress,jdbcType=DECIMAL}, #{createusername,jdbcType=VARCHAR},
#{can7dayRefund,jdbcType=INTEGER}) #{can7dayRefund,jdbcType=INTEGER}, #{warehouseCode,jdbcType=VARCHAR})
on duplicate key update on duplicate key update
id = #{id,jdbcType=INTEGER}, id = #{id,jdbcType=INTEGER},
purchase_id = #{purchaseId,jdbcType=VARCHAR}, purchase_id = #{purchaseId,jdbcType=VARCHAR},
...@@ -1572,7 +1596,8 @@ ...@@ -1572,7 +1596,8 @@
amount_payed = #{amountPayed,jdbcType=DECIMAL}, amount_payed = #{amountPayed,jdbcType=DECIMAL},
amount_express = #{amountExpress,jdbcType=DECIMAL}, amount_express = #{amountExpress,jdbcType=DECIMAL},
createusername = #{createusername,jdbcType=VARCHAR}, createusername = #{createusername,jdbcType=VARCHAR},
can_7day_refund = #{can7dayRefund,jdbcType=INTEGER} can_7day_refund = #{can7dayRefund,jdbcType=INTEGER},
warehouse_code = #{warehouseCode,jdbcType=VARCHAR}
</insert> </insert>
<select id="selectOneByExample" parameterType="com.bailuntec.domain.example.DcBasePurchaseDetailsExample" resultMap="BaseResultMap"> <select id="selectOneByExample" parameterType="com.bailuntec.domain.example.DcBasePurchaseDetailsExample" resultMap="BaseResultMap">
<!-- <!--
......
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