Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
ana-order-backend
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
huluobin
ana-order-backend
Commits
12d36c99
Commit
12d36c99
authored
Aug 05, 2020
by
huluobin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
全局的货币单位mybatis处理器
parent
f501c64d
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
52 additions
and
10 deletions
+52
-10
OrderAddress.java
...n/java/com/bailuntec/ana/domain/address/OrderAddress.java
+6
-6
Order.java
src/main/java/com/bailuntec/ana/domain/order/Order.java
+1
-1
OrderDetail.java
...main/java/com/bailuntec/ana/domain/order/OrderDetail.java
+2
-0
DictTransferAspect.java
.../ana/infrastructure/common/aspect/DictTransferAspect.java
+3
-1
CurrencyTypeHandler.java
...rastructure/common/config/config/CurrencyTypeHandler.java
+32
-0
PdsApi.java
...n/java/com/bailuntec/ana/infrastructure/feign/PdsApi.java
+3
-0
Schedule.java
...a/com/bailuntec/ana/infrastructure/schedule/Schedule.java
+2
-2
Currency.java
src/main/java/com/bailuntec/ana/vo/order/Currency.java
+1
-0
PdsSkuInfo.java
...in/java/com/bailuntec/ana/vo/product/resp/PdsSkuInfo.java
+1
-0
OrderMapper.xml
src/main/resources/mapper/order/OrderMapper.xml
+1
-0
No files found.
src/main/java/com/bailuntec/ana/domain/address/OrderAddress.java
View file @
12d36c99
...
...
@@ -34,38 +34,38 @@ public class OrderAddress extends BaseModel {
@ApiModelProperty
(
value
=
"ana-order id"
)
private
String
orderId
;
//
@NotNull(groups = OrderValidGroup.PublishOrder.class, message = "国家不能为空")
@NotNull
(
groups
=
OrderValidGroup
.
PublishOrder
.
class
,
message
=
"国家不能为空"
)
@ApiModelProperty
(
value
=
"国家"
)
private
String
countryCode
;
@ApiModelProperty
(
value
=
"地区"
)
private
String
area
;
// @NotNull(groups = OrderValidGroup.PublishOrder.class, message = "国家
不能为空")
@NotNull
(
groups
=
OrderValidGroup
.
PublishOrder
.
class
,
message
=
"城市
不能为空"
)
@ApiModelProperty
(
value
=
"城市"
)
private
String
city
;
@ApiModelProperty
(
value
=
"州"
)
private
String
stateOrRegion
;
//
@NotNull(groups = OrderValidGroup.PublishOrder.class, message = "地址不能为空")
@NotNull
(
groups
=
OrderValidGroup
.
PublishOrder
.
class
,
message
=
"地址不能为空"
)
@ApiModelProperty
(
value
=
"地址1"
)
private
String
address
;
@ApiModelProperty
(
value
=
"地址2"
)
private
String
address2
;
//
@NotNull(groups = OrderValidGroup.PublishOrder.class, message = "收货人姓名不能为空")
@NotNull
(
groups
=
OrderValidGroup
.
PublishOrder
.
class
,
message
=
"收货人姓名不能为空"
)
@ApiModelProperty
(
value
=
"收货人姓名"
)
private
String
receiver
;
//
@NotNull(groups = OrderValidGroup.PublishOrder.class, message = "电话不能为空")
@NotNull
(
groups
=
OrderValidGroup
.
PublishOrder
.
class
,
message
=
"电话不能为空"
)
@ApiModelProperty
(
value
=
"电话"
)
private
String
phone
;
private
String
phone2
;
//
@NotNull(groups = OrderValidGroup.PublishOrder.class, message = "邮编不能为空")
@NotNull
(
groups
=
OrderValidGroup
.
PublishOrder
.
class
,
message
=
"邮编不能为空"
)
@ApiModelProperty
(
value
=
"邮编"
)
private
String
postalCode
;
...
...
src/main/java/com/bailuntec/ana/domain/order/Order.java
View file @
12d36c99
...
...
@@ -35,7 +35,7 @@ import java.util.List;
@EqualsAndHashCode
(
callSuper
=
true
)
@Accessors
(
chain
=
true
)
@ApiModel
(
value
=
"Order对象"
,
description
=
"ana-order订单"
)
@TableName
(
value
=
"`order`"
)
@TableName
(
autoResultMap
=
true
,
value
=
"`order`"
)
public
class
Order
extends
BaseModel
{
private
static
final
long
serialVersionUID
=
1L
;
...
...
src/main/java/com/bailuntec/ana/domain/order/OrderDetail.java
View file @
12d36c99
...
...
@@ -6,6 +6,7 @@ import com.bailuntec.ana.vo.order.Currency;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
...
...
@@ -31,6 +32,7 @@ import java.util.List;
@EqualsAndHashCode
(
callSuper
=
true
)
@Accessors
(
chain
=
true
)
@ApiModel
(
value
=
"OrdeDetail"
,
description
=
""
)
@TableName
(
autoResultMap
=
true
)
public
class
OrderDetail
extends
BaseModel
{
private
static
final
long
serialVersionUID
=
1L
;
...
...
src/main/java/com/bailuntec/ana/infrastructure/common/aspect/DictTransferAspect.java
View file @
12d36c99
...
...
@@ -103,7 +103,9 @@ public class DictTransferAspect {
//设置翻译后的字典值
valueField
.
set
(
object
,
value
);
}
if
(
field
.
getType
().
isAnnotationPresent
(
ApiModel
.
class
)
||
field
.
getType
().
isAnnotationPresent
(
TableName
.
class
))
{
if
((
field
.
getType
().
isAnnotationPresent
(
ApiModel
.
class
)
||
field
.
getType
().
isAnnotationPresent
(
TableName
.
class
))
&&
!
field
.
getDeclaringClass
().
getName
().
equals
(
object
.
getClass
().
getName
()))
{
field
.
setAccessible
(
true
);
Object
subObject
=
field
.
get
(
object
);
if
(
subObject
!=
null
)
{
...
...
src/main/java/com/bailuntec/ana/infrastructure/common/config/config/CurrencyTypeHandler.java
0 → 100644
View file @
12d36c99
package
com
.
bailuntec
.
ana
.
infrastructure
.
common
.
config
.
config
;
import
com.bailuntec.ana.vo.order.Currency
;
import
com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler
;
import
org.apache.ibatis.session.SqlSessionFactory
;
import
org.apache.ibatis.type.TypeHandlerRegistry
;
import
org.springframework.beans.BeansException
;
import
org.springframework.context.ApplicationContext
;
import
org.springframework.context.ApplicationContextAware
;
import
org.springframework.stereotype.Component
;
/**
* <p>
* mybatis 全局currency转换器
* </p>
*
* @author robbendev
* @since 2020/8/5 9:36 上午
*/
@Component
public
class
CurrencyTypeHandler
implements
ApplicationContextAware
{
@Override
public
void
setApplicationContext
(
ApplicationContext
applicationContext
)
throws
BeansException
{
//从spring容器获取sqlSessionFactory
SqlSessionFactory
sqlSessionFactory
=
applicationContext
.
getBean
(
SqlSessionFactory
.
class
);
//获取typeHandler注册器
TypeHandlerRegistry
typeHandlerRegistry
=
sqlSessionFactory
.
getConfiguration
().
getTypeHandlerRegistry
();
//注册Currency的typeHandler
typeHandlerRegistry
.
register
(
Currency
.
class
,
JacksonTypeHandler
.
class
);
}
}
src/main/java/com/bailuntec/ana/infrastructure/feign/PdsApi.java
View file @
12d36c99
package
com
.
bailuntec
.
ana
.
infrastructure
.
feign
;
import
com.bailuntec.ana.infrastructure.common.util.seq.IdWorker
;
import
com.bailuntec.ana.vo.order.Currency
;
import
com.bailuntec.ana.vo.product.resp.PdsSkuInfo
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.cloud.openfeign.FeignClient
;
...
...
@@ -40,6 +41,8 @@ public interface PdsApi {
pdsSkuInfo
.
setPurchaseAsin
(
IdWorker
.
getId
());
pdsSkuInfo
.
setPurchasePlat
(
"ebay"
);
pdsSkuInfo
.
setPurchaseSkuNo
(
IdWorker
.
getId
());
pdsSkuInfo
.
setCostPrice
(
Currency
.
TEST
);
pdsSkuInfo
.
setTolerance
(
Currency
.
TEST
);
return
pdsSkuInfo
;
}
}
...
...
src/main/java/com/bailuntec/ana/infrastructure/schedule/Schedule.java
View file @
12d36c99
...
...
@@ -26,7 +26,7 @@ public class Schedule {
* 从pams同步订单里面的刊登帐号信息
* </p>
*/
@Scheduled
(
cron
=
"
0 0/1 * * * *
"
)
@Scheduled
(
cron
=
"
*/5 * * * * ?
"
)
public
void
syncOrderPdsAccount
()
{
List
<
Order
>
orderList
=
orderService
.
queryUnSyncPdsAccountOrder
();
...
...
@@ -47,7 +47,7 @@ public class Schedule {
* 从刊登系统同步订单详情销售sku对应的采购item,采购sku,成本
* </p>
*/
@Scheduled
(
cron
=
"
0 0/1 * * * *
"
)
@Scheduled
(
cron
=
"
*/5 * * * * ?
"
)
public
void
syncOrderDetails
()
{
List
<
Order
>
orderList
=
orderService
.
queryUnSyncDetailsOrder
();
if
(
ListUtil
.
isNotEmpty
(
orderList
))
{
...
...
src/main/java/com/bailuntec/ana/vo/order/Currency.java
View file @
12d36c99
...
...
@@ -38,5 +38,6 @@ public class Currency {
@ApiModelProperty
(
value
=
"货币单位"
)
private
String
currencyCode
;
public
static
final
Currency
TEST
=
new
Currency
(
BigDecimal
.
ONE
,
BigDecimal
.
ONE
,
"CNY"
);
}
src/main/java/com/bailuntec/ana/vo/product/resp/PdsSkuInfo.java
View file @
12d36c99
...
...
@@ -42,4 +42,5 @@ public class PdsSkuInfo {
@ApiModelProperty
(
value
=
"容忍超过成本范围 超出不进行采购"
)
private
Currency
tolerance
;
}
src/main/resources/mapper/order/OrderMapper.xml
View file @
12d36c99
...
...
@@ -3,6 +3,7 @@
<mapper
namespace=
"com.bailuntec.ana.infrastructure.mapper.order.OrderMapper"
>
<select
id=
"selectByOrderNoAndPdsAccountId"
resultType=
"com.bailuntec.ana.domain.order.Order"
>
select *
from `order`
...
...
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