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

转到一个项目

作者 yangfu
提交 14c9c4f5b8cf04c68ad0684a750a718a1957298f 2 个父辈 44bbc73b cfb4076d

Merge branch 'dev' of http://gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway into dev

内嵌 并排对比
正在显示 7 个修改的文件 包含 15 行增加 和 8 行删除
@@ -48,5 +48,6 @@ type PersonSearchCooperationProjectQuery struct { @@ -48,5 +48,6 @@ type PersonSearchCooperationProjectQuery struct {
48 // 查询限制 48 // 查询限制
49 PageSize int `json:"pageSize" valid:"Required"` 49 PageSize int `json:"pageSize" valid:"Required"`
50 // 50 //
51 - OrgId int64 `json:"orgId"` 51 + OrgId int64 `json:"orgId"`
  52 + Keyword string `json:"keyword"`
52 } 53 }
@@ -111,6 +111,7 @@ func (srv CooperationProjectService) PersonSearchCooperationProject(projectQuery @@ -111,6 +111,7 @@ func (srv CooperationProjectService) PersonSearchCooperationProject(projectQuery
111 PageSize: projectQuery.PageSize, 111 PageSize: projectQuery.PageSize,
112 OrgId: projectQuery.OrgId, 112 OrgId: projectQuery.OrgId,
113 Status: 1, //搜索状态为“招标中”项目 113 Status: 1, //搜索状态为“招标中”项目
  114 + Keyword: projectQuery.Keyword,
114 //UserBaseId: projectQuery.Operator.UserBaseId, 115 //UserBaseId: projectQuery.Operator.UserBaseId,
115 }) 116 })
116 if err != nil { 117 if err != nil {
@@ -28,8 +28,8 @@ func (dividendsOrderService *DividendsOrderService) CreateDividendsOrder(createD @@ -28,8 +28,8 @@ func (dividendsOrderService *DividendsOrderService) CreateDividendsOrder(createD
28 OrderGoodPrice: v.OrderGoodPrice, 28 OrderGoodPrice: v.OrderGoodPrice,
29 OrderGoodQuantity: v.OrderGoodQuantity, 29 OrderGoodQuantity: v.OrderGoodQuantity,
30 } 30 }
31 - orderGoodAmount := v.OrderGoodPrice*float64(v.OrderGoodQuantity) - v.OrderGoodExpense  
32 - good.OrderGoodAmount = orderGoodAmount 31 + // orderGoodAmount := v.OrderGoodPrice*float64(v.OrderGoodQuantity) - v.OrderGoodExpense
  32 + // good.OrderGoodAmount = orderGoodAmount
33 orderGoods = append(orderGoods, good) 33 orderGoods = append(orderGoods, good)
34 } 34 }
35 creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(createDividendsOrderCommand.Operator) 35 creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(createDividendsOrderCommand.Operator)
@@ -114,8 +114,8 @@ func (dividendsOrderService *DividendsOrderService) UpdateDividendsOrder(updateD @@ -114,8 +114,8 @@ func (dividendsOrderService *DividendsOrderService) UpdateDividendsOrder(updateD
114 OrderGoodPrice: v.OrderGoodPrice, 114 OrderGoodPrice: v.OrderGoodPrice,
115 OrderGoodQuantity: v.OrderGoodQuantity, 115 OrderGoodQuantity: v.OrderGoodQuantity,
116 } 116 }
117 - orderGoodAmount := v.OrderGoodPrice*float64(v.OrderGoodQuantity) - v.OrderGoodExpense  
118 - good.OrderGoodAmount = orderGoodAmount 117 + // orderGoodAmount := v.OrderGoodPrice*float64(v.OrderGoodQuantity) - v.OrderGoodExpense
  118 + // good.OrderGoodAmount = orderGoodAmount
