allied-creation / allied-creation-gateway · 提交

转到一个项目

作者 tangxuhui
提交 5280e025b2353340254fee65cb0bf05269ee7b77 1 个父辈 8d53371a

列表添加 权限标识

内嵌 并排对比
正在显示 10 个修改的文件 包含 58 行增加 和 30 行删除
@@ -44,9 +44,10 @@ type CreditAccountItem struct { @@ -44,9 +44,10 @@ type CreditAccountItem struct {
44 UserAccount string `json:"userAccount"` // 用户账号， 44 UserAccount string `json:"userAccount"` // 用户账号，
45 } `json:"userInfo"` 45 } `json:"userInfo"`
46 } `json:"operator"` 46 } `json:"operator"`
  47 + AuthFlag bool `json:"authFlag"`
47 } 48 }
48 49
49 -func ToCreditAccountItem(param *allied_creation_cooperation.CreditAccount) *CreditAccountItem { 50 +func ToCreditAccountItem(param *allied_creation_cooperation.CreditAccount, operatorOrgId int64) *CreditAccountItem {
50 data := CreditAccountItem{ 51 data := CreditAccountItem{
51 CreditAccountId: param.CreditAccountId, 52 CreditAccountId: param.CreditAccountId,
52 ActuallyPaidAmount: param.ActuallyPaidAmount, 53 ActuallyPaidAmount: param.ActuallyPaidAmount,
@@ -62,6 +63,7 @@ func ToCreditAccountItem(param *allied_creation_cooperation.CreditAccount) *Cred @@ -62,6 +63,7 @@ func ToCreditAccountItem(param *allied_creation_cooperation.CreditAccount) *Cred
62 CreatedAt: param.CreatedAt.UnixNano() / 1e6, // 创建时间 63 CreatedAt: param.CreatedAt.UnixNano() / 1e6, // 创建时间
63 UpdatedAt: param.UpdatedAt.UnixNano() / 1e6, // 更新时间 64 UpdatedAt: param.UpdatedAt.UnixNano() / 1e6, // 更新时间
64 AccountDetail: param.AccountDetail, 65 AccountDetail: param.AccountDetail,
  66 + AuthFlag: param.Org.OrgID == int(operatorOrgId),
65 } 67 }
66 if !param.PaymentTime.IsZero() { 68 if !param.PaymentTime.IsZero() {
67 data.PaymentTime = param.PaymentTime.UnixNano() / 1e6 69 data.PaymentTime = param.PaymentTime.UnixNano() / 1e6
@@ -29,7 +29,7 @@ func (srv *CreditAccountService) ListCreditAccount(listQuery *query.ListCreditAc @@ -29,7 +29,7 @@ func (srv *CreditAccountService) ListCreditAccount(listQuery *query.ListCreditAc
29 } 29 }
30 listData := []dto.CreditAccountItem{} 30 listData := []dto.CreditAccountItem{}
31 for i := range result.Grid.List { 31 for i := range result.Grid.List {
32 - item := dto.ToCreditAccountItem(&result.Grid.List[i]) 32 + item := dto.ToCreditAccountItem(&result.Grid.List[i], listQuery.Operator.OrgId)
33 listData = append(listData, *item) 33 listData = append(listData, *item)
34 } 34 }
35 return int64(result.Grid.Total), listData, nil 35 return int64(result.Grid.Total), listData, nil
@@ -44,7 +44,7 @@ func (srv *CreditAccountService) GetCreditAccount(getQuery *query.GetCreditAccou @@ -44,7 +44,7 @@ func (srv *CreditAccountService) GetCreditAccount(getQuery *query.GetCreditAccou
44 if err != nil { 44 if err != nil {
45 return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) 45 return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
46 } 46 }
47 - return dto.ToCreditAccountItem(&result.CreditAccount), nil 47 + return dto.ToCreditAccountItem(&result.CreditAccount, getQuery.Operator.OrgId), nil
48 } 48 }
49 49
50 //PayCreditAccount 支付账期结算 50 //PayCreditAccount 支付账期结算
@@ -15,28 +15,29 @@ type DividendsEstimateDividendItem struct { @@ -15,28 +15,29 @@ type DividendsEstimateDividendItem struct {
15 OrderTime int64 `json:"orderTime"` //订单/退货单日期 15 OrderTime int64 `json:"orderTime"` //订单/退货单日期
16 OriginalOrderNum string `json:"originalOrderNum"` //来源单号，源单号，订单号 16 OriginalOrderNum string `json:"originalOrderNum"` //来源单号，源单号，订单号
17 RegionName string `json:"regionName"` //区域名称 17 RegionName string `json:"regionName"` //区域名称
  18 + AuthFlag bool `json:"authFlag"`
18 } 19 }
19 20
20 -func ToDividendsEstimateDividendItem(param *allied_creation_cooperation.DataDividendsEstimateSearchDividend) []DividendsEstimateDividendItem {  
21 - listdata := []DividendsEstimateDividendItem{}  
22 - for _, v := range param.List {  
23 - item := DividendsEstimateDividendItem{  
24 - OrderGoodId: v.OrderGoodId,  
25 - OrderGoodName: v.OrderGoodName,  
26 - CooperationContractNumber: v.CooperationContractNumber,  
27 - CustomerName: v.CustomerName,  
28 - DividendsIncentivesAmount: v.OrderAmount,  
29 - OrderOrReturnedOrderNum: v.OrderNumber, 21 +// func ToDividendsEstimateDividendItem(param *allied_creation_cooperation.DataDividendsEstimateSearchDividend) []DividendsEstimateDividendItem {
  22 +// listdata := []DividendsEstimateDividendItem{}
  23 +// for _, v := range param.List {
  24 +// item := DividendsEstimateDividendItem{
  25 +// OrderGoodId: v.OrderGoodId,
  26 +// OrderGoodName: v.OrderGoodName,
  27 +// CooperationContractNumber: v.CooperationContractNumber,
  28 +// CustomerName: v.CustomerName,
  29 +// DividendsIncentivesAmount: v.OrderAmount,
  30 +// OrderOrReturnedOrderNum: v.OrderNumber,
30 31
31 - OriginalOrderNum: v.OriginalOrderNum,  
32 - RegionName: v.RegionName,  
33 - }  
34 - item.OrderTime = v.OrderDate.UnixNano() / 1e6  
35 - listdata = append(listdata, item)  
36 - } 32 +// OriginalOrderNum: v.OriginalOrderNum,
  33 +// RegionName: v.RegionName,
  34 +// }
  35 +// item.OrderTime = v.OrderDate.UnixNano() / 1e6
  36 +// listdata = append(listdata, item)
  37 +// }
37 38
38 - return listdata  
39 -} 39 +// return listdata
  40 +// }
40 41
41 //金额激励列表 42 //金额激励列表
42 type DividendsEstimateMoneyItem struct { 43 type DividendsEstimateMoneyItem struct {
@@ -108,4 +109,5 @@ type DividendsEstimateItem struct { @@ -108,4 +109,5 @@ type DividendsEstimateItem struct {
108 OrgId int `json:"orgId,string,"` // 组织机构ID 109 OrgId int `json:"orgId,string,"` // 组织机构ID
109 OrgName string `json:"orgName"` // 组织名称 110 OrgName string `json:"orgName"` // 组织名称
110 } `json:"org"` // 数据所属组织机构 111 } `json:"org"` // 数据所属组织机构
  112 + AuthFlag bool `json:"authFlag"`
111 } 113 }
@@ -96,6 +96,7 @@ func (dividendsEstimateService *DividendsEstimateService) SearchDividendsEstimat @@ -96,6 +96,7 @@ func (dividendsEstimateService *DividendsEstimateService) SearchDividendsEstimat
96 CooperationContractNumber: v.CooperationContractNumber, 96 CooperationContractNumber: v.CooperationContractNumber,
97 DividendsIncentivesStage: v.DividendsStage, 97 DividendsIncentivesStage: v.DividendsStage,
98 IsCanceled: v.IsCanceled, 98 IsCanceled: v.IsCanceled,
  99 + AuthFlag: v.Org.OrgId == int(searchDividendsEstimateQuery.Operator.OrgId),
99 } 100 }
100 item.DividendsUser.Phone = v.DividendsUser.UserInfo.UserPhone 101 item.DividendsUser.Phone = v.DividendsUser.UserInfo.UserPhone
101 item.DividendsUser.UsersName = v.DividendsUser.UserInfo.UserName 102 item.DividendsUser.UsersName = v.DividendsUser.UserInfo.UserName
@@ -125,7 +126,22 @@ func (dividendsEstimateService *DividendsEstimateService) SearchDividendsIncenti @@ -125,7 +126,22 @@ func (dividendsEstimateService *DividendsEstimateService) SearchDividendsIncenti
125 if err != nil { 126 if err != nil {
126 return 0, nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) 127 return 0, nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
127 } 128 }
128 - listdata := dto.ToDividendsEstimateDividendItem(result) 129 +
  130 + listdata := []dto.DividendsEstimateDividendItem{}
  131 + for _, v := range result.List {
  132 + item := dto.DividendsEstimateDividendItem{
  133 + OrderGoodId: v.OrderGoodId,
  134 + OrderGoodName: v.OrderGoodName,
  135 + CooperationContractNumber: v.CooperationContractNumber,
  136 + CustomerName: v.CustomerName,
  137 + DividendsIncentivesAmount: v.OrderAmount,
  138 + OrderOrReturnedOrderNum: v.OrderNumber,
  139 + OriginalOrderNum: v.OriginalOrderNum,
  140 + RegionName: v.RegionName,
  141 + }
  142 + item.OrderTime = v.OrderDate.UnixNano() / 1e6
  143 + listdata = append(listdata, item)
  144 + }
129 return result.Total, listdata, nil 145 return result.Total, listdata, nil
130 } 146 }
131 147
@@ -29,6 +29,7 @@ type DividendsOrder struct { @@ -29,6 +29,7 @@ type DividendsOrder struct {
29 Remarks string `json:"remarks"` 29 Remarks string `json:"remarks"`
30 Goods []DividendsOrderGoods `json:"goods"` 30 Goods []DividendsOrderGoods `json:"goods"`
31 Returned bool `json:"returned"` 31 Returned bool `json:"returned"`
  32 + AuthFlag bool `json:"authFlag"`
32 } 33 }
33 34
34 type DividendsOrderGoods struct { 35 type DividendsOrderGoods struct {
@@ -44,7 +45,7 @@ type DividendsOrderGoods struct { @@ -44,7 +45,7 @@ type DividendsOrderGoods struct {
44 OrderGoodDividendsStatus int32 `json:"orderGoodDividendsStatus"` // 订单产品分红状态， 1待分红，2已分红 45 OrderGoodDividendsStatus int32 `json:"orderGoodDividendsStatus"` // 订单产品分红状态， 1待分红，2已分红
45 } 46 }
46 47
47 -func ToDividendsOrder(param *allied_creation_cooperation.DividendsOrder) *DividendsOrder { 48 +func ToDividendsOrder(param *allied_creation_cooperation.DividendsOrder, operatorOrgId int64) *DividendsOrder {
48 goods := []DividendsOrderGoods{} 49 goods := []DividendsOrderGoods{}
49 for _, v := range param.Goods { 50 for _, v := range param.Goods {
50 good := DividendsOrderGoods{ 51 good := DividendsOrderGoods{
@@ -75,6 +76,7 @@ func ToDividendsOrder(param *allied_creation_cooperation.DividendsOrder) *Divide @@ -75,6 +76,7 @@ func ToDividendsOrder(param *allied_creation_cooperation.DividendsOrder) *Divide
75 Remarks: param.Remarks, 76 Remarks: param.Remarks,
76 Goods: goods, 77 Goods: goods,
77 Returned: param.Returned, 78 Returned: param.Returned,
  79 + AuthFlag: param.Org.OrgID == int(operatorOrgId),
78 } 80 }
79 81
80 return &data 82 return &data
@@ -48,7 +48,7 @@ func (dividendsOrderService *DividendsOrderService) CreateDividendsOrder(createD @@ -48,7 +48,7 @@ func (dividendsOrderService *DividendsOrderService) CreateDividendsOrder(createD
48 return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) 48 return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
49 } 49 }
50 50
51 - return dto.ToDividendsOrder(&result.DividendsOrder), nil 51 + return dto.ToDividendsOrder(&result.DividendsOrder, createDividendsOrderCommand.Operator.OrgId), nil
52 } 52 }
53 53
54 // 返回分红订单实体对象 54 // 返回分红订单实体对象
@@ -61,7 +61,7 @@ func (dividendsOrderService *DividendsOrderService) GetDividendsOrder(getDividen @@ -61,7 +61,7 @@ func (dividendsOrderService *DividendsOrderService) GetDividendsOrder(getDividen
61 if err != nil { 61 if err != nil {
62 return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) 62 return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
63 } 63 }
64 - return dto.ToDividendsOrder(&result.DividendsOrder), nil 64 + return dto.ToDividendsOrder(&result.DividendsOrder, getDividendsOrderQuery.Operator.OrgId), nil
65 } 65 }
66 66
67 // 移除分红订单实体对象 67 // 移除分红订单实体对象
@@ -93,7 +93,7 @@ func (dividendsOrderService *DividendsOrderService) SearchDividendsOrder(searchD @@ -93,7 +93,7 @@ func (dividendsOrderService *DividendsOrderService) SearchDividendsOrder(searchD
93 } 93 }
94 dataList := []dto.DividendsOrder{} 94 dataList := []dto.DividendsOrder{}
95 for i := range result.Grid.List { 95 for i := range result.Grid.List {
96 - item := dto.ToDividendsOrder(&result.Grid.List[i]) 96 + item := dto.ToDividendsOrder(&result.Grid.List[i], searchDividendsOrderQuery.Operator.OrgId)
97 dataList = append(dataList, *item) 97 dataList = append(dataList, *item)
98 } 98 }
99 return result.Grid.Total, dataList, nil 99 return result.Grid.Total, dataList, nil
@@ -33,10 +33,12 @@ type DividendsReturnedOrderInfo struct { @@ -33,10 +33,12 @@ type DividendsReturnedOrderInfo struct {
33 RegionName string `json:"regionName"` 33 RegionName string `json:"regionName"`
34 RegionNumber string `json:"regionNumber"` //区域编码 34 RegionNumber string `json:"regionNumber"` //区域编码
35 } `json:"region"` //区域信息 35 } `json:"region"` //区域信息
  36 + AuthFlag bool `json:"authFlag"`
36 Goods []allied_creation_cooperation.DividendsReturnedOrderGoods `json:"goods"` //货品 37 Goods []allied_creation_cooperation.DividendsReturnedOrderGoods `json:"goods"` //货品
  38 +
37 } 39 }
38 40
39 -func ToDividendsReturnedOrderInfo(param *allied_creation_cooperation.DividendsReturnedOrder) *DividendsReturnedOrderInfo { 41 +func ToDividendsReturnedOrderInfo(param *allied_creation_cooperation.DividendsReturnedOrder, operatorOrgId int64) *DividendsReturnedOrderInfo {
40 goods := param.Goods 42 goods := param.Goods
41 if len(param.Goods) == 0 { 43 if len(param.Goods) == 0 {
42 goods = []allied_creation_cooperation.DividendsReturnedOrderGoods{} 44 goods = []allied_creation_cooperation.DividendsReturnedOrderGoods{}
@@ -58,6 +60,7 @@ func ToDividendsReturnedOrderInfo(param *allied_creation_cooperation.DividendsRe @@ -58,6 +60,7 @@ func ToDividendsReturnedOrderInfo(param *allied_creation_cooperation.DividendsRe
58 DividendsReturnedOrderRefund: param.DividendsReturnedOrderRefund, 60 DividendsReturnedOrderRefund: param.DividendsReturnedOrderRefund,
59 OriginalOrderNum: param.OriginalOrderNum, 61 OriginalOrderNum: param.OriginalOrderNum,
60 Remarks: param.Remarks, 62 Remarks: param.Remarks,
  63 + AuthFlag: param.Org.OrgID == int(operatorOrgId),
61 } 64 }
62 return &data 65 return &data
63 } 66 }
@@ -44,7 +44,7 @@ func (dividendsReturnedOrderService *DividendsReturnedOrderService) CreateDivide @@ -44,7 +44,7 @@ func (dividendsReturnedOrderService *DividendsReturnedOrderService) CreateDivide
44 if err != nil { 44 if err != nil {
45 return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) 45 return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
46 } 46 }
47 - return dto.ToDividendsReturnedOrderInfo(&result.DividendsReturnedOrder), nil 47 + return dto.ToDividendsReturnedOrderInfo(&result.DividendsReturnedOrder, createDividendsReturnedOrderCommand.Operator.OrgId), nil
48 } 48 }
49 49
50 // 返回分红退货单服务 50 // 返回分红退货单服务
@@ -56,7 +56,7 @@ func (dividendsReturnedOrderService *DividendsReturnedOrderService) GetDividends @@ -56,7 +56,7 @@ func (dividendsReturnedOrderService *DividendsReturnedOrderService) GetDividends
56 if err != nil { 56 if err != nil {
57 return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) 57 return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
58 } 58 }
59 - return dto.ToDividendsReturnedOrderInfo(&result.DividendsReturnedOrder), nil 59 + return dto.ToDividendsReturnedOrderInfo(&result.DividendsReturnedOrder, getDividendsReturnedOrderQuery.Operator.OrgId), nil
60 } 60 }
61 61
62 // 移除分红退货单服务 62 // 移除分红退货单服务
@@ -85,7 +85,7 @@ func (dividendsReturnedOrderService *DividendsReturnedOrderService) SearchDivide @@ -85,7 +85,7 @@ func (dividendsReturnedOrderService *DividendsReturnedOrderService) SearchDivide
85 } 85 }
86 dataList := []dto.DividendsReturnedOrderInfo{} 86 dataList := []dto.DividendsReturnedOrderInfo{}
87 for i := range result.Grid.List { 87 for i := range result.Grid.List {
88 - item := dto.ToDividendsReturnedOrderInfo(&result.Grid.List[i]) 88 + item := dto.ToDividendsReturnedOrderInfo(&result.Grid.List[i], searchDividendsReturnedOrderQuery.Operator.OrgId)
89 dataList = append(dataList, *item) 89 dataList = append(dataList, *item)
90 } 90 }
91 return result.Grid.Total, dataList, nil 91 return result.Grid.Total, dataList, nil
@@ -10,4 +10,5 @@ type NoticeSettingItem struct { @@ -10,4 +10,5 @@ type NoticeSettingItem struct {
10 NoticeSettingID int `json:"noticeSettingId,string"` 10 NoticeSettingID int `json:"noticeSettingId,string"`
11 OrgID int `json:"orgId,string"` 11 OrgID int `json:"orgId,string"`
12 OrgName string `json:"orgName"` 12 OrgName string `json:"orgName"`
  13 + AuthFlag bool `json:"authFlag"`
13 } 14 }
@@ -69,6 +69,7 @@ func (noticeSettingService *NoticeSettingService) NoticeSettingList(noticeSettin @@ -69,6 +69,7 @@ func (noticeSettingService *NoticeSettingService) NoticeSettingList(noticeSettin
69 NoticeSettingID: v.NoticeSettingID, 69 NoticeSettingID: v.NoticeSettingID,
70 OrgID: v.OrgID, 70 OrgID: v.OrgID,
71 ModuleActionName: v.ModuleActionName, 71 ModuleActionName: v.ModuleActionName,
  72 + AuthFlag: v.OrgID == int(noticeSettingListQuery.Operator.OrgId),
72 } 73 }
73 orgData, _ := creationUserGateway.OrgGet(allied_creation_user.ReqOrgGet{ 74 orgData, _ := creationUserGateway.OrgGet(allied_creation_user.ReqOrgGet{
74 OrgId: v.OrgID, 75 OrgId: v.OrgID,
@@ -163,6 +164,7 @@ func (noticeSettingService *NoticeSettingService) NoticeSettingGet(noticeSetting @@ -163,6 +164,7 @@ func (noticeSettingService *NoticeSettingService) NoticeSettingGet(noticeSetting
163 ModuleAction: result.ModuleAction, 164 ModuleAction: result.ModuleAction,
164 NoticeSettingID: result.NoticeSettingID, 165 NoticeSettingID: result.NoticeSettingID,
165 OrgID: result.OrgID, 166 OrgID: result.OrgID,
  167 + AuthFlag: result.OrgID == int(noticeSettingGetQuery.Operator.OrgId),
166 } 168 }
167 return data, nil 169 return data, nil
168 } 170 }