记得上下班打卡 | git大法好,push需谨慎
Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
liquidnet-bus-v1
Project
Project
Details
Activity
Releases
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
董敬伟
liquidnet-bus-v1
Commits
4910e235
Commit
4910e235
authored
Jul 07, 2021
by
jiangxiulong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
估算运费
parent
9ffdceec
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
89 additions
and
49 deletions
+89
-49
PerformancesExpressServiceImpl.java
...ai/kylin/service/impl/PerformancesExpressServiceImpl.java
+10
-1
DataUtils.java
...iquidnet/client/admin/zhengzai/kylin/utils/DataUtils.java
+27
-0
KylinOrderExpress.java
...com/liquidnet/service/kylin/entity/KylinOrderExpress.java
+2
-0
db_kylin_structure.sql
.../liquidnet-service-kylin-impl/docu/db_kylin_structure.sql
+50
-48
No files found.
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/PerformancesExpressServiceImpl.java
View file @
4910e235
...
@@ -395,7 +395,15 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
...
@@ -395,7 +395,15 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
String
msg
=
(
String
)
hashMap
.
get
(
"msg"
);
String
msg
=
(
String
)
hashMap
.
get
(
"msg"
);
return
ResponseDto
.
failure
(
msg
);
return
ResponseDto
.
failure
(
msg
);
}
else
{
}
else
{
// TODO: 2021/6/30 储存金额
HashMap
hashMapResult
=
(
HashMap
)
hashMap
.
get
(
"result"
);
KylinOrderExpress
kylinOrderExpress
=
new
KylinOrderExpress
();
BigDecimal
price
=
dataUtils
.
getBigDecimal
(
hashMapResult
.
get
(
"price"
));
kylinOrderExpress
.
setFreightPrice
(
price
);
kylinOrderExpress
.
setUpdatedAt
(
DateUtil
.
getNowTime
());
kylinOrderExpressMapper
.
update
(
kylinOrderExpress
,
new
UpdateWrapper
<
KylinOrderExpress
>().
in
(
"order_express_id"
,
orderExpressInfo
.
getOrderExpressId
())
);
// {"result":{"deliverTime":"2021-07-01 18:00:00,2021-07-01 18:00:00","price":"23元","businessTypeDesc":"顺丰特快","businessType":"1"},"succ":"ok","msg":null}
// {"result":{"deliverTime":"2021-07-01 18:00:00,2021-07-01 18:00:00","price":"23元","businessTypeDesc":"顺丰特快","businessType":"1"},"succ":"ok","msg":null}
}
}
}
}
...
@@ -481,6 +489,7 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
...
@@ -481,6 +489,7 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
kylinOrderExpressRoute
.
setOpcode
((
String
)
routeInfo
.
get
(
"opcode"
));
kylinOrderExpressRoute
.
setOpcode
((
String
)
routeInfo
.
get
(
"opcode"
));
kylinOrderExpressRoute
.
setCreatedAt
(
DateUtil
.
getNowTime
());
kylinOrderExpressRoute
.
setCreatedAt
(
DateUtil
.
getNowTime
());
kylinOrderExpressRouteMapper
.
insert
(
kylinOrderExpressRoute
);
kylinOrderExpressRouteMapper
.
insert
(
kylinOrderExpressRoute
);
// 这里没清缓存 推送正常的话这个用不到
}
}
}
}
}
}
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/DataUtils.java
View file @
4910e235
...
@@ -16,6 +16,8 @@ import org.springframework.data.mongodb.core.query.Criteria;
...
@@ -16,6 +16,8 @@ import org.springframework.data.mongodb.core.query.Criteria;
import
org.springframework.data.mongodb.core.query.Query
;
import
org.springframework.data.mongodb.core.query.Query
;
import
org.springframework.stereotype.Component
;
import
org.springframework.stereotype.Component
;
import
java.math.BigDecimal
;
import
java.math.BigInteger
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.List
;
...
@@ -291,4 +293,29 @@ public class DataUtils {
...
@@ -291,4 +293,29 @@ public class DataUtils {
redisUtil
.
del
(
KylinRedisConst
.
ORDER_REFUND_BY_ORDER_ID
.
concat
(
id
));
redisUtil
.
del
(
KylinRedisConst
.
ORDER_REFUND_BY_ORDER_ID
.
concat
(
id
));
}
}
}
}
/**
* Object转BigDecimal类型
*
* @param value 要转的object类型
* @return 转成的BigDecimal类型数据
*/
public
BigDecimal
getBigDecimal
(
Object
value
)
{
BigDecimal
ret
=
null
;
if
(
value
!=
null
)
{
if
(
value
instanceof
BigDecimal
)
{
ret
=
(
BigDecimal
)
value
;
}
else
if
(
value
instanceof
String
)
{
String
str
=
((
String
)
value
).
replace
(
"元"
,
""
);
ret
=
new
BigDecimal
(
str
);
}
else
if
(
value
instanceof
BigInteger
)
{
ret
=
new
BigDecimal
((
BigInteger
)
value
);
}
else
if
(
value
instanceof
Number
)
{
ret
=
new
BigDecimal
(((
Number
)
value
).
doubleValue
());
}
else
{
throw
new
ClassCastException
(
"Not possible to coerce ["
+
value
+
"] from class "
+
value
.
getClass
()
+
" into a BigDecimal."
);
}
}
return
ret
;
}
}
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinOrderExpress.java
View file @
4910e235
...
@@ -6,6 +6,7 @@ import lombok.Data;
...
@@ -6,6 +6,7 @@ import lombok.Data;
import
lombok.EqualsAndHashCode
;
import
lombok.EqualsAndHashCode
;
import
java.io.Serializable
;
import
java.io.Serializable
;
import
java.math.BigDecimal
;
/**
/**
* <p>
* <p>
...
@@ -37,6 +38,7 @@ public class KylinOrderExpress implements Serializable {
...
@@ -37,6 +38,7 @@ public class KylinOrderExpress implements Serializable {
private
String
printIcon
;
private
String
printIcon
;
private
String
twoDimensionCode
;
private
String
twoDimensionCode
;
private
String
printFlag
;
private
String
printFlag
;
private
BigDecimal
freightPrice
;
private
String
return_tracking_no
;
private
String
return_tracking_no
;
private
String
sourceTransferCode
;
private
String
sourceTransferCode
;
...
...
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/docu/db_kylin_structure.sql
View file @
4910e235
...
@@ -811,6 +811,8 @@ CREATE TABLE `kylin_order_express`
...
@@ -811,6 +811,8 @@ CREATE TABLE `kylin_order_express`
`origincode`
varchar
(
255
)
NOT
NULL
DEFAULT
''
COMMENT
'原寄地区域代码 可用于顺丰电子面单标签打印'
,
`origincode`
varchar
(
255
)
NOT
NULL
DEFAULT
''
COMMENT
'原寄地区域代码 可用于顺丰电子面单标签打印'
,
`destcode`
varchar
(
255
)
NOT
NULL
DEFAULT
''
COMMENT
'目的地区域代码 可用于顺丰电子面单标签打印'
,
`destcode`
varchar
(
255
)
NOT
NULL
DEFAULT
''
COMMENT
'目的地区域代码 可用于顺丰电子面单标签打印'
,
`freight_price`
decimal
(
11
,
2
)
NOT
NULL
DEFAULT
'0.00'
COMMENT
'估算的运费'
,
`return_tracking_no`
varchar
(
30
)
NOT
NULL
DEFAULT
''
COMMENT
'顺丰签回单服务运单号'
,
`return_tracking_no`
varchar
(
30
)
NOT
NULL
DEFAULT
''
COMMENT
'顺丰签回单服务运单号'
,
`source_transfer_code`
varchar
(
60
)
NOT
NULL
DEFAULT
''
COMMENT
'原寄地中转场'
,
`source_transfer_code`
varchar
(
60
)
NOT
NULL
DEFAULT
''
COMMENT
'原寄地中转场'
,
`source_city_code`
varchar
(
60
)
NOT
NULL
DEFAULT
''
COMMENT
'原寄地城市代码'
,
`source_city_code`
varchar
(
60
)
NOT
NULL
DEFAULT
''
COMMENT
'原寄地城市代码'
,
...
...
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