119 orderGoods = append(orderGoods, good) 119 orderGoods = append(orderGoods, good)
120 } 120 }
121 creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(updateDividendsOrderCommand.Operator) 121 creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(updateDividendsOrderCommand.Operator)
@@ -12,7 +12,7 @@ type UpdateDividendsReturnedOrderCommand struct { @@ -12,7 +12,7 @@ type UpdateDividendsReturnedOrderCommand struct {
12 DividendsOrderNumber string `json:"dividendsOrderNumber"` //分红单号 12 DividendsOrderNumber string `json:"dividendsOrderNumber"` //分红单号
13 OriginalOrderNum string `json:"originalOrderNum"` //源单号 13 OriginalOrderNum string `json:"originalOrderNum"` //源单号
14 OrderGoods []struct { 14 OrderGoods []struct {
15 - OrderGoodId int64 `json:"orderGoodId,string"` // 订单产品id 15 + OrderGoodId int `json:"orderGoodId,string"` // 订单产品id
16 CooperationContractNumber string `json:"cooperationContractNumber"` //关联的共创合约编号 16 CooperationContractNumber string `json:"cooperationContractNumber"` //关联的共创合约编号
17 // OrderGoodAmount float64 `json:"orderGoodAmount"` //订单产品金额 17 // OrderGoodAmount float64 `json:"orderGoodAmount"` //订单产品金额
18 OrderGoodName string `json:"orderGoodName"` //订单产品名称 18 OrderGoodName string `json:"orderGoodName"` //订单产品名称
@@ -21,13 +21,14 @@ func (dividendsReturnedOrderService *DividendsReturnedOrderService) CreateDivide @@ -21,13 +21,14 @@ func (dividendsReturnedOrderService *DividendsReturnedOrderService) CreateDivide
21 var orderGooods []allied_creation_cooperation.ReqDividendsReturnedOrderGood 21 var orderGooods []allied_creation_cooperation.ReqDividendsReturnedOrderGood
22 for _, v := range createDividendsReturnedOrderCommand.OrderGoods { 22 for _, v := range createDividendsReturnedOrderCommand.OrderGoods {
23 good := allied_creation_cooperation.ReqDividendsReturnedOrderGood{ 23 good := allied_creation_cooperation.ReqDividendsReturnedOrderGood{
  24 + OrderGoodId: "0",
24 CooperationContractNumber: v.CooperationContractNumber, 25 CooperationContractNumber: v.CooperationContractNumber,
25 OrderGoodAmount: 0, 26 OrderGoodAmount: 0,
26 OrderGoodName: v.OrderGoodName, 27 OrderGoodName: v.OrderGoodName,
27 OrderGoodPrice: v.OrderGoodPrice, 28 OrderGoodPrice: v.OrderGoodPrice,
28 OrderGoodQuantity: v.OrderGoodQuantity, 29 OrderGoodQuantity: v.OrderGoodQuantity,
29 } 30 }
30 - good.OrderGoodAmount = good.OrderGoodPrice * float64(good.OrderGoodQuantity) 31 + // good.OrderGoodAmount = good.OrderGoodPrice * float64(good.OrderGoodQuantity)
31 orderGooods = append(orderGooods, good) 32 orderGooods = append(orderGooods, good)
32 } 33 }
33 result, err := creationCooperationGateway.DividendsReturnedOrderAdd(allied_creation_cooperation.ReqDividendsReturnedOrderAdd{ 34 result, err := creationCooperationGateway.DividendsReturnedOrderAdd(allied_creation_cooperation.ReqDividendsReturnedOrderAdd{
@@ -97,13 +98,14 @@ func (dividendsReturnedOrderService *DividendsReturnedOrderService) UpdateDivide @@ -97,13 +98,14 @@ func (dividendsReturnedOrderService *DividendsReturnedOrderService) UpdateDivide
97 var orderGooods []allied_creation_cooperation.ReqDividendsReturnedOrderGood 98 var orderGooods []allied_creation_cooperation.ReqDividendsReturnedOrderGood
98 for _, v := range updateDividendsReturnedOrderCommand.OrderGoods { 99 for _, v := range updateDividendsReturnedOrderCommand.OrderGoods {
99 good := allied_creation_cooperation.ReqDividendsReturnedOrderGood{ 100 good := allied_creation_cooperation.ReqDividendsReturnedOrderGood{
  101 + OrderGoodId: strconv.Itoa(v.OrderGoodId),
100 CooperationContractNumber: v.CooperationContractNumber, 102 CooperationContractNumber: v.CooperationContractNumber,
101 OrderGoodAmount: 0, 103 OrderGoodAmount: 0,
102 OrderGoodName: v.OrderGoodName, 104 OrderGoodName: v.OrderGoodName,
103 OrderGoodPrice: v.OrderGoodPrice, 105 OrderGoodPrice: v.OrderGoodPrice,
104 OrderGoodQuantity: v.OrderGoodQuantity, 106 OrderGoodQuantity: v.OrderGoodQuantity,
105 } 107 }
106 - good.OrderGoodAmount = good.OrderGoodPrice * float64(good.OrderGoodQuantity) 108 + // good.OrderGoodAmount = good.OrderGoodPrice * float64(good.OrderGoodQuantity)
107 orderGooods = append(orderGooods, good) 109 orderGooods = append(orderGooods, good)
108 } 110 }
109 _, err := creationCooperationGateway.DividendsReturnedOrderUpdate(allied_creation_cooperation.ReqDividendsReturnedOrderUpdate{ 111 _, err := creationCooperationGateway.DividendsReturnedOrderUpdate(allied_creation_cooperation.ReqDividendsReturnedOrderUpdate{
@@ -156,6 +156,8 @@ type ( @@ -156,6 +156,8 @@ type (
156 CooperationProjectName string `json:"cooperationProjectName"` 156 CooperationProjectName string `json:"cooperationProjectName"`
157 // 共创项目状态，1招标中，2结束 0 全部 157 // 共创项目状态，1招标中，2结束 0 全部
158 Status int `json:"status"` 158 Status int `json:"status"`
  159 + // 关键字搜索
  160 + Keyword string `cname:"关键字" json:"keyword"`
159 // 组织机构ID 161 // 组织机构ID
160 OrgId int64 `cname:"组织机构ID" json:"orgId"` 162 OrgId int64 `cname:"组织机构ID" json:"orgId"`
161 OrgIds []int64 `json:"orgIds"` 163 OrgIds []int64 `json:"orgIds"`
@@ -50,6 +50,7 @@ type ( @@ -50,6 +50,7 @@ type (
50 50
51 // 51 //
52 ReqDividendsReturnedOrderGood struct { 52 ReqDividendsReturnedOrderGood struct {
  53 + OrderGoodId string `json:"orderGoodId"`
53 CooperationContractNumber string `json:"cooperationContractNumber"` //关联的共创合约编号 54 CooperationContractNumber string `json:"cooperationContractNumber"` //关联的共创合约编号
54 OrderGoodAmount float64 `json:"orderGoodAmount"` //订单产品金额 55 OrderGoodAmount float64 `json:"orderGoodAmount"` //订单产品金额
55 OrderGoodName string `json:"orderGoodName"` //订单产品名称 56 OrderGoodName string `json:"orderGoodName"` //订单产品名称