切换导航条
此项目
正在载入...
登录
mmm-go
/
partnermg
·
提交
转到一个项目
GitLab
转到群组
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
唐旭辉
4 years ago
提交
d07e49d6ec67cfc7551f700859aedbf3c7525529
1 个父辈
8ed8c2cf
更新
显示空白字符变更
内嵌
并排对比
正在显示
4 个修改的文件
包含
11 行增加
和
1 行删除
pkg/application/orderinfo/service/order_info_2.go
pkg/application/syncOrder/command/sync_bestshop.go
pkg/application/syncOrder/service/sync_order.go
pkg/domain/order_bestshop.go
pkg/application/orderinfo/service/order_info_2.go
查看文件 @
d07e49d
...
...
@@ -181,12 +181,15 @@ func (service OrderInfoService) buildOrderBaseInfoData(orderBase *domain.OrderBa
"partner"
:
orderBase
.
PartnerInfo
.
PartnerName
,
"phone"
:
""
,
"orderTime"
:
orderBase
.
CreateTime
.
Local
()
.
Format
(
"2006-01-02 15:04:05"
),
"shippingStatus"
:
orderBase
.
CreateTime
.
Local
()
.
Format
(
"2006-01-02 15:04:05"
)
,
"shippingStatus"
:
""
,
"partnerDividends"
:
""
,
"receivedDividends"
:
""
,
"notReceivedDividend"
:
""
,
"dividendSpending"
:
""
,
"orderNumber"
:
orderBase
.
OrderCode
,
"deliveryCode"
:
orderBase
.
DeliveryCode
,
"orderArea"
:
orderBase
.
RegionInfo
.
RegionName
,
"partnerCategory"
:
orderBase
.
PartnerCategory
.
Name
,
}
if
hasPartnerBonusPercent
{
order
[
"partnerDividends"
]
=
fmt
.
Sprint
(
orderBase
.
GetCurrentPartnerBonus
())
...
...
@@ -395,6 +398,9 @@ func (service OrderInfoService) buildOrderBestshopInfoData(orderBase *domain.Ord
"notReceivedDividend"
:
""
,
"dividendSpending"
:
""
,
"orderNumber"
:
orderBase
.
OrderCode
,
"orderArea"
:
orderBase
.
RegionInfo
.
RegionName
,
"partnerCategory"
:
orderBase
.
PartnerCategory
.
Name
,
"deliveryCode"
:
orderBase
.
DeliveryCode
,
}
if
hasPartnerBonusPercent
{
order
[
"partnerDividends"
]
=
fmt
.
Sprint
(
orderBase
.
GetCurrentPartnerBonus
())
...
...
pkg/application/syncOrder/command/sync_bestshop.go
查看文件 @
d07e49d
...
...
@@ -28,6 +28,7 @@ type CreateOrderFromBestshop struct {
//发货时间
DeliveryTime
string
`json:"deliveryTime"`
PartnerId
int64
`json:"partnerId"`
OrderArea
string
`json:"orderArea"`
Goods
[]
struct
{
Id
int64
`json:"id"`
//货品编号
...
...
pkg/application/syncOrder/service/sync_order.go
查看文件 @
d07e49d
...
...
@@ -126,6 +126,7 @@ func (s SyncOrderService) CreateOrderFromBestshop(cmd command.CreateOrderFromBes
DeliveryTime
:
cmd
.
DeliveryTime
,
IsCopy
:
false
,
CompanyId
:
cmd
.
CompanyId
,
OrderArea
:
cmd
.
OrderArea
,
}
err
=
orderBestshopRepository
.
Add
(
&
order
)
if
err
!=
nil
{
...
...
pkg/domain/order_bestshop.go
查看文件 @
d07e49d
...
...
@@ -36,6 +36,7 @@ type OrderBestShop struct {
//是否将数据同步到 order_base ,order_good
IsCopy
bool
`json:"isCopy"`
CompanyId
int64
`json:"companyId"`
OrderArea
string
`json:"orderArea"`
}
func
(
order
OrderBestShop
)
CopyToOrderBase
(
o
*
OrderBase
)
{
...
...
@@ -54,6 +55,7 @@ func (order OrderBestShop) CopyToOrderBase(o *OrderBase) {
o
.
OrderCompute
.
PlanOrderAmount
=
order
.
OrderAmount
o
.
OrderCompute
.
PlanOrderCount
=
order
.
OrderCount
o
.
DeliveryTime
,
_
=
time
.
Parse
(
"2006-01-02 15:04:05"
,
order
.
DeliveryTime
)
o
.
RegionInfo
.
RegionName
=
order
.
OrderArea
return
}
...
...
请
注册
或
登录
后发表评论