切换导航条
此项目
正在载入...
登录
mmm-go
/
partnermg
·
提交
转到一个项目
GitLab
转到群组
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
唐旭辉
4 years ago
提交
50066ad7ae5719c07132644375a63e3906f26b5d
1 个父辈
c3fa8e08
海鲜干货订单 分红详情 完成
显示空白字符变更
内嵌
并排对比
正在显示
12 个修改的文件
包含
53 行增加
和
24 行删除
pkg/application/orderinfo/service/order_info.go
pkg/domain/order_bestshop.go
pkg/domain/order_log.go
pkg/infrastructure/pg/models/order_good.go
pkg/infrastructure/pg/models/order_good_bestshop.go
pkg/infrastructure/pg/models/order_log.go
pkg/infrastructure/repository/pg_order_base_repository.go
pkg/infrastructure/repository/pg_order_good_bestshop_repository.go
pkg/infrastructure/repository/pg_order_good_repository.go
pkg/infrastructure/repository/pg_order_log_repository.go
pkg/port/beego/controllers/order_dividend_controller.go
pkg/port/beego/routers/router.go
pkg/application/orderinfo/service/order_info.go
查看文件 @
50066ad
...
...
@@ -2,6 +2,7 @@ package service
import
(
"fmt"
"strings"
"time"
"github.com/astaxie/beego/logs"
...
...
@@ -940,6 +941,7 @@ func (service OrderInfoService) buildOrderBestshopInfoData(orderBase *domain.Ord
detail
[
"productCodes"
]
=
v
.
Sn
detail
[
"commodityCode"
]
=
v
.
Bn
}
productDetail
=
append
(
productDetail
,
detail
)
}
product
[
"detail"
]
=
productDetail
modifyLog
:=
[]
map
[
string
]
interface
{}{}
...
...
@@ -955,7 +957,10 @@ func (service OrderInfoService) buildOrderBestshopInfoData(orderBase *domain.Ord
d
:=
map
[
string
]
string
{
"updateTitle"
:
vv
.
Title
,
"id"
:
fmt
.
Sprint
(
ii
),
"content"
:
fmt
.
Sprintf
(
"%s:%s;%s"
,
vv
.
Item
,
vv
.
Action
,
vv
.
Result
),
"content"
:
vv
.
Item
,
}
if
len
(
vv
.
Action
)
>
0
{
d
[
"content"
]
=
vv
.
Item
+
":"
+
strings
.
Join
(
vv
.
Action
,
";"
)
}
detail
=
append
(
detail
,
d
)
}
...
...
pkg/domain/order_bestshop.go
查看文件 @
50066ad
...
...
@@ -63,7 +63,7 @@ type OrderBestshopRepository interface {
type
OrderGoodBestShop
struct
{
Id
int64
`json:"id"`
//订单id
OrdeId
int64
`json:"orderId"`
Orde
r
Id
int64
`json:"orderId"`
//货品编号
Sn
string
`json:"sn"`
//商品编号
...
...
pkg/domain/order_log.go
查看文件 @
50066ad
...
...
@@ -18,18 +18,7 @@ const (
type
OrderLogDescript
struct
{
Title
string
`json:"title"`
//标题
Item
string
`json:"item"`
//修改的项目
Action
string
`json:"action"`
//执行的操作
Result
string
`json:"result"`
//结果
}
//OrderLogContentItem 记录订单的相关属性值的修改
type
OrderLogContent
struct
{
OrderId
string
`json:"orderId"`
//订单id
GoodId
string
`json:"goodId"`
//货品id
Table
string
`json:"Table"`
//名称标题
Item
string
`json:"item"`
//修改的数据字段
FormerValue
string
`json:"formerValue"`
//旧值
NewValue
string
`json:"newValue"`
//新值
Action
[]
string
`json:"action"`
//执行的操作
}
//OrderLog 订单修改记录
...
...
@@ -42,7 +31,6 @@ type OrderLog struct {
OperatorType
string
`json:"operatorType"`
//操作人员的类型
LogAction
string
`json:"logAction"`
//执行动作
Descript
[]
OrderLogDescript
`json:"descript"`
//描述日志内容
Content
[]
OrderLogContent
`json:"content"`
//记录订单的操作动作
DataFrom
string
`json:"dataFrom"`
//修改操作的来源:"web_admin"
}
...
...
pkg/infrastructure/pg/models/order_good.go
查看文件 @
50066ad
...
...
@@ -43,4 +43,6 @@ type OrderGood struct {
CompanyId
int64
//原因备注
RemarkReason
domain
.
OrderGoodRemarkReason
``
DataFrom
domain
.
OrderDataFrom
``
}
...
...
pkg/infrastructure/pg/models/order_good_bestshop.go
查看文件 @
50066ad
...
...
@@ -4,7 +4,7 @@ type OrderGoodBestshop struct {
tableName
struct
{}
`pg:"order_good_bestshop"`
Id
int64
//订单id
OrdeId
int64
Orde
r
Id
int64
//货品编号
Sn
string
//商品编号
...
...
pkg/infrastructure/pg/models/order_log.go
查看文件 @
50066ad
...
...
@@ -19,7 +19,6 @@ type OrderLog struct {
OperatorType
string
``
//操作人员的类型
LogAction
string
``
//执行动作
Descript
[]
domain
.
OrderLogDescript
``
//描述日志内容
Content
[]
domain
.
OrderLogContent
``
//记录订单的操作动作
DataFrom
string
``
//修改操作的来源:"web_admin"
}
...
...
pkg/infrastructure/repository/pg_order_base_repository.go
查看文件 @
50066ad
...
...
@@ -42,6 +42,8 @@ func (reponsitory OrderBaseRepository) transformPgModelToDomainModel(orderModel
},
BonusStatus
:
orderModel
.
BonusStatus
,
CompanyId
:
orderModel
.
CompanyId
,
DataFrom
:
orderModel
.
DataFrom
,
Remark
:
orderModel
.
Remark
,
}
return
order
,
nil
}
...
...
@@ -62,7 +64,8 @@ func (repository OrderBaseRepository) Save(orderInfo *domain.OrderBase) error {
PartnerBonusHas
:
orderInfo
.
OrderCompute
.
PartnerBonusHas
,
PartnerBonusNot
:
orderInfo
.
OrderCompute
.
PartnerBonusNot
,
PartnerBonusExpense
:
orderInfo
.
OrderCompute
.
PartnerBonusExpense
,
IsDisable
:
orderInfo
.
IsDisable
,
CreateTime
:
orderInfo
.
CreateTime
,
BonusStatus
:
orderInfo
.
BonusStatus
,
CompanyId
:
orderInfo
.
CompanyId
,
CompanyId
:
orderInfo
.
CompanyId
,
DataFrom
:
orderInfo
.
DataFrom
,
Remark
:
orderInfo
.
Remark
,
}
if
m
.
Id
==
0
{
_
,
err
=
tx
.
Model
(
m
)
.
...
...
pkg/infrastructure/repository/pg_order_good_bestshop_repository.go
查看文件 @
50066ad
...
...
@@ -26,7 +26,7 @@ func NewOrderGoodBestshopRepository(transactionContext *transaction.TransactionC
func
(
respository
OrderGoodBestshopRepository
)
transformPgModelToDomainModel
(
orderGoodModel
*
models
.
OrderGoodBestshop
)
(
orderGood
domain
.
OrderGoodBestShop
,
err
error
)
{
return
domain
.
OrderGoodBestShop
{
Id
:
orderGoodModel
.
Id
,
Orde
Id
:
orderGoodModel
.
Orde
Id
,
Orde
rId
:
orderGoodModel
.
Order
Id
,
Sn
:
orderGoodModel
.
Sn
,
Bn
:
orderGoodModel
.
Bn
,
Name
:
orderGoodModel
.
Name
,
...
...
@@ -40,7 +40,7 @@ func (respository OrderGoodBestshopRepository) Add(good *domain.OrderGoodBestSho
tx
:=
respository
.
transactionContext
.
GetDB
()
m
:=
models
.
OrderGoodBestshop
{
Id
:
good
.
Id
,
Orde
Id
:
good
.
Orde
Id
,
Orde
rId
:
good
.
Order
Id
,
Sn
:
good
.
Sn
,
Bn
:
good
.
Bn
,
Name
:
good
.
Name
,
...
...
pkg/infrastructure/repository/pg_order_good_repository.go
查看文件 @
50066ad
...
...
@@ -40,6 +40,8 @@ func (reponsitory OrderGoodRepository) transformPgModelToDomainModel(orderModel
PartnerBonusExpense
:
orderModel
.
PartnerBonusExpense
,
},
CompanyId
:
orderModel
.
CompanyId
,
RemarkReason
:
orderModel
.
RemarkReason
,
DataFrom
:
orderModel
.
DataFrom
,
}
switch
orderModel
.
BonusStatus
{
case
domain
.
OrderGoodWaitPay
:
...
...
@@ -64,8 +66,9 @@ func (repository OrderGoodRepository) Save(data []domain.OrderGood) error {
PlanPartnerBonus
:
v
.
GoodCompute
.
PlanPartnerBonus
,
UsePartnerBonus
:
v
.
GoodCompute
.
UsePartnerBonus
,
PartnerBonusHas
:
v
.
GoodCompute
.
PartnerBonusHas
,
PartnerBonusNot
:
v
.
GoodCompute
.
PartnerBonusNot
,
PartnerBonusExpense
:
v
.
GoodCompute
.
PartnerBonusExpense
,
BonusStatus
:
v
.
BonusStatus
,
Remark
:
v
.
Remark
,
CompanyId
:
v
.
CompanyId
,
Remark
:
v
.
Remark
,
CompanyId
:
v
.
CompanyId
,
RemarkReason
:
v
.
RemarkReason
,
DataFrom
:
v
.
DataFrom
,
}
if
v
.
Id
==
0
{
_
,
err
=
tx
.
Model
(
m
)
.
...
...
pkg/infrastructure/repository/pg_order_log_repository.go
查看文件 @
50066ad
...
...
@@ -33,7 +33,6 @@ func (repository OrderLogRepository) transformPgModelToDomainModel(m *models.Ord
LogAction
:
m
.
LogAction
,
Descript
:
m
.
Descript
,
DataFrom
:
m
.
DataFrom
,
Content
:
m
.
Content
,
},
nil
}
...
...
@@ -46,7 +45,6 @@ func (repository OrderLogRepository) Add(data *domain.OrderLog) error {
OperatorType
:
data
.
OperatorType
,
LogAction
:
data
.
LogAction
,
Descript
:
data
.
Descript
,
Content
:
data
.
Content
,
DataFrom
:
data
.
DataFrom
,
}
_
,
err
:=
db
.
Model
(
&
m
)
.
Insert
()
...
...
pkg/port/beego/controllers/order_dividend_controller.go
查看文件 @
50066ad
...
...
@@ -278,3 +278,33 @@ func (c *OrderDividendController) EditOrderDividend() {
c
.
ResponseData
(
nil
)
return
}
//OrderDividendDetailForBestshop 海鲜干货的订单分红详情
func
(
c
*
OrderDividendController
)
OrderDividendDetailForBestshop
()
{
type
Parameter
struct
{
Id
string
`json:"id"`
}
var
(
param
Parameter
err
error
)
if
err
=
c
.
BindJsonData
(
&
param
);
err
!=
nil
{
logs
.
Error
(
err
)
c
.
ResponseError
(
errors
.
New
(
"json数据解析失败"
))
return
}
orderid
,
_
:=
strconv
.
ParseInt
(
param
.
Id
,
10
,
64
)
if
orderid
==
0
{
c
.
ResponseError
(
errors
.
New
(
"参数错误"
))
return
}
companyId
:=
c
.
GetUserCompany
()
orderSrv
:=
orderService
.
NewOrderInfoService
(
nil
)
respData
,
err
:=
orderSrv
.
GetOrderBestshopInfoWithBonus
(
orderid
,
companyId
)
if
err
!=
nil
{
c
.
ResponseError
(
err
)
return
}
c
.
ResponseData
(
respData
)
return
}
...
...
pkg/port/beego/routers/router.go
查看文件 @
50066ad
...
...
@@ -29,6 +29,7 @@ func init() {
beego
.
NSRouter
(
"/list"
,
&
controllers
.
OrderDividendController
{},
"POST:PageListOrderDividend"
),
beego
.
NSRouter
(
"/edit"
,
&
controllers
.
OrderDividendController
{},
"POST:EditOrderDividend"
),
beego
.
NSRouter
(
"/detail"
,
&
controllers
.
OrderDividendController
{},
"POST:OrderDividendDetail"
),
beego
.
NSRouter
(
"/mini-program/detail"
,
&
controllers
.
OrderDividendController
{},
"POST:OrderDividendDetailForBestshop"
),
beego
.
NSRouter
(
"/business/detail"
,
&
controllers
.
BusinessBonusController
{},
"POST:GetBusinessBonus"
),
beego
.
NSRouter
(
"/business/edit"
,
&
controllers
.
BusinessBonusController
{},
"POST:UpdateBusinessBonus"
),
...
...
请
注册
或
登录
后发表评论