切换导航条
此项目
正在载入...
登录
mmm-go
/
partnermg
·
提交
转到一个项目
GitLab
转到群组
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
唐旭辉
5 years ago
提交
3d0f41a746d0cb305d29b1049b948b347b387c4f
1 个父辈
7a9e2c21
更新
隐藏空白字符变更
内嵌
并排对比
正在显示
5 个修改的文件
包含
10 行增加
和
11 行删除
main.go
pkg/application/orderinfo/service/order_info.go
pkg/application/syncOrder/service/sync_order.go
pkg/infrastructure/domainService/pg_order_bonus_service.go
pkg/port/consumer/consumer.go
main.go
查看文件 @
3d0f41a
...
...
@@ -27,7 +27,6 @@ func main() {
if
err
!=
nil
{
fmt
.
Printf
(
"启动kafka消息消费者失败 err%s
\n
"
,
err
)
logs
.
Error
(
"启动kafka消息消费者失败:%s"
,
err
)
return
}
for
{
select
{
...
...
pkg/application/orderinfo/service/order_info.go
查看文件 @
3d0f41a
...
...
@@ -793,7 +793,7 @@ func (service OrderInfoService) PageListOrderBonus(listOrderQuery query.ListOrde
return
orders
,
cnt
,
nil
}
//GetOrderBestshopInfo 获取来源于
海鲜干货
订单的详情以及分红数据
//GetOrderBestshopInfo 获取来源于
xiangmi
订单的详情以及分红数据
func
(
service
OrderInfoService
)
GetOrderBestshopInfoWithBonus
(
orderBaseId
int64
,
companyId
int64
)
(
interface
{},
error
)
{
var
(
transactionContext
,
_
=
factory
.
CreateTransactionContext
(
nil
)
...
...
@@ -877,12 +877,12 @@ func (service OrderInfoService) GetOrderBestshopInfoWithBonus(orderBaseId int64,
orderData
.
PartnerInfo
=
partnerInfo
.
Partner
orderBestshopData
,
err
=
orderBestshopRepository
.
FindOne
(
domain
.
OrderBestshopFindOneQuery
{
OrderId
:
orderData
.
DataFrom
.
DataId
})
if
err
!=
nil
{
e
:=
fmt
.
Sprintf
(
"获取
海鲜干货
订单(order_bestshop)数据失败,id=%d,err=%s"
,
orderData
.
DataFrom
.
DataId
,
err
)
e
:=
fmt
.
Sprintf
(
"获取
xiangmi
订单(order_bestshop)数据失败,id=%d,err=%s"
,
orderData
.
DataFrom
.
DataId
,
err
)
return
nil
,
lib
.
ThrowError
(
lib
.
INTERNAL_SERVER_ERROR
,
e
)
}
orderGoodBestshop
,
err
=
orderGoodBestshopRepository
.
Find
(
domain
.
OrderGoodBestshopFindQuery
{
OrderId
:
orderBestshopData
.
Id
})
if
err
!=
nil
{
e
:=
fmt
.
Sprintf
(
"获取
海鲜干货
订单货品(order_good_bestshop)数据失败,order_id=%d,err=%s"
,
orderBestshopData
.
Id
,
err
)
e
:=
fmt
.
Sprintf
(
"获取
xiangmi
订单货品(order_good_bestshop)数据失败,order_id=%d,err=%s"
,
orderBestshopData
.
Id
,
err
)
return
nil
,
lib
.
ThrowError
(
lib
.
INTERNAL_SERVER_ERROR
,
e
)
}
orderBestshopData
.
Goods
=
orderGoodBestshop
...
...
pkg/application/syncOrder/service/sync_order.go
查看文件 @
3d0f41a
...
...
@@ -27,7 +27,7 @@ func NewOrderInfoService(option map[string]interface{}) *SyncOrderService {
return
newService
}
//SyncOrderFromBestshop 接收来源于
海鲜干货
小程序的订单数据
//SyncOrderFromBestshop 接收来源于
xiangmi
小程序的订单数据
func
(
s
SyncOrderService
)
SyncOrderFromBestshop
(
cmd
command
.
CreateOrderFromBestshop
)
error
{
var
(
transactionContext
,
_
=
factory
.
CreateTransactionContext
(
nil
)
...
...
@@ -186,7 +186,7 @@ func (s SyncOrderService) copyOrderBestshopToOrderBase(orderBestshop *domain.Ord
}
}
if
!
canCopyOrder
{
logs
.
Warning
(
"公司未设置
海鲜干货的
小程序原始id; order_bestshop.id=%d"
,
orderBestshop
.
Id
)
logs
.
Warning
(
"公司未设置
xiangmi
小程序原始id; order_bestshop.id=%d"
,
orderBestshop
.
Id
)
return
nil
}
var
(
...
...
@@ -213,13 +213,13 @@ func (s SyncOrderService) copyOrderBestshopToOrderBase(orderBestshop *domain.Ord
for
i
:=
range
ordergoods
{
ordergoods
[
i
]
.
OrderId
=
orderbase
.
Id
}
//
TODO
添加goods
// 添加goods
err
=
orderGoodRepository
.
Save
(
ordergoods
)
if
err
!=
nil
{
e
:=
fmt
.
Sprintf
(
"添加order_good数据失败%s"
,
err
)
return
lib
.
ThrowError
(
lib
.
INTERNAL_SERVER_ERROR
,
e
)
}
//
TODO
更新isCopy
// 更新isCopy
orderBestshop
.
IsCopy
=
true
err
=
orderBestshopRepository
.
Edit
(
orderBestshop
)
if
err
!=
nil
{
...
...
pkg/infrastructure/domainService/pg_order_bonus_service.go
查看文件 @
3d0f41a
...
...
@@ -28,7 +28,7 @@ func NewOrderBonusService(tcx *transaction.TransactionContext) *OrderBonusServic
}
//UpdateBounsWithGoodNumber 分红时,因修改订单中商品的数量发生分红变动
//目前只处理
海鲜干货
的订单 即 order_type = OrderTypeBestShop (3)
//目前只处理
xiangmi
的订单 即 order_type = OrderTypeBestShop (3)
func
(
serve
*
OrderBonusService
)
UpdateBounsByGoodNumber
(
orderId
int64
,
adminId
int64
,
goodId
int64
,
goodWithNumber
int
,
reason
string
)
error
{
var
(
userRepository
domain
.
UsersRepository
...
...
@@ -129,7 +129,7 @@ func (serve *OrderBonusService) UpdateBounsByGoodNumber(orderId int64, adminId i
}
//UpdateBounsByPartnerBonusPercent 分红时,因修改订单中商品的合伙人分行比例发生分红变动
////目前只处理
海鲜干货
的订单 即 order_type = OrderTypeBestShop (3)
////目前只处理
xiangmi
的订单 即 order_type = OrderTypeBestShop (3)
func
(
serve
*
OrderBonusService
)
UpdateBounsByPartnerBonusPercent
(
orderId
int64
,
adminId
int64
,
goodId
int64
,
partnerPercent
float64
,
reason
string
)
error
{
var
(
userRepository
domain
.
UsersRepository
...
...
pkg/port/consumer/consumer.go
查看文件 @
3d0f41a
...
...
@@ -82,7 +82,7 @@ func StartConsumer(ctx context.Context) (func(), error) {
config
.
Version
=
sarama
.
V0_11_0_2
consumerGroup
,
err
:=
sarama
.
NewConsumerGroup
(
consumer
.
kafkaHosts
,
consumer
.
groupId
,
config
)
if
err
!=
nil
{
return
nil
,
err
return
func
()
{}
,
err
}
wg
:=
&
sync
.
WaitGroup
{}
wg
.
Add
(
1
)
...
...
请
注册
或
登录
后发表评论