Skip to content

D
dc-java
Commit c341ffe4 by wutong
Options

修复订单尾程费计算异常的问题

parent 0f0b4c7f
Showing with 847 additions and 115 deletions
data-base/base-sync-oms-order/src/main/java/com/bailuntec/job/OrderSyncJob.java
...@@ -313,7 +313,7 @@ public class OrderSyncJob extends PointJob { ...@@ -313,7 +313,7 @@ public class OrderSyncJob extends PointJob {
BigDecimal skuCostFbaFeeRMB = dcBaseOmsSku.getCostFbaFee().multiply(dcBaseOmsOrder.getSellerOrderExchangeRate()).setScale(3, RoundingMode.HALF_EVEN); BigDecimal skuCostFbaFeeRMB = dcBaseOmsSku.getCostFbaFee().multiply(dcBaseOmsOrder.getSellerOrderExchangeRate()).setScale(3, RoundingMode.HALF_EVEN);
//百伦处理费 //百伦处理费
BigDecimal skuCostHandleBailun = bailunSkuStructure.getSkuWeightRatio().multiply(dcBaseOmsOrder.getCostHandleBailun()).setScale(3, RoundingMode.HALF_EVEN); BigDecimal skuCostHandleBailun = bailunSkuStructure.getSkuWeightRatio().multiply(dcBaseOmsOrder.getCostHandleBailun()).setScale(3, RoundingMode.HALF_EVEN);
//百伦LMS物流费-在CostTail(尾程费-真实费用)拿不到之前就用它 //百伦LMS物流费-在CostTail(尾程费-真实费用)拿不到之前就用它, 这是SKU总重量占比的费用
BigDecimal skuCostLogistics = bailunSkuStructure.getSkuWeightRatio().multiply(totalCostLogistics).setScale(3, RoundingMode.HALF_EVEN); BigDecimal skuCostLogistics = bailunSkuStructure.getSkuWeightRatio().multiply(totalCostLogistics).setScale(3, RoundingMode.HALF_EVEN);
/* /*
* 将按比例摊分的费用算到单个SKU * 将按比例摊分的费用算到单个SKU
...@@ -323,7 +323,7 @@ public class OrderSyncJob extends PointJob { ...@@ -323,7 +323,7 @@ public class OrderSyncJob extends PointJob {
BigDecimal bailunSkuQuantityShippedDecimal = BigDecimal.valueOf(dcBaseOmsSku.getBailunSkuQuantityShipped()); BigDecimal bailunSkuQuantityShippedDecimal = BigDecimal.valueOf(dcBaseOmsSku.getBailunSkuQuantityShipped());
BigDecimal rmbCost = BigDecimal.ZERO; BigDecimal rmbCost = BigDecimal.ZERO;
if (quantityOrderdDecimal.compareTo(BigDecimal.ZERO) == 1) { if (quantityOrderdDecimal.compareTo(BigDecimal.ZERO) == 1) {
dcBaseOmsSku.setCostLogistics(skuCostLogistics.multiply(bailunSkuQuantityShippedDecimal).divide(quantityOrderdDecimal, 3, RoundingMode.HALF_EVEN)); dcBaseOmsSku.setCostLogistics(bailunSkuQuantityShippedDecimal.compareTo(BigDecimal.ZERO) == 1? skuCostLogistics.divide(bailunSkuQuantityShippedDecimal, 3, RoundingMode.HALF_EVEN) : BigDecimal.ZERO);
dcBaseOmsSku.setAmountTotal(skuAmountTotal.divide(quantityOrderdDecimal, 3, RoundingMode.HALF_EVEN)); dcBaseOmsSku.setAmountTotal(skuAmountTotal.divide(quantityOrderdDecimal, 3, RoundingMode.HALF_EVEN));
dcBaseOmsSku.setAmountProduct(skuAmountProduct.divide(quantityOrderdDecimal, 3, RoundingMode.HALF_EVEN)); dcBaseOmsSku.setAmountProduct(skuAmountProduct.divide(quantityOrderdDecimal, 3, RoundingMode.HALF_EVEN));
dcBaseOmsSku.setAmountAdjustment(skuAmountAdjustment.divide(quantityOrderdDecimal, 3, RoundingMode.HALF_EVEN)); dcBaseOmsSku.setAmountAdjustment(skuAmountAdjustment.divide(quantityOrderdDecimal, 3, RoundingMode.HALF_EVEN));
......
data-base/base-sync-oms-order/src/main/java/com/bailuntec/mapper/DcBaseSkuMapper.java
...@@ -121,5 +121,4 @@ public interface DcBaseSkuMapper { ...@@ -121,5 +121,4 @@ public interface DcBaseSkuMapper {
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
*/ */
int upsertSelective(DcBaseSku record); int upsertSelective(DcBaseSku record);
} }
\ No newline at end of file
data-base/base-sync-oms-order/src/main/java/com/bailuntec/mapper/DcBaseSkuMapper.xml
...@@ -11,8 +11,6 @@ ...@@ -11,8 +11,6 @@
<result column="sku_image" jdbcType="VARCHAR" property="skuImage" /> <result column="sku_image" jdbcType="VARCHAR" property="skuImage" />
<result column="category_id" jdbcType="INTEGER" property="categoryId" /> <result column="category_id" jdbcType="INTEGER" property="categoryId" />
<result column="category_name" jdbcType="VARCHAR" property="categoryName" /> <result column="category_name" jdbcType="VARCHAR" property="categoryName" />
<result column="warehouse_code" jdbcType="VARCHAR" property="warehouseCode" />
<result column="warehouse_name" jdbcType="VARCHAR" property="warehouseName" />
<result column="unit_price" jdbcType="DECIMAL" property="unitPrice" /> <result column="unit_price" jdbcType="DECIMAL" property="unitPrice" />
<result column="seller_id" jdbcType="INTEGER" property="sellerId" /> <result column="seller_id" jdbcType="INTEGER" property="sellerId" />
<result column="seller_name" jdbcType="VARCHAR" property="sellerName" /> <result column="seller_name" jdbcType="VARCHAR" property="sellerName" />
...@@ -45,6 +43,36 @@ ...@@ -45,6 +43,36 @@
<result column="suppliers_link" jdbcType="VARCHAR" property="suppliersLink" /> <result column="suppliers_link" jdbcType="VARCHAR" property="suppliersLink" />
<result column="bailun_category_id" jdbcType="INTEGER" property="bailunCategoryId" /> <result column="bailun_category_id" jdbcType="INTEGER" property="bailunCategoryId" />
<result column="bailun_category_name" jdbcType="VARCHAR" property="bailunCategoryName" /> <result column="bailun_category_name" jdbcType="VARCHAR" property="bailunCategoryName" />
<result column="color" jdbcType="VARCHAR" property="color" />
<result column="specifications" jdbcType="VARCHAR" property="specifications" />
<result column="create_name" jdbcType="VARCHAR" property="createName" />
<result column="update_name" jdbcType="VARCHAR" property="updateName" />
<result column="virtual_price" jdbcType="DECIMAL" property="virtualPrice" />
<result column="size_image" jdbcType="VARCHAR" property="sizeImage" />
<result column="sales_price" jdbcType="DECIMAL" property="salesPrice" />
<result column="enable" jdbcType="TINYINT" property="enable" />
<result column="inspection_hours" jdbcType="DECIMAL" property="inspectionHours" />
<result column="bargainer" jdbcType="VARCHAR" property="bargainer" />
<result column="customs_code" jdbcType="VARCHAR" property="customsCode" />
<result column="declare_title_en" jdbcType="VARCHAR" property="declareTitleEn" />
<result column="declare_title_cn" jdbcType="VARCHAR" property="declareTitleCn" />
<result column="pick_title_cn" jdbcType="VARCHAR" property="pickTitleCn" />
<result column="pick_title_en" jdbcType="VARCHAR" property="pickTitleEn" />
<result column="product_nature" jdbcType="VARCHAR" property="productNature" />
<result column="charger_specifications" jdbcType="VARCHAR" property="chargerSpecifications" />
<result column="packing_price" jdbcType="DECIMAL" property="packingPrice" />
<result column="packing_name" jdbcType="VARCHAR" property="packingName" />
<result column="packing_size" jdbcType="VARCHAR" property="packingSize" />
<result column="product_size" jdbcType="VARCHAR" property="productSize" />
<result column="packing_weight" jdbcType="DECIMAL" property="packingWeight" />
<result column="unit" jdbcType="VARCHAR" property="unit" />
<result column="push_status" jdbcType="TINYINT" property="pushStatus" />
<result column="transfer_delivery" jdbcType="INTEGER" property="transferDelivery" />
<result column="source" jdbcType="TINYINT" property="source" />
<result column="push_time" jdbcType="TIMESTAMP" property="pushTime" />
<result column="has_delete" jdbcType="BIT" property="hasDelete" />
<result column="develop_time" jdbcType="TIMESTAMP" property="developTime" />
<result column="company_id" jdbcType="INTEGER" property="companyId" />
</resultMap> </resultMap>
<sql id="Example_Where_Clause"> <sql id="Example_Where_Clause">
<!-- <!--
...@@ -117,12 +145,16 @@ ...@@ -117,12 +145,16 @@
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
--> -->
id, bailun_sku, sku_image, category_id, category_name, warehouse_code, warehouse_name, id, bailun_sku, sku_image, category_id, category_name, unit_price, seller_id, seller_name,
unit_price, seller_id, seller_name, length, width, height, weight, moq, sku_title_cn, length, width, height, weight, moq, sku_title_cn, sku_title_en, create_time, update_time,
sku_title_en, create_time, update_time, gmt_create, gmt_modified, suppliers_id, suppliers_name, gmt_create, gmt_modified, suppliers_id, suppliers_name, supplier_delivery, currency,
supplier_delivery, currency, buyer_name, buyer_id, internal_moq, bussiness_id, bussiness_name, buyer_name, buyer_id, internal_moq, bussiness_id, bussiness_name, status, type, product_code,
status, type, product_code, bailun_inner_sku, product_inner_code, skums_id, suppliers_link, bailun_inner_sku, product_inner_code, skums_id, suppliers_link, bailun_category_id,
bailun_category_id, bailun_category_name bailun_category_name, color, specifications, create_name, update_name, virtual_price,
size_image, sales_price, enable, inspection_hours, bargainer, customs_code, declare_title_en,
declare_title_cn, pick_title_cn, pick_title_en, product_nature, charger_specifications,
packing_price, packing_name, packing_size, product_size, packing_weight, unit, push_status,
transfer_delivery, source, push_time, has_delete, develop_time, company_id
</sql> </sql>
<select id="selectByExample" parameterType="com.bailuntec.domain.example.DcBaseSkuExample" resultMap="BaseResultMap"> <select id="selectByExample" parameterType="com.bailuntec.domain.example.DcBaseSkuExample" resultMap="BaseResultMap">
<!-- <!--
...@@ -184,33 +216,51 @@ ...@@ -184,33 +216,51 @@
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
--> -->
insert into dc_base_sku (id, bailun_sku, sku_image, insert into dc_base_sku (id, bailun_sku, sku_image,
category_id, category_name, warehouse_code, category_id, category_name, unit_price,
warehouse_name, unit_price, seller_id, seller_id, seller_name, length,
seller_name, length, width, width, height, weight,
height, weight, moq, moq, sku_title_cn, sku_title_en,
sku_title_cn, sku_title_en, create_time, create_time, update_time, gmt_create,
update_time, gmt_create, gmt_modified, gmt_modified, suppliers_id, suppliers_name,
suppliers_id, suppliers_name, supplier_delivery, supplier_delivery, currency, buyer_name,
currency, buyer_name, buyer_id, buyer_id, internal_moq, bussiness_id,
internal_moq, bussiness_id, bussiness_name, bussiness_name, status, type,
status, type, product_code, product_code, bailun_inner_sku, product_inner_code,
bailun_inner_sku, product_inner_code, skums_id, skums_id, suppliers_link, bailun_category_id,
suppliers_link, bailun_category_id, bailun_category_name bailun_category_name, color, specifications,
) create_name, update_name, virtual_price,
size_image, sales_price, enable,
inspection_hours, bargainer, customs_code,
declare_title_en, declare_title_cn, pick_title_cn,
pick_title_en, product_nature, charger_specifications,
packing_price, packing_name, packing_size,
product_size, packing_weight, unit,
push_status, transfer_delivery, source,
push_time, has_delete, develop_time,
company_id)
values (#{id,jdbcType=INTEGER}, #{bailunSku,jdbcType=VARCHAR}, #{skuImage,jdbcType=VARCHAR}, values (#{id,jdbcType=INTEGER}, #{bailunSku,jdbcType=VARCHAR}, #{skuImage,jdbcType=VARCHAR},
#{categoryId,jdbcType=INTEGER}, #{categoryName,jdbcType=VARCHAR}, #{warehouseCode,jdbcType=VARCHAR}, #{categoryId,jdbcType=INTEGER}, #{categoryName,jdbcType=VARCHAR}, #{unitPrice,jdbcType=DECIMAL},
#{warehouseName,jdbcType=VARCHAR}, #{unitPrice,jdbcType=DECIMAL}, #{sellerId,jdbcType=INTEGER}, #{sellerId,jdbcType=INTEGER}, #{sellerName,jdbcType=VARCHAR}, #{length,jdbcType=DECIMAL},
#{sellerName,jdbcType=VARCHAR}, #{length,jdbcType=DECIMAL}, #{width,jdbcType=DECIMAL}, #{width,jdbcType=DECIMAL}, #{height,jdbcType=DECIMAL}, #{weight,jdbcType=DECIMAL},
#{height,jdbcType=DECIMAL}, #{weight,jdbcType=DECIMAL}, #{moq,jdbcType=INTEGER}, #{moq,jdbcType=INTEGER}, #{skuTitleCn,jdbcType=VARCHAR}, #{skuTitleEn,jdbcType=VARCHAR},
#{skuTitleCn,jdbcType=VARCHAR}, #{skuTitleEn,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{gmtCreate,jdbcType=TIMESTAMP},
#{updateTime,jdbcType=TIMESTAMP}, #{gmtCreate,jdbcType=TIMESTAMP}, #{gmtModified,jdbcType=TIMESTAMP}, #{gmtModified,jdbcType=TIMESTAMP}, #{suppliersId,jdbcType=INTEGER}, #{suppliersName,jdbcType=VARCHAR},
#{suppliersId,jdbcType=INTEGER}, #{suppliersName,jdbcType=VARCHAR}, #{supplierDelivery,jdbcType=INTEGER}, #{supplierDelivery,jdbcType=INTEGER}, #{currency,jdbcType=VARCHAR}, #{buyerName,jdbcType=VARCHAR},
#{currency,jdbcType=VARCHAR}, #{buyerName,jdbcType=VARCHAR}, #{buyerId,jdbcType=INTEGER}, #{buyerId,jdbcType=INTEGER}, #{internalMoq,jdbcType=INTEGER}, #{bussinessId,jdbcType=INTEGER},
#{internalMoq,jdbcType=INTEGER}, #{bussinessId,jdbcType=INTEGER}, #{bussinessName,jdbcType=VARCHAR}, #{bussinessName,jdbcType=VARCHAR}, #{status,jdbcType=TINYINT}, #{type,jdbcType=TINYINT},
#{status,jdbcType=TINYINT}, #{type,jdbcType=TINYINT}, #{productCode,jdbcType=VARCHAR}, #{productCode,jdbcType=VARCHAR}, #{bailunInnerSku,jdbcType=VARCHAR}, #{productInnerCode,jdbcType=VARCHAR},
#{bailunInnerSku,jdbcType=VARCHAR}, #{productInnerCode,jdbcType=VARCHAR}, #{skumsId,jdbcType=INTEGER}, #{skumsId,jdbcType=INTEGER}, #{suppliersLink,jdbcType=VARCHAR}, #{bailunCategoryId,jdbcType=INTEGER},
#{suppliersLink,jdbcType=VARCHAR}, #{bailunCategoryId,jdbcType=INTEGER}, #{bailunCategoryName,jdbcType=VARCHAR} #{bailunCategoryName,jdbcType=VARCHAR}, #{color,jdbcType=VARCHAR}, #{specifications,jdbcType=VARCHAR},
) #{createName,jdbcType=VARCHAR}, #{updateName,jdbcType=VARCHAR}, #{virtualPrice,jdbcType=DECIMAL},
#{sizeImage,jdbcType=VARCHAR}, #{salesPrice,jdbcType=DECIMAL}, #{enable,jdbcType=TINYINT},
#{inspectionHours,jdbcType=DECIMAL}, #{bargainer,jdbcType=VARCHAR}, #{customsCode,jdbcType=VARCHAR},
#{declareTitleEn,jdbcType=VARCHAR}, #{declareTitleCn,jdbcType=VARCHAR}, #{pickTitleCn,jdbcType=VARCHAR},
#{pickTitleEn,jdbcType=VARCHAR}, #{productNature,jdbcType=VARCHAR}, #{chargerSpecifications,jdbcType=VARCHAR},
#{packingPrice,jdbcType=DECIMAL}, #{packingName,jdbcType=VARCHAR}, #{packingSize,jdbcType=VARCHAR},
#{productSize,jdbcType=VARCHAR}, #{packingWeight,jdbcType=DECIMAL}, #{unit,jdbcType=VARCHAR},
#{pushStatus,jdbcType=TINYINT}, #{transferDelivery,jdbcType=INTEGER}, #{source,jdbcType=TINYINT},
#{pushTime,jdbcType=TIMESTAMP}, #{hasDelete,jdbcType=BIT}, #{developTime,jdbcType=TIMESTAMP},
#{companyId,jdbcType=INTEGER})
</insert> </insert>
<insert id="insertSelective" parameterType="com.bailuntec.domain.entity.DcBaseSku"> <insert id="insertSelective" parameterType="com.bailuntec.domain.entity.DcBaseSku">
<!-- <!--
...@@ -234,12 +284,6 @@ ...@@ -234,12 +284,6 @@
<if test="categoryName != null"> <if test="categoryName != null">
category_name, category_name,
</if> </if>
<if test="warehouseCode != null">
warehouse_code,
</if>
<if test="warehouseName != null">
warehouse_name,
</if>
<if test="unitPrice != null"> <if test="unitPrice != null">
unit_price, unit_price,
</if> </if>
...@@ -336,6 +380,96 @@ ...@@ -336,6 +380,96 @@
<if test="bailunCategoryName != null"> <if test="bailunCategoryName != null">
bailun_category_name, bailun_category_name,
</if> </if>
<if test="color != null">
color,
</if>
<if test="specifications != null">
specifications,
</if>
<if test="createName != null">
create_name,
</if>
<if test="updateName != null">
update_name,
</if>
<if test="virtualPrice != null">
virtual_price,
</if>
<if test="sizeImage != null">
size_image,
</if>
<if test="salesPrice != null">
sales_price,
</if>
<if test="enable != null">
enable,
</if>
<if test="inspectionHours != null">
inspection_hours,
</if>
<if test="bargainer != null">
bargainer,
</if>
<if test="customsCode != null">
customs_code,
</if>
<if test="declareTitleEn != null">
declare_title_en,
</if>
<if test="declareTitleCn != null">
declare_title_cn,
</if>
<if test="pickTitleCn != null">
pick_title_cn,
</if>
<if test="pickTitleEn != null">
pick_title_en,
</if>
<if test="productNature != null">
product_nature,
</if>
<if test="chargerSpecifications != null">
charger_specifications,
</if>
<if test="packingPrice != null">
packing_price,
</if>
<if test="packingName != null">
packing_name,
</if>
<if test="packingSize != null">
packing_size,
</if>
<if test="productSize != null">
product_size,
</if>
<if test="packingWeight != null">
packing_weight,
</if>
<if test="unit != null">
unit,
</if>
<if test="pushStatus != null">
push_status,
</if>
<if test="transferDelivery != null">
transfer_delivery,
</if>
<if test="source != null">
source,
</if>
<if test="pushTime != null">
push_time,
</if>
<if test="hasDelete != null">
has_delete,
</if>
<if test="developTime != null">
develop_time,
</if>
<if test="companyId != null">
company_id,
</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null"> <if test="id != null">
...@@ -353,12 +487,6 @@ ...@@ -353,12 +487,6 @@
<if test="categoryName != null"> <if test="categoryName != null">
#{categoryName,jdbcType=VARCHAR}, #{categoryName,jdbcType=VARCHAR},
</if> </if>
<if test="warehouseCode != null">
#{warehouseCode,jdbcType=VARCHAR},
</if>
<if test="warehouseName != null">
#{warehouseName,jdbcType=VARCHAR},
</if>
<if test="unitPrice != null"> <if test="unitPrice != null">
#{unitPrice,jdbcType=DECIMAL}, #{unitPrice,jdbcType=DECIMAL},
</if> </if>
...@@ -455,6 +583,96 @@ ...@@ -455,6 +583,96 @@
<if test="bailunCategoryName != null"> <if test="bailunCategoryName != null">
#{bailunCategoryName,jdbcType=VARCHAR}, #{bailunCategoryName,jdbcType=VARCHAR},
</if> </if>
<if test="color != null">
#{color,jdbcType=VARCHAR},
</if>
<if test="specifications != null">
#{specifications,jdbcType=VARCHAR},
</if>
<if test="createName != null">
#{createName,jdbcType=VARCHAR},
</if>
<if test="updateName != null">
#{updateName,jdbcType=VARCHAR},
</if>
<if test="virtualPrice != null">
#{virtualPrice,jdbcType=DECIMAL},
</if>
<if test="sizeImage != null">
#{sizeImage,jdbcType=VARCHAR},
</if>
<if test="salesPrice != null">
#{salesPrice,jdbcType=DECIMAL},
</if>
<if test="enable != null">
#{enable,jdbcType=TINYINT},
</if>
<if test="inspectionHours != null">
#{inspectionHours,jdbcType=DECIMAL},
</if>
<if test="bargainer != null">
#{bargainer,jdbcType=VARCHAR},
</if>
<if test="customsCode != null">
#{customsCode,jdbcType=VARCHAR},
</if>
<if test="declareTitleEn != null">
#{declareTitleEn,jdbcType=VARCHAR},
</if>
<if test="declareTitleCn != null">
#{declareTitleCn,jdbcType=VARCHAR},
</if>
<if test="pickTitleCn != null">
#{pickTitleCn,jdbcType=VARCHAR},
</if>
<if test="pickTitleEn != null">
#{pickTitleEn,jdbcType=VARCHAR},
</if>
<if test="productNature != null">
#{productNature,jdbcType=VARCHAR},
</if>
<if test="chargerSpecifications != null">
#{chargerSpecifications,jdbcType=VARCHAR},
</if>
<if test="packingPrice != null">
#{packingPrice,jdbcType=DECIMAL},
</if>
<if test="packingName != null">
#{packingName,jdbcType=VARCHAR},
</if>
<if test="packingSize != null">
#{packingSize,jdbcType=VARCHAR},
</if>
<if test="productSize != null">
#{productSize,jdbcType=VARCHAR},
</if>
<if test="packingWeight != null">
#{packingWeight,jdbcType=DECIMAL},
</if>
<if test="unit != null">
#{unit,jdbcType=VARCHAR},
</if>
<if test="pushStatus != null">
#{pushStatus,jdbcType=TINYINT},
</if>
<if test="transferDelivery != null">
#{transferDelivery,jdbcType=INTEGER},
</if>
<if test="source != null">
#{source,jdbcType=TINYINT},
</if>
<if test="pushTime != null">
#{pushTime,jdbcType=TIMESTAMP},
</if>
<if test="hasDelete != null">
#{hasDelete,jdbcType=BIT},
</if>
<if test="developTime != null">
#{developTime,jdbcType=TIMESTAMP},
</if>
<if test="companyId != null">
#{companyId,jdbcType=INTEGER},
</if>
</trim> </trim>
</insert> </insert>
<select id="countByExample" parameterType="com.bailuntec.domain.example.DcBaseSkuExample" resultType="java.lang.Long"> <select id="countByExample" parameterType="com.bailuntec.domain.example.DcBaseSkuExample" resultType="java.lang.Long">
...@@ -489,12 +707,6 @@ ...@@ -489,12 +707,6 @@
<if test="record.categoryName != null"> <if test="record.categoryName != null">
category_name = #{record.categoryName,jdbcType=VARCHAR}, category_name = #{record.categoryName,jdbcType=VARCHAR},
</if> </if>
<if test="record.warehouseCode != null">
warehouse_code = #{record.warehouseCode,jdbcType=VARCHAR},
</if>
<if test="record.warehouseName != null">
warehouse_name = #{record.warehouseName,jdbcType=VARCHAR},
</if>
<if test="record.unitPrice != null"> <if test="record.unitPrice != null">
unit_price = #{record.unitPrice,jdbcType=DECIMAL}, unit_price = #{record.unitPrice,jdbcType=DECIMAL},
</if> </if>
...@@ -591,6 +803,96 @@ ...@@ -591,6 +803,96 @@
<if test="record.bailunCategoryName != null"> <if test="record.bailunCategoryName != null">
bailun_category_name = #{record.bailunCategoryName,jdbcType=VARCHAR}, bailun_category_name = #{record.bailunCategoryName,jdbcType=VARCHAR},
</if> </if>
<if test="record.color != null">
color = #{record.color,jdbcType=VARCHAR},
</if>
<if test="record.specifications != null">
specifications = #{record.specifications,jdbcType=VARCHAR},
</if>
<if test="record.createName != null">
create_name = #{record.createName,jdbcType=VARCHAR},
</if>
<if test="record.updateName != null">
update_name = #{record.updateName,jdbcType=VARCHAR},
</if>
<if test="record.virtualPrice != null">
virtual_price = #{record.virtualPrice,jdbcType=DECIMAL},
</if>
<if test="record.sizeImage != null">
size_image = #{record.sizeImage,jdbcType=VARCHAR},
</if>
<if test="record.salesPrice != null">
sales_price = #{record.salesPrice,jdbcType=DECIMAL},
</if>
<if test="record.enable != null">
enable = #{record.enable,jdbcType=TINYINT},
</if>
<if test="record.inspectionHours != null">
inspection_hours = #{record.inspectionHours,jdbcType=DECIMAL},
</if>
<if test="record.bargainer != null">
bargainer = #{record.bargainer,jdbcType=VARCHAR},
</if>
<if test="record.customsCode != null">
customs_code = #{record.customsCode,jdbcType=VARCHAR},
</if>
<if test="record.declareTitleEn != null">
declare_title_en = #{record.declareTitleEn,jdbcType=VARCHAR},
</if>
<if test="record.declareTitleCn != null">
declare_title_cn = #{record.declareTitleCn,jdbcType=VARCHAR},
</if>
<if test="record.pickTitleCn != null">
pick_title_cn = #{record.pickTitleCn,jdbcType=VARCHAR},
</if>
<if test="record.pickTitleEn != null">
pick_title_en = #{record.pickTitleEn,jdbcType=VARCHAR},
</if>
<if test="record.productNature != null">
product_nature = #{record.productNature,jdbcType=VARCHAR},
</if>
<if test="record.chargerSpecifications != null">
charger_specifications = #{record.chargerSpecifications,jdbcType=VARCHAR},
</if>
<if test="record.packingPrice != null">
packing_price = #{record.packingPrice,jdbcType=DECIMAL},
</if>
<if test="record.packingName != null">
packing_name = #{record.packingName,jdbcType=VARCHAR},
</if>
<if test="record.packingSize != null">
packing_size = #{record.packingSize,jdbcType=VARCHAR},
</if>
<if test="record.productSize != null">
product_size = #{record.productSize,jdbcType=VARCHAR},
</if>
<if test="record.packingWeight != null">
packing_weight = #{record.packingWeight,jdbcType=DECIMAL},
</if>
<if test="record.unit != null">
unit = #{record.unit,jdbcType=VARCHAR},
</if>
<if test="record.pushStatus != null">
push_status = #{record.pushStatus,jdbcType=TINYINT},
</if>
<if test="record.transferDelivery != null">
transfer_delivery = #{record.transferDelivery,jdbcType=INTEGER},
</if>
<if test="record.source != null">
source = #{record.source,jdbcType=TINYINT},
</if>
<if test="record.pushTime != null">
push_time = #{record.pushTime,jdbcType=TIMESTAMP},
</if>
<if test="record.hasDelete != null">
has_delete = #{record.hasDelete,jdbcType=BIT},
</if>
<if test="record.developTime != null">
develop_time = #{record.developTime,jdbcType=TIMESTAMP},
</if>
<if test="record.companyId != null">
company_id = #{record.companyId,jdbcType=INTEGER},
</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" />
...@@ -607,8 +909,6 @@ ...@@ -607,8 +909,6 @@
sku_image = #{record.skuImage,jdbcType=VARCHAR}, sku_image = #{record.skuImage,jdbcType=VARCHAR},
category_id = #{record.categoryId,jdbcType=INTEGER}, category_id = #{record.categoryId,jdbcType=INTEGER},
category_name = #{record.categoryName,jdbcType=VARCHAR}, category_name = #{record.categoryName,jdbcType=VARCHAR},
warehouse_code = #{record.warehouseCode,jdbcType=VARCHAR},
warehouse_name = #{record.warehouseName,jdbcType=VARCHAR},
unit_price = #{record.unitPrice,jdbcType=DECIMAL}, unit_price = #{record.unitPrice,jdbcType=DECIMAL},
seller_id = #{record.sellerId,jdbcType=INTEGER}, seller_id = #{record.sellerId,jdbcType=INTEGER},
seller_name = #{record.sellerName,jdbcType=VARCHAR}, seller_name = #{record.sellerName,jdbcType=VARCHAR},
...@@ -640,7 +940,37 @@ ...@@ -640,7 +940,37 @@
skums_id = #{record.skumsId,jdbcType=INTEGER}, skums_id = #{record.skumsId,jdbcType=INTEGER},
suppliers_link = #{record.suppliersLink,jdbcType=VARCHAR}, suppliers_link = #{record.suppliersLink,jdbcType=VARCHAR},
bailun_category_id = #{record.bailunCategoryId,jdbcType=INTEGER}, bailun_category_id = #{record.bailunCategoryId,jdbcType=INTEGER},
bailun_category_name = #{record.bailunCategoryName,jdbcType=VARCHAR} bailun_category_name = #{record.bailunCategoryName,jdbcType=VARCHAR},
color = #{record.color,jdbcType=VARCHAR},
specifications = #{record.specifications,jdbcType=VARCHAR},
create_name = #{record.createName,jdbcType=VARCHAR},
update_name = #{record.updateName,jdbcType=VARCHAR},
virtual_price = #{record.virtualPrice,jdbcType=DECIMAL},
size_image = #{record.sizeImage,jdbcType=VARCHAR},
sales_price = #{record.salesPrice,jdbcType=DECIMAL},
enable = #{record.enable,jdbcType=TINYINT},
inspection_hours = #{record.inspectionHours,jdbcType=DECIMAL},
bargainer = #{record.bargainer,jdbcType=VARCHAR},
customs_code = #{record.customsCode,jdbcType=VARCHAR},
declare_title_en = #{record.declareTitleEn,jdbcType=VARCHAR},
declare_title_cn = #{record.declareTitleCn,jdbcType=VARCHAR},
pick_title_cn = #{record.pickTitleCn,jdbcType=VARCHAR},
pick_title_en = #{record.pickTitleEn,jdbcType=VARCHAR},
product_nature = #{record.productNature,jdbcType=VARCHAR},
charger_specifications = #{record.chargerSpecifications,jdbcType=VARCHAR},
packing_price = #{record.packingPrice,jdbcType=DECIMAL},
packing_name = #{record.packingName,jdbcType=VARCHAR},
packing_size = #{record.packingSize,jdbcType=VARCHAR},
product_size = #{record.productSize,jdbcType=VARCHAR},
packing_weight = #{record.packingWeight,jdbcType=DECIMAL},
unit = #{record.unit,jdbcType=VARCHAR},
push_status = #{record.pushStatus,jdbcType=TINYINT},
transfer_delivery = #{record.transferDelivery,jdbcType=INTEGER},
source = #{record.source,jdbcType=TINYINT},
push_time = #{record.pushTime,jdbcType=TIMESTAMP},
has_delete = #{record.hasDelete,jdbcType=BIT},
develop_time = #{record.developTime,jdbcType=TIMESTAMP},
company_id = #{record.companyId,jdbcType=INTEGER}
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
</if> </if>
...@@ -664,12 +994,6 @@ ...@@ -664,12 +994,6 @@
<if test="categoryName != null"> <if test="categoryName != null">
category_name = #{categoryName,jdbcType=VARCHAR}, category_name = #{categoryName,jdbcType=VARCHAR},
</if> </if>
<if test="warehouseCode != null">
warehouse_code = #{warehouseCode,jdbcType=VARCHAR},
</if>
<if test="warehouseName != null">
warehouse_name = #{warehouseName,jdbcType=VARCHAR},
</if>
<if test="unitPrice != null"> <if test="unitPrice != null">
unit_price = #{unitPrice,jdbcType=DECIMAL}, unit_price = #{unitPrice,jdbcType=DECIMAL},
</if> </if>
...@@ -766,6 +1090,96 @@ ...@@ -766,6 +1090,96 @@
<if test="bailunCategoryName != null"> <if test="bailunCategoryName != null">
bailun_category_name = #{bailunCategoryName,jdbcType=VARCHAR}, bailun_category_name = #{bailunCategoryName,jdbcType=VARCHAR},
</if> </if>
<if test="color != null">
color = #{color,jdbcType=VARCHAR},
</if>
<if test="specifications != null">
specifications = #{specifications,jdbcType=VARCHAR},
</if>
<if test="createName != null">
create_name = #{createName,jdbcType=VARCHAR},
</if>
<if test="updateName != null">
update_name = #{updateName,jdbcType=VARCHAR},
</if>
<if test="virtualPrice != null">
virtual_price = #{virtualPrice,jdbcType=DECIMAL},
</if>
<if test="sizeImage != null">
size_image = #{sizeImage,jdbcType=VARCHAR},
</if>
<if test="salesPrice != null">
sales_price = #{salesPrice,jdbcType=DECIMAL},
</if>
<if test="enable != null">
enable = #{enable,jdbcType=TINYINT},
</if>
<if test="inspectionHours != null">
inspection_hours = #{inspectionHours,jdbcType=DECIMAL},
</if>
<if test="bargainer != null">
bargainer = #{bargainer,jdbcType=VARCHAR},
</if>
<if test="customsCode != null">
customs_code = #{customsCode,jdbcType=VARCHAR},
</if>
<if test="declareTitleEn != null">
declare_title_en = #{declareTitleEn,jdbcType=VARCHAR},
</if>
<if test="declareTitleCn != null">
declare_title_cn = #{declareTitleCn,jdbcType=VARCHAR},
</if>
<if test="pickTitleCn != null">
pick_title_cn = #{pickTitleCn,jdbcType=VARCHAR},
</if>
<if test="pickTitleEn != null">
pick_title_en = #{pickTitleEn,jdbcType=VARCHAR},
</if>
<if test="productNature != null">
product_nature = #{productNature,jdbcType=VARCHAR},
</if>
<if test="chargerSpecifications != null">
charger_specifications = #{chargerSpecifications,jdbcType=VARCHAR},
</if>
<if test="packingPrice != null">
packing_price = #{packingPrice,jdbcType=DECIMAL},
</if>
<if test="packingName != null">
packing_name = #{packingName,jdbcType=VARCHAR},
</if>
<if test="packingSize != null">
packing_size = #{packingSize,jdbcType=VARCHAR},
</if>
<if test="productSize != null">
product_size = #{productSize,jdbcType=VARCHAR},
</if>
<if test="packingWeight != null">
packing_weight = #{packingWeight,jdbcType=DECIMAL},
</if>
<if test="unit != null">
unit = #{unit,jdbcType=VARCHAR},
</if>
<if test="pushStatus != null">
push_status = #{pushStatus,jdbcType=TINYINT},
</if>
<if test="transferDelivery != null">
transfer_delivery = #{transferDelivery,jdbcType=INTEGER},
</if>
<if test="source != null">
source = #{source,jdbcType=TINYINT},
</if>
<if test="pushTime != null">
push_time = #{pushTime,jdbcType=TIMESTAMP},
</if>
<if test="hasDelete != null">
has_delete = #{hasDelete,jdbcType=BIT},
</if>
<if test="developTime != null">
develop_time = #{developTime,jdbcType=TIMESTAMP},
</if>
<if test="companyId != null">
company_id = #{companyId,jdbcType=INTEGER},
</if>
</set> </set>
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</update> </update>
...@@ -779,8 +1193,6 @@ ...@@ -779,8 +1193,6 @@
sku_image = #{skuImage,jdbcType=VARCHAR}, sku_image = #{skuImage,jdbcType=VARCHAR},
category_id = #{categoryId,jdbcType=INTEGER}, category_id = #{categoryId,jdbcType=INTEGER},
category_name = #{categoryName,jdbcType=VARCHAR}, category_name = #{categoryName,jdbcType=VARCHAR},
warehouse_code = #{warehouseCode,jdbcType=VARCHAR},
warehouse_name = #{warehouseName,jdbcType=VARCHAR},
unit_price = #{unitPrice,jdbcType=DECIMAL}, unit_price = #{unitPrice,jdbcType=DECIMAL},
seller_id = #{sellerId,jdbcType=INTEGER}, seller_id = #{sellerId,jdbcType=INTEGER},
seller_name = #{sellerName,jdbcType=VARCHAR}, seller_name = #{sellerName,jdbcType=VARCHAR},
...@@ -812,7 +1224,37 @@ ...@@ -812,7 +1224,37 @@
skums_id = #{skumsId,jdbcType=INTEGER}, skums_id = #{skumsId,jdbcType=INTEGER},
suppliers_link = #{suppliersLink,jdbcType=VARCHAR}, suppliers_link = #{suppliersLink,jdbcType=VARCHAR},
bailun_category_id = #{bailunCategoryId,jdbcType=INTEGER}, bailun_category_id = #{bailunCategoryId,jdbcType=INTEGER},
bailun_category_name = #{bailunCategoryName,jdbcType=VARCHAR} bailun_category_name = #{bailunCategoryName,jdbcType=VARCHAR},
color = #{color,jdbcType=VARCHAR},
specifications = #{specifications,jdbcType=VARCHAR},
create_name = #{createName,jdbcType=VARCHAR},
update_name = #{updateName,jdbcType=VARCHAR},
virtual_price = #{virtualPrice,jdbcType=DECIMAL},
size_image = #{sizeImage,jdbcType=VARCHAR},
sales_price = #{salesPrice,jdbcType=DECIMAL},
enable = #{enable,jdbcType=TINYINT},
inspection_hours = #{inspectionHours,jdbcType=DECIMAL},
bargainer = #{bargainer,jdbcType=VARCHAR},
customs_code = #{customsCode,jdbcType=VARCHAR},
declare_title_en = #{declareTitleEn,jdbcType=VARCHAR},
declare_title_cn = #{declareTitleCn,jdbcType=VARCHAR},
pick_title_cn = #{pickTitleCn,jdbcType=VARCHAR},
pick_title_en = #{pickTitleEn,jdbcType=VARCHAR},
product_nature = #{productNature,jdbcType=VARCHAR},
charger_specifications = #{chargerSpecifications,jdbcType=VARCHAR},
packing_price = #{packingPrice,jdbcType=DECIMAL},
packing_name = #{packingName,jdbcType=VARCHAR},
packing_size = #{packingSize,jdbcType=VARCHAR},
product_size = #{productSize,jdbcType=VARCHAR},
packing_weight = #{packingWeight,jdbcType=DECIMAL},
unit = #{unit,jdbcType=VARCHAR},
push_status = #{pushStatus,jdbcType=TINYINT},
transfer_delivery = #{transferDelivery,jdbcType=INTEGER},
source = #{source,jdbcType=TINYINT},
push_time = #{pushTime,jdbcType=TIMESTAMP},
has_delete = #{hasDelete,jdbcType=BIT},
develop_time = #{developTime,jdbcType=TIMESTAMP},
company_id = #{companyId,jdbcType=INTEGER}
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</update> </update>
<insert id="upsertSelective" parameterType="com.bailuntec.domain.entity.DcBaseSku"> <insert id="upsertSelective" parameterType="com.bailuntec.domain.entity.DcBaseSku">
...@@ -838,12 +1280,6 @@ ...@@ -838,12 +1280,6 @@
<if test="categoryName != null"> <if test="categoryName != null">
category_name, category_name,
</if> </if>
<if test="warehouseCode != null">
warehouse_code,
</if>
<if test="warehouseName != null">
warehouse_name,
</if>
<if test="unitPrice != null"> <if test="unitPrice != null">
unit_price, unit_price,
</if> </if>
...@@ -940,6 +1376,96 @@ ...@@ -940,6 +1376,96 @@
<if test="bailunCategoryName != null"> <if test="bailunCategoryName != null">
bailun_category_name, bailun_category_name,
</if> </if>
<if test="color != null">
color,
</if>
<if test="specifications != null">
specifications,
</if>
<if test="createName != null">
create_name,
</if>
<if test="updateName != null">
update_name,
</if>
<if test="virtualPrice != null">
virtual_price,
</if>
<if test="sizeImage != null">
size_image,
</if>
<if test="salesPrice != null">
sales_price,
</if>
<if test="enable != null">
enable,
</if>
<if test="inspectionHours != null">
inspection_hours,
</if>
<if test="bargainer != null">
bargainer,
</if>
<if test="customsCode != null">
customs_code,
</if>
<if test="declareTitleEn != null">
declare_title_en,
</if>
<if test="declareTitleCn != null">
declare_title_cn,
</if>
<if test="pickTitleCn != null">
pick_title_cn,
</if>
<if test="pickTitleEn != null">
pick_title_en,
</if>
<if test="productNature != null">
product_nature,
</if>
<if test="chargerSpecifications != null">
charger_specifications,
</if>
<if test="packingPrice != null">
packing_price,
</if>
<if test="packingName != null">
packing_name,
</if>
<if test="packingSize != null">
packing_size,
</if>
<if test="productSize != null">
product_size,
</if>
<if test="packingWeight != null">
packing_weight,
</if>
<if test="unit != null">
unit,
</if>
<if test="pushStatus != null">
push_status,
</if>
<if test="transferDelivery != null">
transfer_delivery,
</if>
<if test="source != null">
source,
</if>
<if test="pushTime != null">
push_time,
</if>
<if test="hasDelete != null">
has_delete,
</if>
<if test="developTime != null">
develop_time,
</if>
<if test="companyId != null">
company_id,
</if>
</trim> </trim>
values values
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
...@@ -958,12 +1484,6 @@ ...@@ -958,12 +1484,6 @@
<if test="categoryName != null"> <if test="categoryName != null">
#{categoryName,jdbcType=VARCHAR}, #{categoryName,jdbcType=VARCHAR},
</if> </if>
<if test="warehouseCode != null">
#{warehouseCode,jdbcType=VARCHAR},
</if>
<if test="warehouseName != null">
#{warehouseName,jdbcType=VARCHAR},
</if>
<if test="unitPrice != null"> <if test="unitPrice != null">
#{unitPrice,jdbcType=DECIMAL}, #{unitPrice,jdbcType=DECIMAL},
</if> </if>
...@@ -1060,6 +1580,96 @@ ...@@ -1060,6 +1580,96 @@
<if test="bailunCategoryName != null"> <if test="bailunCategoryName != null">
#{bailunCategoryName,jdbcType=VARCHAR}, #{bailunCategoryName,jdbcType=VARCHAR},
</if> </if>
<if test="color != null">
#{color,jdbcType=VARCHAR},
</if>
<if test="specifications != null">
#{specifications,jdbcType=VARCHAR},
</if>
<if test="createName != null">
#{createName,jdbcType=VARCHAR},
</if>
<if test="updateName != null">
#{updateName,jdbcType=VARCHAR},
</if>
<if test="virtualPrice != null">
#{virtualPrice,jdbcType=DECIMAL},
</if>
<if test="sizeImage != null">
#{sizeImage,jdbcType=VARCHAR},
</if>
<if test="salesPrice != null">
#{salesPrice,jdbcType=DECIMAL},
</if>
<if test="enable != null">
#{enable,jdbcType=TINYINT},
</if>
<if test="inspectionHours != null">
#{inspectionHours,jdbcType=DECIMAL},
</if>
<if test="bargainer != null">
#{bargainer,jdbcType=VARCHAR},
</if>
<if test="customsCode != null">
#{customsCode,jdbcType=VARCHAR},
</if>
<if test="declareTitleEn != null">
#{declareTitleEn,jdbcType=VARCHAR},
</if>
<if test="declareTitleCn != null">
#{declareTitleCn,jdbcType=VARCHAR},
</if>
<if test="pickTitleCn != null">
#{pickTitleCn,jdbcType=VARCHAR},
</if>
<if test="pickTitleEn != null">
#{pickTitleEn,jdbcType=VARCHAR},
</if>
<if test="productNature != null">
#{productNature,jdbcType=VARCHAR},
</if>
<if test="chargerSpecifications != null">
#{chargerSpecifications,jdbcType=VARCHAR},
</if>
<if test="packingPrice != null">
#{packingPrice,jdbcType=DECIMAL},
</if>
<if test="packingName != null">
#{packingName,jdbcType=VARCHAR},
</if>
<if test="packingSize != null">
#{packingSize,jdbcType=VARCHAR},
</if>
<if test="productSize != null">
#{productSize,jdbcType=VARCHAR},
</if>
<if test="packingWeight != null">
#{packingWeight,jdbcType=DECIMAL},
</if>
<if test="unit != null">
#{unit,jdbcType=VARCHAR},
</if>
<if test="pushStatus != null">
#{pushStatus,jdbcType=TINYINT},
</if>
<if test="transferDelivery != null">
#{transferDelivery,jdbcType=INTEGER},
</if>
<if test="source != null">
#{source,jdbcType=TINYINT},
</if>
<if test="pushTime != null">
#{pushTime,jdbcType=TIMESTAMP},
</if>
<if test="hasDelete != null">
#{hasDelete,jdbcType=BIT},
</if>
<if test="developTime != null">
#{developTime,jdbcType=TIMESTAMP},
</if>
<if test="companyId != null">
#{companyId,jdbcType=INTEGER},
</if>
</trim> </trim>
on duplicate key update on duplicate key update
<trim suffixOverrides=","> <trim suffixOverrides=",">
...@@ -1078,12 +1688,6 @@ ...@@ -1078,12 +1688,6 @@
<if test="categoryName != null"> <if test="categoryName != null">
category_name = #{categoryName,jdbcType=VARCHAR}, category_name = #{categoryName,jdbcType=VARCHAR},
</if> </if>
<if test="warehouseCode != null">
warehouse_code = #{warehouseCode,jdbcType=VARCHAR},
</if>
<if test="warehouseName != null">
warehouse_name = #{warehouseName,jdbcType=VARCHAR},
</if>
<if test="unitPrice != null"> <if test="unitPrice != null">
unit_price = #{unitPrice,jdbcType=DECIMAL}, unit_price = #{unitPrice,jdbcType=DECIMAL},
</if> </if>
...@@ -1180,6 +1784,96 @@ ...@@ -1180,6 +1784,96 @@
<if test="bailunCategoryName != null"> <if test="bailunCategoryName != null">
bailun_category_name = #{bailunCategoryName,jdbcType=VARCHAR}, bailun_category_name = #{bailunCategoryName,jdbcType=VARCHAR},
</if> </if>
<if test="color != null">
color = #{color,jdbcType=VARCHAR},
</if>
<if test="specifications != null">
specifications = #{specifications,jdbcType=VARCHAR},
</if>
<if test="createName != null">
create_name = #{createName,jdbcType=VARCHAR},
</if>
<if test="updateName != null">
update_name = #{updateName,jdbcType=VARCHAR},
</if>
<if test="virtualPrice != null">
virtual_price = #{virtualPrice,jdbcType=DECIMAL},
</if>
<if test="sizeImage != null">
size_image = #{sizeImage,jdbcType=VARCHAR},
</if>
<if test="salesPrice != null">
sales_price = #{salesPrice,jdbcType=DECIMAL},
</if>
<if test="enable != null">
enable = #{enable,jdbcType=TINYINT},
</if>
<if test="inspectionHours != null">
inspection_hours = #{inspectionHours,jdbcType=DECIMAL},
</if>
<if test="bargainer != null">
bargainer = #{bargainer,jdbcType=VARCHAR},
</if>
<if test="customsCode != null">
customs_code = #{customsCode,jdbcType=VARCHAR},
</if>
<if test="declareTitleEn != null">
declare_title_en = #{declareTitleEn,jdbcType=VARCHAR},
</if>
<if test="declareTitleCn != null">
declare_title_cn = #{declareTitleCn,jdbcType=VARCHAR},
</if>
<if test="pickTitleCn != null">
pick_title_cn = #{pickTitleCn,jdbcType=VARCHAR},
</if>
<if test="pickTitleEn != null">
pick_title_en = #{pickTitleEn,jdbcType=VARCHAR},
</if>
<if test="productNature != null">
product_nature = #{productNature,jdbcType=VARCHAR},
</if>
<if test="chargerSpecifications != null">
charger_specifications = #{chargerSpecifications,jdbcType=VARCHAR},
</if>
<if test="packingPrice != null">
packing_price = #{packingPrice,jdbcType=DECIMAL},
</if>
<if test="packingName != null">
packing_name = #{packingName,jdbcType=VARCHAR},
</if>
<if test="packingSize != null">
packing_size = #{packingSize,jdbcType=VARCHAR},
</if>
<if test="productSize != null">
product_size = #{productSize,jdbcType=VARCHAR},
</if>
<if test="packingWeight != null">
packing_weight = #{packingWeight,jdbcType=DECIMAL},
</if>
<if test="unit != null">
unit = #{unit,jdbcType=VARCHAR},
</if>
<if test="pushStatus != null">
push_status = #{pushStatus,jdbcType=TINYINT},
</if>
<if test="transferDelivery != null">
transfer_delivery = #{transferDelivery,jdbcType=INTEGER},
</if>
<if test="source != null">
source = #{source,jdbcType=TINYINT},
</if>
<if test="pushTime != null">
push_time = #{pushTime,jdbcType=TIMESTAMP},
</if>
<if test="hasDelete != null">
has_delete = #{hasDelete,jdbcType=BIT},
</if>
<if test="developTime != null">
develop_time = #{developTime,jdbcType=TIMESTAMP},
</if>
<if test="companyId != null">
company_id = #{companyId,jdbcType=INTEGER},
</if>
</trim> </trim>
</insert> </insert>
<insert id="upsert" parameterType="com.bailuntec.domain.entity.DcBaseSku"> <insert id="upsert" parameterType="com.bailuntec.domain.entity.DcBaseSku">
...@@ -1189,35 +1883,47 @@ ...@@ -1189,35 +1883,47 @@
@project https://github.com/itfsw/mybatis-generator-plugin @project https://github.com/itfsw/mybatis-generator-plugin
--> -->
insert into dc_base_sku insert into dc_base_sku
(id, bailun_sku, sku_image, category_id, category_name, warehouse_code, warehouse_name, (id, bailun_sku, sku_image, category_id, category_name, unit_price, seller_id, seller_name,
unit_price, seller_id, seller_name, length, width, height, weight, moq, sku_title_cn, length, width, height, weight, moq, sku_title_cn, sku_title_en, create_time, update_time,
sku_title_en, create_time, update_time, gmt_create, gmt_modified, suppliers_id, gmt_create, gmt_modified, suppliers_id, suppliers_name, supplier_delivery, currency,
suppliers_name, supplier_delivery, currency, buyer_name, buyer_id, internal_moq, buyer_name, buyer_id, internal_moq, bussiness_id, bussiness_name, status, type,
bussiness_id, bussiness_name, status, type, product_code, bailun_inner_sku, product_inner_code, product_code, bailun_inner_sku, product_inner_code, skums_id, suppliers_link, bailun_category_id,
skums_id, suppliers_link, bailun_category_id, bailun_category_name) bailun_category_name, color, specifications, create_name, update_name, virtual_price,
size_image, sales_price, enable, inspection_hours, bargainer, customs_code, declare_title_en,
declare_title_cn, pick_title_cn, pick_title_en, product_nature, charger_specifications,
packing_price, packing_name, packing_size, product_size, packing_weight, unit,
push_status, transfer_delivery, source, push_time, has_delete, develop_time, company_id
)
values values
(#{id,jdbcType=INTEGER}, #{bailunSku,jdbcType=VARCHAR}, #{skuImage,jdbcType=VARCHAR}, (#{id,jdbcType=INTEGER}, #{bailunSku,jdbcType=VARCHAR}, #{skuImage,jdbcType=VARCHAR},
#{categoryId,jdbcType=INTEGER}, #{categoryName,jdbcType=VARCHAR}, #{warehouseCode,jdbcType=VARCHAR}, #{categoryId,jdbcType=INTEGER}, #{categoryName,jdbcType=VARCHAR}, #{unitPrice,jdbcType=DECIMAL},
#{warehouseName,jdbcType=VARCHAR}, #{unitPrice,jdbcType=DECIMAL}, #{sellerId,jdbcType=INTEGER}, #{sellerId,jdbcType=INTEGER}, #{sellerName,jdbcType=VARCHAR}, #{length,jdbcType=DECIMAL},
#{sellerName,jdbcType=VARCHAR}, #{length,jdbcType=DECIMAL}, #{width,jdbcType=DECIMAL}, #{width,jdbcType=DECIMAL}, #{height,jdbcType=DECIMAL}, #{weight,jdbcType=DECIMAL},
#{height,jdbcType=DECIMAL}, #{weight,jdbcType=DECIMAL}, #{moq,jdbcType=INTEGER}, #{moq,jdbcType=INTEGER}, #{skuTitleCn,jdbcType=VARCHAR}, #{skuTitleEn,jdbcType=VARCHAR},
#{skuTitleCn,jdbcType=VARCHAR}, #{skuTitleEn,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{gmtCreate,jdbcType=TIMESTAMP},
#{updateTime,jdbcType=TIMESTAMP}, #{gmtCreate,jdbcType=TIMESTAMP}, #{gmtModified,jdbcType=TIMESTAMP}, #{gmtModified,jdbcType=TIMESTAMP}, #{suppliersId,jdbcType=INTEGER}, #{suppliersName,jdbcType=VARCHAR},
#{suppliersId,jdbcType=INTEGER}, #{suppliersName,jdbcType=VARCHAR}, #{supplierDelivery,jdbcType=INTEGER}, #{supplierDelivery,jdbcType=INTEGER}, #{currency,jdbcType=VARCHAR}, #{buyerName,jdbcType=VARCHAR},
#{currency,jdbcType=VARCHAR}, #{buyerName,jdbcType=VARCHAR}, #{buyerId,jdbcType=INTEGER}, #{buyerId,jdbcType=INTEGER}, #{internalMoq,jdbcType=INTEGER}, #{bussinessId,jdbcType=INTEGER},
#{internalMoq,jdbcType=INTEGER}, #{bussinessId,jdbcType=INTEGER}, #{bussinessName,jdbcType=VARCHAR}, #{bussinessName,jdbcType=VARCHAR}, #{status,jdbcType=TINYINT}, #{type,jdbcType=TINYINT},
#{status,jdbcType=TINYINT}, #{type,jdbcType=TINYINT}, #{productCode,jdbcType=VARCHAR}, #{productCode,jdbcType=VARCHAR}, #{bailunInnerSku,jdbcType=VARCHAR}, #{productInnerCode,jdbcType=VARCHAR},
#{bailunInnerSku,jdbcType=VARCHAR}, #{productInnerCode,jdbcType=VARCHAR}, #{skumsId,jdbcType=INTEGER}, #{skumsId,jdbcType=INTEGER}, #{suppliersLink,jdbcType=VARCHAR}, #{bailunCategoryId,jdbcType=INTEGER},
#{suppliersLink,jdbcType=VARCHAR}, #{bailunCategoryId,jdbcType=INTEGER}, #{bailunCategoryName,jdbcType=VARCHAR} #{bailunCategoryName,jdbcType=VARCHAR}, #{color,jdbcType=VARCHAR}, #{specifications,jdbcType=VARCHAR},
) #{createName,jdbcType=VARCHAR}, #{updateName,jdbcType=VARCHAR}, #{virtualPrice,jdbcType=DECIMAL},
#{sizeImage,jdbcType=VARCHAR}, #{salesPrice,jdbcType=DECIMAL}, #{enable,jdbcType=TINYINT},
#{inspectionHours,jdbcType=DECIMAL}, #{bargainer,jdbcType=VARCHAR}, #{customsCode,jdbcType=VARCHAR},
#{declareTitleEn,jdbcType=VARCHAR}, #{declareTitleCn,jdbcType=VARCHAR}, #{pickTitleCn,jdbcType=VARCHAR},
#{pickTitleEn,jdbcType=VARCHAR}, #{productNature,jdbcType=VARCHAR}, #{chargerSpecifications,jdbcType=VARCHAR},
#{packingPrice,jdbcType=DECIMAL}, #{packingName,jdbcType=VARCHAR}, #{packingSize,jdbcType=VARCHAR},
#{productSize,jdbcType=VARCHAR}, #{packingWeight,jdbcType=DECIMAL}, #{unit,jdbcType=VARCHAR},
#{pushStatus,jdbcType=TINYINT}, #{transferDelivery,jdbcType=INTEGER}, #{source,jdbcType=TINYINT},
#{pushTime,jdbcType=TIMESTAMP}, #{hasDelete,jdbcType=BIT}, #{developTime,jdbcType=TIMESTAMP},
#{companyId,jdbcType=INTEGER})
on duplicate key update on duplicate key update
id = #{id,jdbcType=INTEGER}, id = #{id,jdbcType=INTEGER},
bailun_sku = #{bailunSku,jdbcType=VARCHAR}, bailun_sku = #{bailunSku,jdbcType=VARCHAR},
sku_image = #{skuImage,jdbcType=VARCHAR}, sku_image = #{skuImage,jdbcType=VARCHAR},
category_id = #{categoryId,jdbcType=INTEGER}, category_id = #{categoryId,jdbcType=INTEGER},
category_name = #{categoryName,jdbcType=VARCHAR}, category_name = #{categoryName,jdbcType=VARCHAR},
warehouse_code = #{warehouseCode,jdbcType=VARCHAR},
warehouse_name = #{warehouseName,jdbcType=VARCHAR},
unit_price = #{unitPrice,jdbcType=DECIMAL}, unit_price = #{unitPrice,jdbcType=DECIMAL},
seller_id = #{sellerId,jdbcType=INTEGER}, seller_id = #{sellerId,jdbcType=INTEGER},
seller_name = #{sellerName,jdbcType=VARCHAR}, seller_name = #{sellerName,jdbcType=VARCHAR},
...@@ -1228,10 +1934,10 @@ ...@@ -1228,10 +1934,10 @@
moq = #{moq,jdbcType=INTEGER}, moq = #{moq,jdbcType=INTEGER},
sku_title_cn = #{skuTitleCn,jdbcType=VARCHAR}, sku_title_cn = #{skuTitleCn,jdbcType=VARCHAR},
sku_title_en = #{skuTitleEn,jdbcType=VARCHAR}, sku_title_en = #{skuTitleEn,jdbcType=VARCHAR},
create_time = #{createTime,jdbcType=TIMESTAMP}, create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP}, update_time = #{updateTime,jdbcType=TIMESTAMP},
gmt_create = #{gmtCreate,jdbcType=TIMESTAMP}, gmt_create = #{gmtCreate,jdbcType=TIMESTAMP},
gmt_modified = #{gmtModified,jdbcType=TIMESTAMP}, gmt_modified = #{gmtModified,jdbcType=TIMESTAMP},
suppliers_id = #{suppliersId,jdbcType=INTEGER}, suppliers_id = #{suppliersId,jdbcType=INTEGER},
suppliers_name = #{suppliersName,jdbcType=VARCHAR}, suppliers_name = #{suppliersName,jdbcType=VARCHAR},
supplier_delivery = #{supplierDelivery,jdbcType=INTEGER}, supplier_delivery = #{supplierDelivery,jdbcType=INTEGER},
...@@ -1249,7 +1955,37 @@ ...@@ -1249,7 +1955,37 @@
skums_id = #{skumsId,jdbcType=INTEGER}, skums_id = #{skumsId,jdbcType=INTEGER},
suppliers_link = #{suppliersLink,jdbcType=VARCHAR}, suppliers_link = #{suppliersLink,jdbcType=VARCHAR},
bailun_category_id = #{bailunCategoryId,jdbcType=INTEGER}, bailun_category_id = #{bailunCategoryId,jdbcType=INTEGER},
bailun_category_name = #{bailunCategoryName,jdbcType=VARCHAR} bailun_category_name = #{bailunCategoryName,jdbcType=VARCHAR},
color = #{color,jdbcType=VARCHAR},
specifications = #{specifications,jdbcType=VARCHAR},
create_name = #{createName,jdbcType=VARCHAR},
update_name = #{updateName,jdbcType=VARCHAR},
virtual_price = #{virtualPrice,jdbcType=DECIMAL},
size_image = #{sizeImage,jdbcType=VARCHAR},
sales_price = #{salesPrice,jdbcType=DECIMAL},
enable = #{enable,jdbcType=TINYINT},
inspection_hours = #{inspectionHours,jdbcType=DECIMAL},
bargainer = #{bargainer,jdbcType=VARCHAR},
customs_code = #{customsCode,jdbcType=VARCHAR},
declare_title_en = #{declareTitleEn,jdbcType=VARCHAR},
declare_title_cn = #{declareTitleCn,jdbcType=VARCHAR},
pick_title_cn = #{pickTitleCn,jdbcType=VARCHAR},
pick_title_en = #{pickTitleEn,jdbcType=VARCHAR},
product_nature = #{productNature,jdbcType=VARCHAR},
charger_specifications = #{chargerSpecifications,jdbcType=VARCHAR},
packing_price = #{packingPrice,jdbcType=DECIMAL},
packing_name = #{packingName,jdbcType=VARCHAR},
packing_size = #{packingSize,jdbcType=VARCHAR},
product_size = #{productSize,jdbcType=VARCHAR},
packing_weight = #{packingWeight,jdbcType=DECIMAL},
unit = #{unit,jdbcType=VARCHAR},
push_status = #{pushStatus,jdbcType=TINYINT},
transfer_delivery = #{transferDelivery,jdbcType=INTEGER},
source = #{source,jdbcType=TINYINT},
push_time = #{pushTime,jdbcType=TIMESTAMP},
has_delete = #{hasDelete,jdbcType=BIT},
develop_time = #{developTime,jdbcType=TIMESTAMP},
company_id = #{companyId,jdbcType=INTEGER}
</insert> </insert>
<select id="selectOneByExample" parameterType="com.bailuntec.domain.example.DcBaseSkuExample" resultMap="BaseResultMap"> <select id="selectOneByExample" parameterType="com.bailuntec.domain.example.DcBaseSkuExample" resultMap="BaseResultMap">
<!-- <!--
...@@ -1268,5 +2004,4 @@ ...@@ -1268,5 +2004,4 @@
</if> </if>
limit 1 limit 1
</select> </select>
</mapper> </mapper>
\ No newline at end of file
data-base/base-sync-oms-order/src/test/java/OmsOrderTest.java
...@@ -73,7 +73,7 @@ public class OmsOrderTest { ...@@ -73,7 +73,7 @@ public class OmsOrderTest {
LinkedHashMap<String, String> map = new LinkedHashMap<>(4); LinkedHashMap<String, String> map = new LinkedHashMap<>(4);
map.put("pageIndex", "1"); map.put("pageIndex", "1");
map.put("pageCount", "100"); map.put("pageCount", "100");
map.put("OriginOrderNo", "257164872019"); map.put("OriginOrderNo", "102409853402432");
Request request = new Request.Builder() Request request = new Request.Builder()
.get() .get()
.url(OkHttpUtil.attachHttpGetParams("http://oms.bailuntec.com/apiV2/bailunOrder/getBailunOrders", map)) .url(OkHttpUtil.attachHttpGetParams("http://oms.bailuntec.com/apiV2/bailunOrder/getBailunOrders", map))
......
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