Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
dc-java
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
bltdc
dc-java
Commits
9ccfcdde
Commit
9ccfcdde
authored
Apr 13, 2019
by
wutong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
订单-SKU维度添加物流方式, 并修复配货单信息逻辑删除误标的问题
parent
1f46cd91
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
245 additions
and
16 deletions
+245
-16
OrderSyncJob.java
...s-order/src/main/java/com/bailuntec/job/OrderSyncJob.java
+17
-7
DcBaseOmsSkuMapper.xml
...src/main/java/com/bailuntec/mapper/DcBaseOmsSkuMapper.xml
+62
-8
DcBaseOmsSku.java
...c/main/java/com/bailuntec/domain/entity/DcBaseOmsSku.java
+26
-1
DcBaseOmsSkuExample.java
...ava/com/bailuntec/domain/example/DcBaseOmsSkuExample.java
+140
-0
No files found.
data-base/base-sync-oms-order/src/main/java/com/bailuntec/job/OrderSyncJob.java
View file @
9ccfcdde
...
@@ -140,6 +140,10 @@ public class OrderSyncJob extends PointJob {
...
@@ -140,6 +140,10 @@ public class OrderSyncJob extends PointJob {
}
}
}
}
}
}
//这个MAP, key放仓库. value放线物流路
HashMap
<
String
,
Logistics
>
logisticsHashMap
=
new
HashMap
<>();
//由LMS线路计算的物流费
BigDecimal
totalCostLogistics
=
getTotalCostLogistics
(
omsResult
.
getLogisticsItems
(),
logisticsHashMap
);
//如果订单中存在百伦SKU, 去拿一些放在SKU里的信息
//如果订单中存在百伦SKU, 去拿一些放在SKU里的信息
Map
<
String
,
BailunSkuStructure
>
bailunSkuInfoMap
=
new
HashMap
<>();
Map
<
String
,
BailunSkuStructure
>
bailunSkuInfoMap
=
new
HashMap
<>();
BigDecimal
totalCostFirst
=
BigDecimal
.
ZERO
;
BigDecimal
totalCostFirst
=
BigDecimal
.
ZERO
;
...
@@ -169,7 +173,7 @@ public class OrderSyncJob extends PointJob {
...
@@ -169,7 +173,7 @@ public class OrderSyncJob extends PointJob {
/*
/*
* 赋值, 初始值避免null
* 赋值, 初始值避免null
*/
*/
assignmentSkuInfo
(
omsResult
,
dcBaseOmsOrder
,
dcBaseOmsSku
,
bailunSku
,
dcBaseWarehouse
,
saleItemHashMap
);
assignmentSkuInfo
(
omsResult
,
dcBaseOmsOrder
,
dcBaseOmsSku
,
bailunSku
,
dcBaseWarehouse
,
saleItemHashMap
,
logisticsHashMap
);
if
(
PlatformType
.
FBA
.
value
().
equals
(
omsResult
.
getPlatformType
().
toUpperCase
()))
{
if
(
PlatformType
.
FBA
.
value
().
equals
(
omsResult
.
getPlatformType
().
toUpperCase
()))
{
//FBA费用
//FBA费用
BigDecimal
skuCostFbaFee
=
bailunSkuStructure
.
getSkuWeightRatio
().
multiply
(
dcBaseOmsOrder
.
getCostFbaFee
()).
setScale
(
3
,
RoundingMode
.
HALF_EVEN
);
BigDecimal
skuCostFbaFee
=
bailunSkuStructure
.
getSkuWeightRatio
().
multiply
(
dcBaseOmsOrder
.
getCostFbaFee
()).
setScale
(
3
,
RoundingMode
.
HALF_EVEN
);
...
@@ -201,8 +205,6 @@ public class OrderSyncJob extends PointJob {
...
@@ -201,8 +205,6 @@ public class OrderSyncJob extends PointJob {
totalAmountSale
=
omsResult
.
getOrderCharge
().
getAmountTotal
().
getAmount
();
totalAmountSale
=
omsResult
.
getOrderCharge
().
getAmountTotal
().
getAmount
();
dcBaseOmsOrder
.
setAmountProduct
(
omsResult
.
getOrderCharge
().
getAmountTotal
().
getAmount
());
dcBaseOmsOrder
.
setAmountProduct
(
omsResult
.
getOrderCharge
().
getAmountTotal
().
getAmount
());
}
}
//由LMS线路计算的物流费
BigDecimal
totalCostLogistics
=
getTotalCostLogistics
(
omsResult
.
getLogisticsItems
());
//销售额
//销售额
dcBaseOmsOrder
.
setAmountSales
(
totalAmountSale
.
add
(
dcBaseOmsOrder
.
getAmountShipping
()).
add
(
dcBaseOmsOrder
.
getAmountGiftWrap
()).
subtract
(
dcBaseOmsOrder
.
getCostPromotion
()));
dcBaseOmsOrder
.
setAmountSales
(
totalAmountSale
.
add
(
dcBaseOmsOrder
.
getAmountShipping
()).
add
(
dcBaseOmsOrder
.
getAmountGiftWrap
()).
subtract
(
dcBaseOmsOrder
.
getCostPromotion
()));
//平台渠道费
//平台渠道费
...
@@ -386,7 +388,6 @@ public class OrderSyncJob extends PointJob {
...
@@ -386,7 +388,6 @@ public class OrderSyncJob extends PointJob {
omsOrderMapper
.
insertSelective
(
dcBaseOmsOrder
);
omsOrderMapper
.
insertSelective
(
dcBaseOmsOrder
);
}
}
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
throw
new
RuntimeException
(
"Mybatis操作DB失败"
,
e
);
throw
new
RuntimeException
(
"Mybatis操作DB失败"
,
e
);
}
finally
{
}
finally
{
SessionUtil
.
closeSession
();
SessionUtil
.
closeSession
();
...
@@ -406,13 +407,16 @@ public class OrderSyncJob extends PointJob {
...
@@ -406,13 +407,16 @@ public class OrderSyncJob extends PointJob {
}
}
}
}
private
BigDecimal
getTotalCostLogistics
(
List
<
LogisticsItem
>
logisticsItems
)
{
private
BigDecimal
getTotalCostLogistics
(
List
<
LogisticsItem
>
logisticsItems
,
HashMap
<
String
,
Logistics
>
logisticsHashMap
)
{
BigDecimal
totalCostLogistics
=
BigDecimal
.
ZERO
;
BigDecimal
totalCostLogistics
=
BigDecimal
.
ZERO
;
if
(
logisticsItems
!=
null
&&
logisticsItems
.
size
()
>
0
)
{
if
(
logisticsItems
!=
null
&&
logisticsItems
.
size
()
>
0
)
{
for
(
LogisticsItem
logisticsItem
:
logisticsItems
)
{
for
(
LogisticsItem
logisticsItem
:
logisticsItems
)
{
if
(
logisticsItem
.
getLogisticsCost
()
!=
null
&&
logisticsItem
.
getLogisticsCost
().
getAmount
()
!=
null
)
{
if
(
logisticsItem
.
getLogisticsCost
()
!=
null
&&
logisticsItem
.
getLogisticsCost
().
getAmount
()
!=
null
)
{
totalCostLogistics
=
totalCostLogistics
.
add
(
logisticsItem
.
getLogisticsCost
().
getAmount
());
totalCostLogistics
=
totalCostLogistics
.
add
(
logisticsItem
.
getLogisticsCost
().
getAmount
());
}
}
if
(
logisticsItem
.
getWarehouse
()
!=
null
&&
StringUtils
.
isNotBlank
(
logisticsItem
.
getWarehouse
().
getWarehouseCode
()))
{
logisticsHashMap
.
put
(
logisticsItem
.
getWarehouse
().
getWarehouseCode
(),
logisticsItem
.
getLogisticsMethod
());
}
}
}
}
}
return
totalCostLogistics
;
return
totalCostLogistics
;
...
@@ -602,6 +606,7 @@ public class OrderSyncJob extends PointJob {
...
@@ -602,6 +606,7 @@ public class OrderSyncJob extends PointJob {
DcBaseOmsPick
dcBaseOmsPick
=
new
DcBaseOmsPick
();
DcBaseOmsPick
dcBaseOmsPick
=
new
DcBaseOmsPick
();
BailunSkuStructure
bailunSkuStructure
=
skuStructureMap
.
get
(
pickingItem
.
getBailunSku
());
BailunSkuStructure
bailunSkuStructure
=
skuStructureMap
.
get
(
pickingItem
.
getBailunSku
());
BigDecimal
weightRatio
=
bailunSkuStructure
!=
null
?
bailunSkuStructure
.
getSkuWeightRatio
()
:
BigDecimal
.
ONE
;
BigDecimal
weightRatio
=
bailunSkuStructure
!=
null
?
bailunSkuStructure
.
getSkuWeightRatio
()
:
BigDecimal
.
ONE
;
dcBaseOmsPick
.
setHasDelete
(
false
);
dcBaseOmsPick
.
setCostPackaging
(
skuCostPackaging
);
dcBaseOmsPick
.
setCostPackaging
(
skuCostPackaging
);
dcBaseOmsPick
.
setCostShipping
(
skuCostShipping
);
dcBaseOmsPick
.
setCostShipping
(
skuCostShipping
);
dcBaseOmsPick
.
setOutboundWeight
(
outboundWeight
);
dcBaseOmsPick
.
setOutboundWeight
(
outboundWeight
);
...
@@ -810,15 +815,20 @@ public class OrderSyncJob extends PointJob {
...
@@ -810,15 +815,20 @@ public class OrderSyncJob extends PointJob {
*
*
* @param dcBaseOmsSku
* @param dcBaseOmsSku
* @param saleItemHashMap
* @param saleItemHashMap
* @param
isFbaFeeException
* @param
logisticsHashMap
* @return
* @return
*/
*/
public
void
assignmentSkuInfo
(
OmsResult
omsResult
,
DcBaseOmsOrder
dcBaseOmsOrder
,
DcBaseOmsSku
dcBaseOmsSku
,
BailunSku
bailunSku
,
DcBaseWarehouse
dcBaseWarehouse
,
HashMap
<
String
,
String
>
saleItemHashMap
)
{
public
void
assignmentSkuInfo
(
OmsResult
omsResult
,
DcBaseOmsOrder
dcBaseOmsOrder
,
DcBaseOmsSku
dcBaseOmsSku
,
BailunSku
bailunSku
,
DcBaseWarehouse
dcBaseWarehouse
,
HashMap
<
String
,
String
>
saleItemHashMap
,
HashMap
<
String
,
Logistics
>
logisticsHashMap
)
{
dcBaseOmsSku
.
setBailunInterceptionStatus
(
dcBaseOmsOrder
.
getBailunInterceptionStatus
());
dcBaseOmsSku
.
setBailunInterceptionStatus
(
dcBaseOmsOrder
.
getBailunInterceptionStatus
());
dcBaseOmsSku
.
setBailunSku
(
bailunSku
.
getBailunSku
());
dcBaseOmsSku
.
setBailunSku
(
bailunSku
.
getBailunSku
());
if
(
dcBaseWarehouse
!=
null
)
{
if
(
dcBaseWarehouse
!=
null
)
{
dcBaseOmsSku
.
setWarehouseCode
(
dcBaseWarehouse
.
getWarehouseCode
());
dcBaseOmsSku
.
setWarehouseCode
(
dcBaseWarehouse
.
getWarehouseCode
());
dcBaseOmsSku
.
setWarehouseName
(
dcBaseWarehouse
.
getWarehouseName
());
dcBaseOmsSku
.
setWarehouseName
(
dcBaseWarehouse
.
getWarehouseName
());
Logistics
logistics
=
logisticsHashMap
.
get
(
dcBaseWarehouse
.
getWarehouseCode
());
if
(
logistics
!=
null
)
{
dcBaseOmsSku
.
setLogisticsMethodCode
(
logistics
.
getLogisticsCode
());
dcBaseOmsSku
.
setLogisticsMethodName
(
logistics
.
getLogisticsName
());
}
}
}
dcBaseOmsSku
.
setAreaId
(
omsResult
.
getAreaId
());
dcBaseOmsSku
.
setAreaId
(
omsResult
.
getAreaId
());
dcBaseOmsSku
.
setHasCancle
(
omsResult
.
getHasCancle
());
dcBaseOmsSku
.
setHasCancle
(
omsResult
.
getHasCancle
());
...
...
data-base/base-sync-oms-order/src/main/java/com/bailuntec/mapper/DcBaseOmsSkuMapper.xml
View file @
9ccfcdde
...
@@ -105,6 +105,8 @@
...
@@ -105,6 +105,8 @@
<result
column=
"bailun_require_logistics"
jdbcType=
"VARCHAR"
property=
"bailunRequireLogistics"
/>
<result
column=
"bailun_require_logistics"
jdbcType=
"VARCHAR"
property=
"bailunRequireLogistics"
/>
<result
column=
"has_delete"
jdbcType=
"BIT"
property=
"hasDelete"
/>
<result
column=
"has_delete"
jdbcType=
"BIT"
property=
"hasDelete"
/>
<result
column=
"has_scalp"
jdbcType=
"BIT"
property=
"hasScalp"
/>
<result
column=
"has_scalp"
jdbcType=
"BIT"
property=
"hasScalp"
/>
<result
column=
"logistics_method_code"
jdbcType=
"VARCHAR"
property=
"logisticsMethodCode"
/>
<result
column=
"logistics_method_name"
jdbcType=
"VARCHAR"
property=
"logisticsMethodName"
/>
</resultMap>
</resultMap>
<sql
id=
"Example_Where_Clause"
>
<sql
id=
"Example_Where_Clause"
>
<!--
<!--
...
@@ -196,7 +198,7 @@
...
@@ -196,7 +198,7 @@
receiver, receiver_phone, buyer_id, buyer_name, buyer_email, has_fba_exception, has_platform_exception,
receiver, receiver_phone, buyer_id, buyer_name, buyer_email, has_fba_exception, has_platform_exception,
has_cancle, area_id, bailun_category_id, bailun_category_name, gmt_create, gmt_modified,
has_cancle, area_id, bailun_category_id, bailun_category_name, gmt_create, gmt_modified,
ratio_weight, ratio_price, bailun_picking_status, bailun_require_logistics, has_delete,
ratio_weight, ratio_price, bailun_picking_status, bailun_require_logistics, has_delete,
has_scalp
has_scalp
, logistics_method_code, logistics_method_name
</sql>
</sql>
<select
id=
"selectByExample"
parameterType=
"com.bailuntec.domain.example.DcBaseOmsSkuExample"
resultMap=
"BaseResultMap"
>
<select
id=
"selectByExample"
parameterType=
"com.bailuntec.domain.example.DcBaseOmsSkuExample"
resultMap=
"BaseResultMap"
>
<!--
<!--
...
@@ -293,7 +295,8 @@
...
@@ -293,7 +295,8 @@
bailun_category_id, bailun_category_name, gmt_create,
bailun_category_id, bailun_category_name, gmt_create,
gmt_modified, ratio_weight, ratio_price,
gmt_modified, ratio_weight, ratio_price,
bailun_picking_status, bailun_require_logistics,
bailun_picking_status, bailun_require_logistics,
has_delete, has_scalp)
has_delete, has_scalp, logistics_method_code,
logistics_method_name)
values (#{id,jdbcType=INTEGER}, #{originOrderId,jdbcType=VARCHAR}, #{platformType,jdbcType=VARCHAR},
values (#{id,jdbcType=INTEGER}, #{originOrderId,jdbcType=VARCHAR}, #{platformType,jdbcType=VARCHAR},
#{transactionId,jdbcType=VARCHAR}, #{payTime,jdbcType=TIMESTAMP}, #{payMethod,jdbcType=VARCHAR},
#{transactionId,jdbcType=VARCHAR}, #{payTime,jdbcType=TIMESTAMP}, #{payMethod,jdbcType=VARCHAR},
#{payAccount,jdbcType=VARCHAR}, #{payStatus,jdbcType=VARCHAR}, #{collectionAccount,jdbcType=VARCHAR},
#{payAccount,jdbcType=VARCHAR}, #{payStatus,jdbcType=VARCHAR}, #{collectionAccount,jdbcType=VARCHAR},
...
@@ -330,7 +333,8 @@
...
@@ -330,7 +333,8 @@
#{bailunCategoryId,jdbcType=INTEGER}, #{bailunCategoryName,jdbcType=VARCHAR}, #{gmtCreate,jdbcType=TIMESTAMP},
#{bailunCategoryId,jdbcType=INTEGER}, #{bailunCategoryName,jdbcType=VARCHAR}, #{gmtCreate,jdbcType=TIMESTAMP},
#{gmtModified,jdbcType=TIMESTAMP}, #{ratioWeight,jdbcType=DECIMAL}, #{ratioPrice,jdbcType=DECIMAL},
#{gmtModified,jdbcType=TIMESTAMP}, #{ratioWeight,jdbcType=DECIMAL}, #{ratioPrice,jdbcType=DECIMAL},
#{bailunPickingStatus,jdbcType=VARCHAR}, #{bailunRequireLogistics,jdbcType=VARCHAR},
#{bailunPickingStatus,jdbcType=VARCHAR}, #{bailunRequireLogistics,jdbcType=VARCHAR},
#{hasDelete,jdbcType=BIT}, #{hasScalp,jdbcType=BIT})
#{hasDelete,jdbcType=BIT}, #{hasScalp,jdbcType=BIT}, #{logisticsMethodCode,jdbcType=VARCHAR},
#{logisticsMethodName,jdbcType=VARCHAR})
</insert>
</insert>
<insert
id=
"insertSelective"
parameterType=
"com.bailuntec.domain.entity.DcBaseOmsSku"
>
<insert
id=
"insertSelective"
parameterType=
"com.bailuntec.domain.entity.DcBaseOmsSku"
>
<!--
<!--
...
@@ -636,6 +640,12 @@
...
@@ -636,6 +640,12 @@
<if
test=
"hasScalp != null"
>
<if
test=
"hasScalp != null"
>
has_scalp,
has_scalp,
</if>
</if>
<if
test=
"logisticsMethodCode != null"
>
logistics_method_code,
</if>
<if
test=
"logisticsMethodName != null"
>
logistics_method_name,
</if>
</trim>
</trim>
<trim
prefix=
"values ("
suffix=
")"
suffixOverrides=
","
>
<trim
prefix=
"values ("
suffix=
")"
suffixOverrides=
","
>
<if
test=
"id != null"
>
<if
test=
"id != null"
>
...
@@ -935,6 +945,12 @@
...
@@ -935,6 +945,12 @@
<if
test=
"hasScalp != null"
>
<if
test=
"hasScalp != null"
>
#{hasScalp,jdbcType=BIT},
#{hasScalp,jdbcType=BIT},
</if>
</if>
<if
test=
"logisticsMethodCode != null"
>
#{logisticsMethodCode,jdbcType=VARCHAR},
</if>
<if
test=
"logisticsMethodName != null"
>
#{logisticsMethodName,jdbcType=VARCHAR},
</if>
</trim>
</trim>
</insert>
</insert>
<select
id=
"countByExample"
parameterType=
"com.bailuntec.domain.example.DcBaseOmsSkuExample"
resultType=
"java.lang.Long"
>
<select
id=
"countByExample"
parameterType=
"com.bailuntec.domain.example.DcBaseOmsSkuExample"
resultType=
"java.lang.Long"
>
...
@@ -1251,6 +1267,12 @@
...
@@ -1251,6 +1267,12 @@
<if
test=
"record.hasScalp != null"
>
<if
test=
"record.hasScalp != null"
>
has_scalp = #{record.hasScalp,jdbcType=BIT},
has_scalp = #{record.hasScalp,jdbcType=BIT},
</if>
</if>
<if
test=
"record.logisticsMethodCode != null"
>
logistics_method_code = #{record.logisticsMethodCode,jdbcType=VARCHAR},
</if>
<if
test=
"record.logisticsMethodName != null"
>
logistics_method_name = #{record.logisticsMethodName,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"
/>
...
@@ -1360,7 +1382,9 @@
...
@@ -1360,7 +1382,9 @@
bailun_picking_status = #{record.bailunPickingStatus,jdbcType=VARCHAR},
bailun_picking_status = #{record.bailunPickingStatus,jdbcType=VARCHAR},
bailun_require_logistics = #{record.bailunRequireLogistics,jdbcType=VARCHAR},
bailun_require_logistics = #{record.bailunRequireLogistics,jdbcType=VARCHAR},
has_delete = #{record.hasDelete,jdbcType=BIT},
has_delete = #{record.hasDelete,jdbcType=BIT},
has_scalp = #{record.hasScalp,jdbcType=BIT}
has_scalp = #{record.hasScalp,jdbcType=BIT},
logistics_method_code = #{record.logisticsMethodCode,jdbcType=VARCHAR},
logistics_method_name = #{record.logisticsMethodName,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>
...
@@ -1666,6 +1690,12 @@
...
@@ -1666,6 +1690,12 @@
<if
test=
"hasScalp != null"
>
<if
test=
"hasScalp != null"
>
has_scalp = #{hasScalp,jdbcType=BIT},
has_scalp = #{hasScalp,jdbcType=BIT},
</if>
</if>
<if
test=
"logisticsMethodCode != null"
>
logistics_method_code = #{logisticsMethodCode,jdbcType=VARCHAR},
</if>
<if
test=
"logisticsMethodName != null"
>
logistics_method_name = #{logisticsMethodName,jdbcType=VARCHAR},
</if>
</set>
</set>
where id = #{id,jdbcType=INTEGER}
where id = #{id,jdbcType=INTEGER}
</update>
</update>
...
@@ -1772,7 +1802,9 @@
...
@@ -1772,7 +1802,9 @@
bailun_picking_status = #{bailunPickingStatus,jdbcType=VARCHAR},
bailun_picking_status = #{bailunPickingStatus,jdbcType=VARCHAR},
bailun_require_logistics = #{bailunRequireLogistics,jdbcType=VARCHAR},
bailun_require_logistics = #{bailunRequireLogistics,jdbcType=VARCHAR},
has_delete = #{hasDelete,jdbcType=BIT},
has_delete = #{hasDelete,jdbcType=BIT},
has_scalp = #{hasScalp,jdbcType=BIT}
has_scalp = #{hasScalp,jdbcType=BIT},
logistics_method_code = #{logisticsMethodCode,jdbcType=VARCHAR},
logistics_method_name = #{logisticsMethodName,jdbcType=VARCHAR}
where id = #{id,jdbcType=INTEGER}
where id = #{id,jdbcType=INTEGER}
</update>
</update>
<insert
id=
"upsertSelective"
parameterType=
"com.bailuntec.domain.entity.DcBaseOmsSku"
>
<insert
id=
"upsertSelective"
parameterType=
"com.bailuntec.domain.entity.DcBaseOmsSku"
>
...
@@ -2080,6 +2112,12 @@
...
@@ -2080,6 +2112,12 @@
<if
test=
"hasScalp != null"
>
<if
test=
"hasScalp != null"
>
has_scalp,
has_scalp,
</if>
</if>
<if
test=
"logisticsMethodCode != null"
>
logistics_method_code,
</if>
<if
test=
"logisticsMethodName != null"
>
logistics_method_name,
</if>
</trim>
</trim>
values
values
<trim
prefix=
"("
suffix=
")"
suffixOverrides=
","
>
<trim
prefix=
"("
suffix=
")"
suffixOverrides=
","
>
...
@@ -2380,6 +2418,12 @@
...
@@ -2380,6 +2418,12 @@
<if
test=
"hasScalp != null"
>
<if
test=
"hasScalp != null"
>
#{hasScalp,jdbcType=BIT},
#{hasScalp,jdbcType=BIT},
</if>
</if>
<if
test=
"logisticsMethodCode != null"
>
#{logisticsMethodCode,jdbcType=VARCHAR},
</if>
<if
test=
"logisticsMethodName != null"
>
#{logisticsMethodName,jdbcType=VARCHAR},
</if>
</trim>
</trim>
on duplicate key update
on duplicate key update
<trim
suffixOverrides=
","
>
<trim
suffixOverrides=
","
>
...
@@ -2680,6 +2724,12 @@
...
@@ -2680,6 +2724,12 @@
<if
test=
"hasScalp != null"
>
<if
test=
"hasScalp != null"
>
has_scalp = #{hasScalp,jdbcType=BIT},
has_scalp = #{hasScalp,jdbcType=BIT},
</if>
</if>
<if
test=
"logisticsMethodCode != null"
>
logistics_method_code = #{logisticsMethodCode,jdbcType=VARCHAR},
</if>
<if
test=
"logisticsMethodName != null"
>
logistics_method_name = #{logisticsMethodName,jdbcType=VARCHAR},
</if>
</trim>
</trim>
</insert>
</insert>
<insert
id=
"upsert"
parameterType=
"com.bailuntec.domain.entity.DcBaseOmsSku"
>
<insert
id=
"upsert"
parameterType=
"com.bailuntec.domain.entity.DcBaseOmsSku"
>
...
@@ -2708,7 +2758,8 @@
...
@@ -2708,7 +2758,8 @@
receipt_postal_code, receiver, receiver_phone, buyer_id, buyer_name, buyer_email,
receipt_postal_code, receiver, receiver_phone, buyer_id, buyer_name, buyer_email,
has_fba_exception, has_platform_exception, has_cancle, area_id, bailun_category_id,
has_fba_exception, has_platform_exception, has_cancle, area_id, bailun_category_id,
bailun_category_name, gmt_create, gmt_modified, ratio_weight, ratio_price, bailun_picking_status,
bailun_category_name, gmt_create, gmt_modified, ratio_weight, ratio_price, bailun_picking_status,
bailun_require_logistics, has_delete, has_scalp)
bailun_require_logistics, has_delete, has_scalp, logistics_method_code, logistics_method_name
)
values
values
(#{id,jdbcType=INTEGER}, #{originOrderId,jdbcType=VARCHAR}, #{platformType,jdbcType=VARCHAR},
(#{id,jdbcType=INTEGER}, #{originOrderId,jdbcType=VARCHAR}, #{platformType,jdbcType=VARCHAR},
#{transactionId,jdbcType=VARCHAR}, #{payTime,jdbcType=TIMESTAMP}, #{payMethod,jdbcType=VARCHAR},
#{transactionId,jdbcType=VARCHAR}, #{payTime,jdbcType=TIMESTAMP}, #{payMethod,jdbcType=VARCHAR},
...
@@ -2746,7 +2797,8 @@
...
@@ -2746,7 +2797,8 @@
#{bailunCategoryId,jdbcType=INTEGER}, #{bailunCategoryName,jdbcType=VARCHAR}, #{gmtCreate,jdbcType=TIMESTAMP},
#{bailunCategoryId,jdbcType=INTEGER}, #{bailunCategoryName,jdbcType=VARCHAR}, #{gmtCreate,jdbcType=TIMESTAMP},
#{gmtModified,jdbcType=TIMESTAMP}, #{ratioWeight,jdbcType=DECIMAL}, #{ratioPrice,jdbcType=DECIMAL},
#{gmtModified,jdbcType=TIMESTAMP}, #{ratioWeight,jdbcType=DECIMAL}, #{ratioPrice,jdbcType=DECIMAL},
#{bailunPickingStatus,jdbcType=VARCHAR}, #{bailunRequireLogistics,jdbcType=VARCHAR},
#{bailunPickingStatus,jdbcType=VARCHAR}, #{bailunRequireLogistics,jdbcType=VARCHAR},
#{hasDelete,jdbcType=BIT}, #{hasScalp,jdbcType=BIT})
#{hasDelete,jdbcType=BIT}, #{hasScalp,jdbcType=BIT}, #{logisticsMethodCode,jdbcType=VARCHAR},
#{logisticsMethodName,jdbcType=VARCHAR})
on duplicate key update
on duplicate key update
id = #{id,jdbcType=INTEGER},
id = #{id,jdbcType=INTEGER},
origin_order_id = #{originOrderId,jdbcType=VARCHAR},
origin_order_id = #{originOrderId,jdbcType=VARCHAR},
...
@@ -2846,7 +2898,9 @@
...
@@ -2846,7 +2898,9 @@
bailun_picking_status = #{bailunPickingStatus,jdbcType=VARCHAR},
bailun_picking_status = #{bailunPickingStatus,jdbcType=VARCHAR},
bailun_require_logistics = #{bailunRequireLogistics,jdbcType=VARCHAR},
bailun_require_logistics = #{bailunRequireLogistics,jdbcType=VARCHAR},
has_delete = #{hasDelete,jdbcType=BIT},
has_delete = #{hasDelete,jdbcType=BIT},
has_scalp = #{hasScalp,jdbcType=BIT}
has_scalp = #{hasScalp,jdbcType=BIT},
logistics_method_code = #{logisticsMethodCode,jdbcType=VARCHAR},
logistics_method_name = #{logisticsMethodName,jdbcType=VARCHAR}
</insert>
</insert>
<select
id=
"selectOneByExample"
parameterType=
"com.bailuntec.domain.example.DcBaseOmsSkuExample"
resultMap=
"BaseResultMap"
>
<select
id=
"selectOneByExample"
parameterType=
"com.bailuntec.domain.example.DcBaseOmsSkuExample"
resultMap=
"BaseResultMap"
>
<!--
<!--
...
...
data-common/src/main/java/com/bailuntec/domain/entity/DcBaseOmsSku.java
View file @
9ccfcdde
...
@@ -899,6 +899,24 @@ public class DcBaseOmsSku {
...
@@ -899,6 +899,24 @@ public class DcBaseOmsSku {
private
Boolean
hasScalp
;
private
Boolean
hasScalp
;
/**
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_oms_sku.logistics_method_code
*
* @mbg.generated
*/
private
String
logisticsMethodCode
;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_oms_sku.logistics_method_name
*
* @mbg.generated
*/
private
String
logisticsMethodName
;
/**
* This method was generated by MyBatis Generator.
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_base_oms_sku
* This method corresponds to the database table dc_base_oms_sku
*
*
...
@@ -1009,6 +1027,8 @@ public class DcBaseOmsSku {
...
@@ -1009,6 +1027,8 @@ public class DcBaseOmsSku {
sb
.
append
(
", bailunRequireLogistics="
).
append
(
bailunRequireLogistics
);
sb
.
append
(
", bailunRequireLogistics="
).
append
(
bailunRequireLogistics
);
sb
.
append
(
", hasDelete="
).
append
(
hasDelete
);
sb
.
append
(
", hasDelete="
).
append
(
hasDelete
);
sb
.
append
(
", hasScalp="
).
append
(
hasScalp
);
sb
.
append
(
", hasScalp="
).
append
(
hasScalp
);
sb
.
append
(
", logisticsMethodCode="
).
append
(
logisticsMethodCode
);
sb
.
append
(
", logisticsMethodName="
).
append
(
logisticsMethodName
);
sb
.
append
(
"]"
);
sb
.
append
(
"]"
);
return
sb
.
toString
();
return
sb
.
toString
();
}
}
...
@@ -1129,7 +1149,9 @@ public class DcBaseOmsSku {
...
@@ -1129,7 +1149,9 @@ public class DcBaseOmsSku {
&&
(
this
.
getBailunPickingStatus
()
==
null
?
other
.
getBailunPickingStatus
()
==
null
:
this
.
getBailunPickingStatus
().
equals
(
other
.
getBailunPickingStatus
()))
&&
(
this
.
getBailunPickingStatus
()
==
null
?
other
.
getBailunPickingStatus
()
==
null
:
this
.
getBailunPickingStatus
().
equals
(
other
.
getBailunPickingStatus
()))
&&
(
this
.
getBailunRequireLogistics
()
==
null
?
other
.
getBailunRequireLogistics
()
==
null
:
this
.
getBailunRequireLogistics
().
equals
(
other
.
getBailunRequireLogistics
()))
&&
(
this
.
getBailunRequireLogistics
()
==
null
?
other
.
getBailunRequireLogistics
()
==
null
:
this
.
getBailunRequireLogistics
().
equals
(
other
.
getBailunRequireLogistics
()))
&&
(
this
.
getHasDelete
()
==
null
?
other
.
getHasDelete
()
==
null
:
this
.
getHasDelete
().
equals
(
other
.
getHasDelete
()))
&&
(
this
.
getHasDelete
()
==
null
?
other
.
getHasDelete
()
==
null
:
this
.
getHasDelete
().
equals
(
other
.
getHasDelete
()))
&&
(
this
.
getHasScalp
()
==
null
?
other
.
getHasScalp
()
==
null
:
this
.
getHasScalp
().
equals
(
other
.
getHasScalp
()));
&&
(
this
.
getHasScalp
()
==
null
?
other
.
getHasScalp
()
==
null
:
this
.
getHasScalp
().
equals
(
other
.
getHasScalp
()))
&&
(
this
.
getLogisticsMethodCode
()
==
null
?
other
.
getLogisticsMethodCode
()
==
null
:
this
.
getLogisticsMethodCode
().
equals
(
other
.
getLogisticsMethodCode
()))
&&
(
this
.
getLogisticsMethodName
()
==
null
?
other
.
getLogisticsMethodName
()
==
null
:
this
.
getLogisticsMethodName
().
equals
(
other
.
getLogisticsMethodName
()));
}
}
/**
/**
...
@@ -1241,6 +1263,8 @@ public class DcBaseOmsSku {
...
@@ -1241,6 +1263,8 @@ public class DcBaseOmsSku {
result
=
prime
*
result
+
((
getBailunRequireLogistics
()
==
null
)
?
0
:
getBailunRequireLogistics
().
hashCode
());
result
=
prime
*
result
+
((
getBailunRequireLogistics
()
==
null
)
?
0
:
getBailunRequireLogistics
().
hashCode
());
result
=
prime
*
result
+
((
getHasDelete
()
==
null
)
?
0
:
getHasDelete
().
hashCode
());
result
=
prime
*
result
+
((
getHasDelete
()
==
null
)
?
0
:
getHasDelete
().
hashCode
());
result
=
prime
*
result
+
((
getHasScalp
()
==
null
)
?
0
:
getHasScalp
().
hashCode
());
result
=
prime
*
result
+
((
getHasScalp
()
==
null
)
?
0
:
getHasScalp
().
hashCode
());
result
=
prime
*
result
+
((
getLogisticsMethodCode
()
==
null
)
?
0
:
getLogisticsMethodCode
().
hashCode
());
result
=
prime
*
result
+
((
getLogisticsMethodName
()
==
null
)
?
0
:
getLogisticsMethodName
().
hashCode
());
return
result
;
return
result
;
}
}
}
}
\ No newline at end of file
data-common/src/main/java/com/bailuntec/domain/example/DcBaseOmsSkuExample.java
View file @
9ccfcdde
...
@@ -6740,6 +6740,146 @@ public class DcBaseOmsSkuExample {
...
@@ -6740,6 +6740,146 @@ public class DcBaseOmsSkuExample {
addCriterion
(
"has_scalp not between"
,
value1
,
value2
,
"hasScalp"
);
addCriterion
(
"has_scalp not between"
,
value1
,
value2
,
"hasScalp"
);
return
(
Criteria
)
this
;
return
(
Criteria
)
this
;
}
}
public
Criteria
andLogisticsMethodCodeIsNull
()
{
addCriterion
(
"logistics_method_code is null"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLogisticsMethodCodeIsNotNull
()
{
addCriterion
(
"logistics_method_code is not null"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLogisticsMethodCodeEqualTo
(
String
value
)
{
addCriterion
(
"logistics_method_code ="
,
value
,
"logisticsMethodCode"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLogisticsMethodCodeNotEqualTo
(
String
value
)
{
addCriterion
(
"logistics_method_code <>"
,
value
,
"logisticsMethodCode"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLogisticsMethodCodeGreaterThan
(
String
value
)
{
addCriterion
(
"logistics_method_code >"
,
value
,
"logisticsMethodCode"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLogisticsMethodCodeGreaterThanOrEqualTo
(
String
value
)
{
addCriterion
(
"logistics_method_code >="
,
value
,
"logisticsMethodCode"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLogisticsMethodCodeLessThan
(
String
value
)
{
addCriterion
(
"logistics_method_code <"
,
value
,
"logisticsMethodCode"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLogisticsMethodCodeLessThanOrEqualTo
(
String
value
)
{
addCriterion
(
"logistics_method_code <="
,
value
,
"logisticsMethodCode"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLogisticsMethodCodeLike
(
String
value
)
{
addCriterion
(
"logistics_method_code like"
,
value
,
"logisticsMethodCode"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLogisticsMethodCodeNotLike
(
String
value
)
{
addCriterion
(
"logistics_method_code not like"
,
value
,
"logisticsMethodCode"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLogisticsMethodCodeIn
(
List
<
String
>
values
)
{
addCriterion
(
"logistics_method_code in"
,
values
,
"logisticsMethodCode"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLogisticsMethodCodeNotIn
(
List
<
String
>
values
)
{
addCriterion
(
"logistics_method_code not in"
,
values
,
"logisticsMethodCode"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLogisticsMethodCodeBetween
(
String
value1
,
String
value2
)
{
addCriterion
(
"logistics_method_code between"
,
value1
,
value2
,
"logisticsMethodCode"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLogisticsMethodCodeNotBetween
(
String
value1
,
String
value2
)
{
addCriterion
(
"logistics_method_code not between"
,
value1
,
value2
,
"logisticsMethodCode"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLogisticsMethodNameIsNull
()
{
addCriterion
(
"logistics_method_name is null"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLogisticsMethodNameIsNotNull
()
{
addCriterion
(
"logistics_method_name is not null"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLogisticsMethodNameEqualTo
(
String
value
)
{
addCriterion
(
"logistics_method_name ="
,
value
,
"logisticsMethodName"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLogisticsMethodNameNotEqualTo
(
String
value
)
{
addCriterion
(
"logistics_method_name <>"
,
value
,
"logisticsMethodName"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLogisticsMethodNameGreaterThan
(
String
value
)
{
addCriterion
(
"logistics_method_name >"
,
value
,
"logisticsMethodName"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLogisticsMethodNameGreaterThanOrEqualTo
(
String
value
)
{
addCriterion
(
"logistics_method_name >="
,
value
,
"logisticsMethodName"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLogisticsMethodNameLessThan
(
String
value
)
{
addCriterion
(
"logistics_method_name <"
,
value
,
"logisticsMethodName"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLogisticsMethodNameLessThanOrEqualTo
(
String
value
)
{
addCriterion
(
"logistics_method_name <="
,
value
,
"logisticsMethodName"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLogisticsMethodNameLike
(
String
value
)
{
addCriterion
(
"logistics_method_name like"
,
value
,
"logisticsMethodName"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLogisticsMethodNameNotLike
(
String
value
)
{
addCriterion
(
"logistics_method_name not like"
,
value
,
"logisticsMethodName"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLogisticsMethodNameIn
(
List
<
String
>
values
)
{
addCriterion
(
"logistics_method_name in"
,
values
,
"logisticsMethodName"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLogisticsMethodNameNotIn
(
List
<
String
>
values
)
{
addCriterion
(
"logistics_method_name not in"
,
values
,
"logisticsMethodName"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLogisticsMethodNameBetween
(
String
value1
,
String
value2
)
{
addCriterion
(
"logistics_method_name between"
,
value1
,
value2
,
"logisticsMethodName"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLogisticsMethodNameNotBetween
(
String
value1
,
String
value2
)
{
addCriterion
(
"logistics_method_name not between"
,
value1
,
value2
,
"logisticsMethodName"
);
return
(
Criteria
)
this
;
}
}
}
/**
/**
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment