切换导航条
此项目
正在载入...
登录
mmm-go
/
partnermg
·
提交
转到一个项目
GitLab
转到群组
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
tangxvhui
5 years ago
提交
429adeb282aec285dbe203007262bc51a212b8b4
1 个父辈
8799761d
bug 修复
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
14 行增加
和
4 行删除
pkg/application/order/service/order.go
pkg/port/beego/controllers/order_controller.go
pkg/application/order/service/order.go
查看文件 @
429adeb
...
...
@@ -266,6 +266,12 @@ func (service OrderService) RemoveOrder(id int64) error {
if
err
!=
nil
{
return
lib
.
ThrowError
(
lib
.
TRANSACTION_ERROR
,
err
.
Error
())
}
if
err
=
transactionContext
.
StartTransaction
();
err
!=
nil
{
return
lib
.
ThrowError
(
lib
.
TRANSACTION_ERROR
,
err
.
Error
())
}
defer
func
()
{
transactionContext
.
RollbackTransaction
()
}()
var
(
orderRepository
domain
.
OrderRepository
order
*
domain
.
Order
...
...
@@ -290,6 +296,10 @@ func (service OrderService) RemoveOrder(id int64) error {
if
err
!=
nil
{
return
lib
.
ThrowError
(
lib
.
INTERNAL_SERVER_ERROR
,
err
.
Error
())
}
err
=
transactionContext
.
CommitTransaction
()
if
err
!=
nil
{
return
lib
.
ThrowError
(
lib
.
INTERNAL_SERVER_ERROR
,
err
.
Error
())
}
return
nil
}
...
...
pkg/port/beego/controllers/order_controller.go
查看文件 @
429adeb
...
...
@@ -166,14 +166,14 @@ func (c *OrderController) GetOrderPurpose() {
"updateTime"
:
orderinfo
.
UpdateAt
.
Local
()
.
Format
(
"2006-01-02 15:04:05"
),
"buyer"
:
orderinfo
.
Buyer
.
BuyerName
,
"buyerPhone"
:
orderinfo
.
Buyer
.
ContactInfo
,
"
A
ddress"
:
orderinfo
.
Buyer
.
ShippingAddress
,
"
a
ddress"
:
orderinfo
.
Buyer
.
ShippingAddress
,
"id"
:
orderinfo
.
Id
,
"partner"
:
orderinfo
.
PartnerInfo
.
Id
,
"partnerRatio"
:
orderinfo
.
PartnerBonusPercent
,
"salesmanRatio"
:
orderinfo
.
SalesmanBonusPercent
,
"orderId"
:
orderinfo
.
OrderCode
,
"orderName"
:
orderinfo
.
OrderName
,
"
O
rderNum"
:
orderinfo
.
OrderCount
,
"
o
rderNum"
:
orderinfo
.
OrderCount
,
"orderPrice"
:
orderinfo
.
OrderAmount
,
"orderDist"
:
orderinfo
.
OrderRegionInfo
.
RegionName
,
"orderStatue"
:
orderinfo
.
OrderStatus
,
...
...
@@ -385,14 +385,14 @@ func (c *OrderController) GetOrderReal() {
"updateTime"
:
orderinfo
.
UpdateAt
.
Local
()
.
Format
(
"2006-01-02 15:04:05"
),
"buyer"
:
orderinfo
.
Buyer
.
BuyerName
,
"buyerPhone"
:
orderinfo
.
Buyer
.
ContactInfo
,
"
A
ddress"
:
orderinfo
.
Buyer
.
ShippingAddress
,
"
a
ddress"
:
orderinfo
.
Buyer
.
ShippingAddress
,
"id"
:
orderinfo
.
Id
,
"partner"
:
orderinfo
.
PartnerInfo
.
Id
,
"partnerRatio"
:
orderinfo
.
PartnerBonusPercent
,
"salesmanRatio"
:
orderinfo
.
SalesmanBonusPercent
,
"orderId"
:
orderinfo
.
OrderCode
,
"orderName"
:
orderinfo
.
OrderName
,
"
O
rderNum"
:
orderinfo
.
OrderActualCount
,
"
o
rderNum"
:
orderinfo
.
OrderActualCount
,
"orderPrice"
:
orderinfo
.
OrderActualAmount
,
"orderDist"
:
orderinfo
.
OrderRegionInfo
.
RegionName
,
"orderStatue"
:
orderinfo
.
OrderStatus
,
...
...
请
注册
或
登录
后发表评论