切换导航条
此项目
正在载入...
登录
mmm-go
/
partnermg
·
提交
转到一个项目
GitLab
转到群组
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
唐旭辉
4 years ago
提交
c91d907f602392d03466a6444e3a6b3b564660a2
1 个父辈
c1a9c096
更新
隐藏空白字符变更
内嵌
并排对比
正在显示
5 个修改的文件
包含
5 行增加
和
10 行删除
pkg/application/orderinfo/service/order_info.go
pkg/application/orderinfo/service/order_info_2.go
pkg/infrastructure/domainService/pg_order_bonus_service.go
pkg/port/beego/controllers/order_dividend_controller.go
pkg/port/beego/routers/router.go
pkg/application/orderinfo/service/order_info.go
查看文件 @
c91d907
...
...
@@ -936,7 +936,7 @@ func (service OrderInfoService) PayPartnerBonusWithOrderBestshop(orderId int64,
return
nil
}
//
PayPartnerBonusWithOrderBestshop 支付分红,海鲜干货的订单 (orderType=domain.OrderTypeBestShop)
//
UpdateOrderRemarkBonus 订单分红详情,更新备注
func
(
service
OrderInfoService
)
UpdateOrderRemarkBonus
(
orderId
int64
,
adminId
int64
,
remark
string
)
error
{
var
(
transactionContext
,
_
=
factory
.
CreateTransactionContext
(
nil
)
...
...
pkg/application/orderinfo/service/order_info_2.go
查看文件 @
c91d907
...
...
@@ -47,7 +47,7 @@ func (service OrderInfoService) GetOrderInfoWithBonus(orderBaseId int64, company
returnData
interface
{}
)
switch
order
.
OrderType
{
case
domain
.
Order
Intention
:
case
domain
.
Order
Real
:
returnData
,
err
=
service
.
GetOrderBaseDetailWithBonus
(
orderBaseId
,
companyId
)
case
domain
.
OrderTypeBestShop
:
returnData
,
err
=
service
.
GetOrderBestshopInfoWithBonus
(
orderBaseId
,
companyId
)
...
...
pkg/infrastructure/domainService/pg_order_bonus_service.go
查看文件 @
c91d907
...
...
@@ -318,7 +318,6 @@ func (serve *OrderBonusService) PayOrderGoodBonus(orderId int64, goodId int64, a
}
//UpdateOrderRemarkBonus 更新备注
//目前只处理 海鲜干货的订单 即 order_type = OrderTypeBestShop (3)
func
(
serve
*
OrderBonusService
)
UpdateOrderRemarkBonus
(
orderId
int64
,
adminId
int64
,
remark
string
)
error
{
var
(
userRepository
domain
.
UsersRepository
...
...
@@ -338,9 +337,6 @@ func (serve *OrderBonusService) UpdateOrderRemarkBonus(orderId int64, adminId in
e
:=
fmt
.
Sprintf
(
"获取订单(id=%d)数据失败,%s"
,
orderId
,
err
)
return
lib
.
ThrowError
(
lib
.
INTERNAL_SERVER_ERROR
,
e
)
}
if
oldOrder
.
OrderType
!=
domain
.
OrderTypeBestShop
{
return
lib
.
ThrowError
(
lib
.
BUSINESS_ERROR
,
"订单类型错误"
)
}
adminUser
,
err
=
userRepository
.
FindOne
(
domain
.
UsersFindOneQuery
{
Id
:
adminId
})
if
err
!=
nil
{
e
:=
fmt
.
Sprintf
(
"获取管理员用户(id=%d)数据失败,%s"
,
adminId
,
err
)
...
...
@@ -368,6 +364,5 @@ func (serve *OrderBonusService) UpdateOrderRemarkBonus(orderId int64, adminId in
return
err
}
}
return
nil
}
...
...
pkg/port/beego/controllers/order_dividend_controller.go
查看文件 @
c91d907
...
...
@@ -431,8 +431,8 @@ func (c *OrderDividendController) PayOrderGoodBonusForBestshop() {
return
}
//EditOrderRemarkBonusForBestshop 编辑海鲜干货订单中的备注
func
(
c
*
OrderDividendController
)
EditOrderRemarkBonusForBestshop
()
{
//EditOrderRemarkBonus 编辑订单分红详情中的备注
func
(
c
*
OrderDividendController
)
EditOrderRemarkBonus
()
{
type
Parameter
struct
{
OrderId
string
`json:"orderId"`
Remark
string
`json:"remark"`
...
...
pkg/port/beego/routers/router.go
查看文件 @
c91d907
...
...
@@ -32,7 +32,7 @@ func init() {
// beego.NSRouter("/mini-program/detail", &controllers.OrderDividendController{}, "POST:OrderDividendDetailForBestshop"),
//beego.NSRouter("/mini-program/modify", &controllers.OrderDividendController{}, "POST:EditOrderDividendForBestshop"),
beego
.
NSRouter
(
"/mini-program/payDividends"
,
&
controllers
.
OrderDividendController
{},
"POST:PayOrderGoodBonusForBestshop"
),
beego
.
NSRouter
(
"/
mini-program/remarks"
,
&
controllers
.
OrderDividendController
{},
"POST:EditOrderRemarkBonusForBestshop
"
),
beego
.
NSRouter
(
"/
remarks"
,
&
controllers
.
OrderDividendController
{},
"POST:EditOrderRemarkBonus
"
),
beego
.
NSRouter
(
"/list/excel"
,
&
controllers
.
OrderDividendController
{},
"POST:ListOrderBonusForExcel"
),
// beego.NSRouter("/business/detail", &controllers.BusinessBonusController{}, "POST:GetBusinessBonus"),
// beego.NSRouter("/business/edit", &controllers.BusinessBonusController{}, "POST:UpdateBusinessBonus"),
...
...
请
注册
或
登录
后发表评论