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

转到一个项目

作者 tangxuhui
提交 2a2c2de7d12e1674e043327eb4ff753b99666925 1 个父辈 06566188

调试

内嵌 并排对比
正在显示 5 个修改的文件 包含 48 行增加 和 18 行删除
@@ -14,7 +14,7 @@ type DividendsOrder struct { @@ -14,7 +14,7 @@ type DividendsOrder struct {
14 DividendStatus int `json:"dividendStatus"` //分红订单分红状态，1待分红，2已分红，3部分分红 14 DividendStatus int `json:"dividendStatus"` //分红订单分红状态，1待分红，2已分红，3部分分红
15 DividendTime int64 `json:"dividendTime"` //分红订单分红时间 15 DividendTime int64 `json:"dividendTime"` //分红订单分红时间
16 DividendsOrderAmount float64 `json:"dividendsOrderAmount"` //分红订单金额 16 DividendsOrderAmount float64 `json:"dividendsOrderAmount"` //分红订单金额
17 - DividendsOrderID int `json:"dividendsOrderId"` //分红订单 17 + DividendsOrderID int `json:"dividendsOrderId,string"` //分红订单
18 DividendsOrderNumber string `json:"dividendsOrderNumber"` //分红订单号 18 DividendsOrderNumber string `json:"dividendsOrderNumber"` //分红订单号
19 DividendsOriginalOrderNum string `json:"dividendsOriginalOrderNum"` //分红订单原单号 19 DividendsOriginalOrderNum string `json:"dividendsOriginalOrderNum"` //分红订单原单号
20 OrderTime int64 `json:"orderTime"` 20 OrderTime int64 `json:"orderTime"`
@@ -7,6 +7,16 @@ import ( @@ -7,6 +7,16 @@ import (
7 7
8 type CreateDividendsReturnedOrderCommand struct { 8 type CreateDividendsReturnedOrderCommand struct {
9 //操作人 9 //操作人
10 - Operator domain.Operator `json:"-"`  
11 - allied_creation_cooperation.ReqDividendsReturnedOrderAdd 10 + Operator domain.Operator `json:"-"`
  11 + DividendsReturnedCustomerName string `json:"dividendsReturnedCustomerName"` //退货客户
  12 + DividendsOrderNumber string `json:"dividendsOrderNumber"` //分红单号
  13 + OriginalOrderNum string `json:"originalOrderNum"` //源单号
  14 + //货品
  15 + OrderGoods []allied_creation_cooperation.DividendsReturnedOrderGoods `json:"orderGoods"`
  16 +
  17 + DividendsReturnedDate int `json:"dividendsReturnedDate"` //退货日期
  18 + OrderDate int `json:"orderDate"` //订单日期
  19 +
  20 + Remarks string `json:"remarks"` //
  21 + RegionName string `json:"regionName"`
12 } 22 }
@@ -18,7 +18,17 @@ type DividendsReturnedOrderService struct { @@ -18,7 +18,17 @@ type DividendsReturnedOrderService struct {
18 func (dividendsReturnedOrderService *DividendsReturnedOrderService) CreateDividendsReturnedOrder(createDividendsReturnedOrderCommand *command.CreateDividendsReturnedOrderCommand) (interface{}, error) { 18 func (dividendsReturnedOrderService *DividendsReturnedOrderService) CreateDividendsReturnedOrder(createDividendsReturnedOrderCommand *command.CreateDividendsReturnedOrderCommand) (interface{}, error) {
19 19
20 creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(createDividendsReturnedOrderCommand.Operator) 20 creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(createDividendsReturnedOrderCommand.Operator)
21 - _, err := creationCooperationGateway.DividendsReturnedOrderAdd(createDividendsReturnedOrderCommand.ReqDividendsReturnedOrderAdd) 21 + _, err := creationCooperationGateway.DividendsReturnedOrderAdd(allied_creation_cooperation.ReqDividendsReturnedOrderAdd{
  22 + // DividendsReturnedCustomerName:createDividendsReturnedOrderCommand.DividendsReturnedCustomerName,
  23 + // DividendsOrderAmount :a
  24 + // DividendsOrderNumber
  25 + // DividendsReturnedOrderNumber
  26 + // OriginalOrderNum
  27 + // OrderGoods
  28 + // DividendsReturnedDate
  29 + // Remarks
  30 + // RegionName
  31 + })
22 if err != nil { 32 if err != nil {
23 return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) 33 return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
24 } 34 }
@@ -51,15 +51,26 @@ type ( @@ -51,15 +51,26 @@ type (
51 FeedbackContent string `json:"feedbackContent"` 51 FeedbackContent string `json:"feedbackContent"`
52 CooperationContractNumber string `json:"cooperationContractNumber"` 52 CooperationContractNumber string `json:"cooperationContractNumber"`
53 CooperationContractName string `json:"cooperationContractName"` 53 CooperationContractName string `json:"cooperationContractName"`
54 - ContractUndertaker interface{} `json:"contractUndertaker"`  
55 - Org interface{} `json:"org"`  
56 - Company interface{} `json:"company"` 54 + ContractUndertaker struct {
  55 + UserId int `json:"userId,string,"`
  56 + UserPhone string `json:"userPhone"`
  57 + UserName string `json:"userName"`
  58 + UserCode string `json:"userCode"`
  59 + UserInfo struct {
  60 + UserAccount string `json:"userAccount"`
  61 + UserName string `json:"userName"`
  62 + UserPhone string `json:"userPhone"`
  63 + UserCode string `json:"userCode"`
  64 + } `json:"userInfo"`
  65 + } `json:"contractUndertaker"`
  66 + Org interface{} `json:"org"`
  67 + Company interface{} `json:"company"`
57 //UpdatedAt time.Time `json:"updatedAt"` 68 //UpdatedAt time.Time `json:"updatedAt"`
58 //DeletedAt time.Time `json:"deletedAt"` 69 //DeletedAt time.Time `json:"deletedAt"`
59 CreatedAt jtime.TimeToUnixMsec `json:"createdAt"` 70 CreatedAt jtime.TimeToUnixMsec `json:"createdAt"`
60 CooperationMode struct { 71 CooperationMode struct {
61 // 共创模式ID 72 // 共创模式ID
62 - CooperationModeId int `json:"cooperationModeId,string"` 73 + CooperationModeId int `json:"cooperationModeId,string,"`
63 // 共创模式编码，唯一确定 74 // 共创模式编码，唯一确定
64 CooperationModeNumber string `json:"cooperationModeNumber"` 75 CooperationModeNumber string `json:"cooperationModeNumber"`
65 // 模式名称，唯一确定 76 // 模式名称，唯一确定
@@ -46,16 +46,15 @@ type ( @@ -46,16 +46,15 @@ type (
46 } 46 }
47 47
48 ReqDividendsReturnedOrderAdd struct { 48 ReqDividendsReturnedOrderAdd struct {
49 - CustomerName string `json:"customerName"`  
50 - DividendsOrderAmount string `json:"dividendsOrderAmount"`  
51 - DividendsOrderNumber string `json:"dividendsOrderNumber"`  
52 - DividendsOriginalOrderNum string `json:"dividendsOriginalOrderNum"`  
53 - OrderGoods []DividendsReturnedOrderGoods `json:"orderGoods"`  
54 - OrderTime time.Time `json:"orderTime"`  
55 - OrgId int `json:"orgId"`  
56 - Remarks string `json:"remarks"`  
57 - SalesmanUid string `json:"salesmanUid"`  
58 - RegionName string `json:"regionName"` 49 + DividendsReturnedCustomerName string `json:"dividendsReturnedCustomerName"`
  50 + DividendsOrderNumber string `json:"dividendsOrderNumber"` //分红单号
  51 + DividendsReturnedOrderNumber string `json:"dividendsReturnedOrderNumber"`
  52 + OriginalOrderNum string `json:"originalOrderNum"`
  53 + OrderGoods []DividendsReturnedOrderGoods `json:"orderGoods"`
  54 + DividendsReturnedDate time.Time `json:"orderTime"`
  55 + OrgId int `json:"orgId"`
  56 + Remarks string `json:"remarks"`
  57 + RegionName string `json:"regionName"`
59 } 58 }
60 59
61 DataDividendsReturnedOrderAdd struct { 60 DataDividendsReturnedOrderAdd struct {