正在显示
8 个修改的文件
包含
176 行增加
和
141 行删除
1 | package service | 1 | package service |
2 | 2 | ||
3 | -type BusinessBonusService struct { | ||
4 | -} | 3 | +// type BusinessBonusService struct { |
4 | +// } | ||
5 | 5 | ||
6 | -func NewBusinessBonusService(option map[string]interface{}) *BusinessBonusService { | ||
7 | - newService := new(BusinessBonusService) | ||
8 | - return newService | ||
9 | -} | 6 | +// func NewBusinessBonusService(option map[string]interface{}) *BusinessBonusService { |
7 | +// newService := new(BusinessBonusService) | ||
8 | +// return newService | ||
9 | +// } | ||
10 | 10 | ||
11 | // ListBusinessBonus 列表 | 11 | // ListBusinessBonus 列表 |
12 | // func (srv BusinessBonusService) ListBusinessBonus(queryOption query.ListBusinessBonusQuery) (int, interface{}, error) { | 12 | // func (srv BusinessBonusService) ListBusinessBonus(queryOption query.ListBusinessBonusQuery) (int, interface{}, error) { |
@@ -166,3 +166,4 @@ func NewBusinessBonusService(option map[string]interface{}) *BusinessBonusServic | @@ -166,3 +166,4 @@ func NewBusinessBonusService(option map[string]interface{}) *BusinessBonusServic | ||
166 | 166 | ||
167 | // return returnData, nil | 167 | // return returnData, nil |
168 | // } | 168 | // } |
169 | +// } |
@@ -6,13 +6,19 @@ import ( | @@ -6,13 +6,19 @@ import ( | ||
6 | "gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/infrastructure/pg/transaction" | 6 | "gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/infrastructure/pg/transaction" |
7 | ) | 7 | ) |
8 | 8 | ||
9 | -func CreateBusinessBonusService(options map[string]interface{}) (service.BusinessBonusService, error) { | ||
10 | - var transactionContext *transaction.TransactionContext | ||
11 | - if value, ok := options["transactionContext"]; ok { | ||
12 | - transactionContext = value.(*transaction.TransactionContext) | ||
13 | - } | ||
14 | - return domainService.NewBusinessBonusService(transactionContext), nil | ||
15 | -} | 9 | +// func CreateBusinessBonusService(options map[string]interface{}) (service.BusinessBonusService, error) { |
10 | +// var transactionContext *transaction.TransactionContext | ||
11 | +// if value, ok := options["transactionContext"]; ok { | ||
12 | +// transactionContext = value.(*transaction.TransactionContext) | ||
13 | +// } | ||
14 | +// return domainService.NewBusinessBonusService(transactionContext), nil | ||
15 | +// } | ||
16 | +// var transactionContext *transaction.TransactionContext | ||
17 | +// if value, ok := options["transactionContext"]; ok { | ||
18 | +// transactionContext = value.(*transaction.TransactionContext) | ||
19 | +// } | ||
20 | +// return domainService.NewBusinessBonusService(transactionContext), nil | ||
21 | +// } | ||
16 | 22 | ||
17 | func CreateOrderBonusService(options map[string]interface{}) (service.OrderBonusService, error) { | 23 | func CreateOrderBonusService(options map[string]interface{}) (service.OrderBonusService, error) { |
18 | var transactionContext *transaction.TransactionContext | 24 | var transactionContext *transaction.TransactionContext |
@@ -8,7 +8,6 @@ import ( | @@ -8,7 +8,6 @@ import ( | ||
8 | "gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/application/partnerInfo/command" | 8 | "gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/application/partnerInfo/command" |
9 | "gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/application/partnerInfo/query" | 9 | "gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/application/partnerInfo/query" |
10 | "gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/domain" | 10 | "gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/domain" |
11 | - "gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/domain/service" | ||
12 | "gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/infrastructure/dao" | 11 | "gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/infrastructure/dao" |
13 | "gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/lib" | 12 | "gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/lib" |
14 | ) | 13 | ) |
@@ -23,7 +22,7 @@ func NewPartnerInfoService(options map[string]interface{}) *PartnerInfoService { | @@ -23,7 +22,7 @@ func NewPartnerInfoService(options map[string]interface{}) *PartnerInfoService { | ||
23 | } | 22 | } |
24 | 23 | ||
25 | // CreatePartnerInfo 创建合伙人 | 24 | // CreatePartnerInfo 创建合伙人 |
26 | -func (PartnerInfoService *PartnerInfoService) CreatePartnerInfo(cmd *command.CreatePartnerInfoCommand) (data interface{}, err error) { | 25 | +func (PartnerInfoService *PartnerInfoService) CreatePartnerInfo(cmd *command.CreatePartnerInfoCommand) (data *domain.PartnerInfo, err error) { |
27 | var ( | 26 | var ( |
28 | transactionContext, _ = factory.CreateTransactionContext(nil) | 27 | transactionContext, _ = factory.CreateTransactionContext(nil) |
29 | ) | 28 | ) |
@@ -92,19 +91,19 @@ func (PartnerInfoService *PartnerInfoService) CreatePartnerInfo(cmd *command.Cre | @@ -92,19 +91,19 @@ func (PartnerInfoService *PartnerInfoService) CreatePartnerInfo(cmd *command.Cre | ||
92 | if err = partnerInfoRepository.Save(&newPartnerInfo); err != nil { | 91 | if err = partnerInfoRepository.Save(&newPartnerInfo); err != nil { |
93 | return nil, lib.ThrowError(lib.INTERNAL_SERVER_ERROR, err.Error()) | 92 | return nil, lib.ThrowError(lib.INTERNAL_SERVER_ERROR, err.Error()) |
94 | } | 93 | } |
95 | - var businessBonusSrv service.BusinessBonusService | ||
96 | - if businessBonusSrv, err = factory.CreateBusinessBonusService(map[string]interface{}{ | ||
97 | - "transactionContext": transactionContext, | ||
98 | - }); err != nil { | ||
99 | - return nil, lib.ThrowError(lib.INTERNAL_SERVER_ERROR, err.Error()) | ||
100 | - } | ||
101 | - err = businessBonusSrv.EnableOrDisable(newPartnerInfo.Partner.Id) | ||
102 | - if err != nil { | ||
103 | - e := fmt.Sprintf("更新业务分红(partner_id=%d)数据失败:%s", newPartnerInfo.Partner.Id, err) | ||
104 | - return nil, lib.ThrowError(lib.INTERNAL_SERVER_ERROR, e) | ||
105 | - } | 94 | + //var businessBonusSrv service.BusinessBonusService |
95 | + // if businessBonusSrv, err = factory.CreateBusinessBonusService(map[string]interface{}{ | ||
96 | + // "transactionContext": transactionContext, | ||
97 | + // }); err != nil { | ||
98 | + // return nil, lib.ThrowError(lib.INTERNAL_SERVER_ERROR, err.Error()) | ||
99 | + // } | ||
100 | + // err = businessBonusSrv.EnableOrDisable(newPartnerInfo.Partner.Id) | ||
101 | + // if err != nil { | ||
102 | + // e := fmt.Sprintf("更新业务分红(partner_id=%d)数据失败:%s", newPartnerInfo.Partner.Id, err) | ||
103 | + // return nil, lib.ThrowError(lib.INTERNAL_SERVER_ERROR, e) | ||
104 | + // } | ||
106 | err = transactionContext.CommitTransaction() | 105 | err = transactionContext.CommitTransaction() |
107 | - return newPartnerInfo, nil | 106 | + return &newPartnerInfo, nil |
108 | } | 107 | } |
109 | 108 | ||
110 | // GetPartnerInfo 返回合伙人 | 109 | // GetPartnerInfo 返回合伙人 |
@@ -216,18 +215,18 @@ func (PartnerInfoService *PartnerInfoService) UpdatePartnerInfo(cmd *command.Upd | @@ -216,18 +215,18 @@ func (PartnerInfoService *PartnerInfoService) UpdatePartnerInfo(cmd *command.Upd | ||
216 | if err = partnerInfoRepository.Save(partnerInfo); err != nil { | 215 | if err = partnerInfoRepository.Save(partnerInfo); err != nil { |
217 | return lib.ThrowError(lib.INTERNAL_SERVER_ERROR, err.Error()) | 216 | return lib.ThrowError(lib.INTERNAL_SERVER_ERROR, err.Error()) |
218 | } | 217 | } |
219 | - var businessBonusSrv service.BusinessBonusService | ||
220 | - if businessBonusSrv, err = factory.CreateBusinessBonusService(map[string]interface{}{ | ||
221 | - "transactionContext": transactionContext, | ||
222 | - }); err != nil { | ||
223 | - return lib.ThrowError(lib.INTERNAL_SERVER_ERROR, err.Error()) | ||
224 | - } | ||
225 | - //TODO 修改为本地消息订阅 | ||
226 | - err = businessBonusSrv.EnableOrDisable(partnerInfo.Partner.Id) | ||
227 | - if err != nil { | ||
228 | - e := fmt.Sprintf("更新业务分红(partner_id=%d)数据失败:%s", partnerInfo.Partner.Id, err) | ||
229 | - return lib.ThrowError(lib.INTERNAL_SERVER_ERROR, e) | ||
230 | - } | 218 | + //到0.6.0 彻底删除 |
219 | + // var businessBonusSrv service.BusinessBonusService | ||
220 | + // if businessBonusSrv, err = factory.CreateBusinessBonusService(map[string]interface{}{ | ||
221 | + // "transactionContext": transactionContext, | ||
222 | + // }); err != nil { | ||
223 | + // return lib.ThrowError(lib.INTERNAL_SERVER_ERROR, err.Error()) | ||
224 | + // } | ||
225 | + // err = businessBonusSrv.EnableOrDisable(partnerInfo.Partner.Id) | ||
226 | + // if err != nil { | ||
227 | + // e := fmt.Sprintf("更新业务分红(partner_id=%d)数据失败:%s", partnerInfo.Partner.Id, err) | ||
228 | + // return lib.ThrowError(lib.INTERNAL_SERVER_ERROR, e) | ||
229 | + // } | ||
231 | transactionContext.CommitTransaction() | 230 | transactionContext.CommitTransaction() |
232 | return | 231 | return |
233 | } | 232 | } |
1 | package domainService | 1 | package domainService |
2 | 2 | ||
3 | -import ( | ||
4 | - "gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/domain" | ||
5 | - "gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/infrastructure/dao" | ||
6 | - "gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/infrastructure/pg/transaction" | ||
7 | - "gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/infrastructure/repository" | ||
8 | -) | 3 | +// type BusinessBonusService struct { |
4 | +// transactionContext *transaction.TransactionContext | ||
5 | +// } | ||
9 | 6 | ||
10 | -type BusinessBonusService struct { | ||
11 | - transactionContext *transaction.TransactionContext | ||
12 | -} | 7 | +// func NewBusinessBonusService(tcx *transaction.TransactionContext) *BusinessBonusService { |
8 | +// return &BusinessBonusService{ | ||
9 | +// transactionContext: tcx, | ||
10 | +// } | ||
11 | +// } | ||
13 | 12 | ||
14 | -func NewBusinessBonusService(tcx *transaction.TransactionContext) *BusinessBonusService { | ||
15 | - return &BusinessBonusService{ | ||
16 | - transactionContext: tcx, | ||
17 | - } | ||
18 | -} | 13 | +// func (srv BusinessBonusService) EnableOrDisable(parntnerId int64) error { |
14 | +// var ( | ||
15 | +// bonusDao, _ = dao.NewBusinessBonusDao(srv.transactionContext) | ||
16 | +// bonusReponsitory, _ = repository.NewBusinessBonusRepository(srv.transactionContext) | ||
17 | +// partnerReponsitory, _ = repository.NewPartnerInfoRepository(srv.transactionContext) | ||
19 | 18 | ||
20 | -func (srv BusinessBonusService) EnableOrDisable(parntnerId int64) error { | ||
21 | - var ( | ||
22 | - bonusDao, _ = dao.NewBusinessBonusDao(srv.transactionContext) | ||
23 | - bonusReponsitory, _ = repository.NewBusinessBonusRepository(srv.transactionContext) | ||
24 | - partnerReponsitory, _ = repository.NewPartnerInfoRepository(srv.transactionContext) | 19 | +// err error |
20 | +// partnerHasInBonus bool | ||
21 | +// partnerData *domain.PartnerInfo | ||
22 | +// partnerHasBusinessCategory bool | ||
23 | +// ) | ||
24 | +// partnerHasInBonus, err = bonusDao.ExistBusinessBonus(parntnerId) | ||
25 | +// if err != nil { | ||
26 | +// return err | ||
27 | +// } | ||
28 | +// partnerData, err = partnerReponsitory.FindOne(domain.PartnerFindOneQuery{UserId: parntnerId}) | ||
29 | +// if err != nil { | ||
30 | +// return err | ||
31 | +// } | ||
32 | +// for _, v := range partnerData.PartnerCategoryInfos { | ||
33 | +// if v.Id == 2 { | ||
34 | +// partnerHasBusinessCategory = true | ||
35 | +// break | ||
36 | +// } | ||
37 | +// } | ||
38 | +// if partnerHasInBonus && partnerHasBusinessCategory { | ||
39 | +// //已存在业务分红数据况 && 是业务合伙人类型 | ||
40 | +// var bonusData *domain.BusinessBonus | ||
41 | +// bonusData, err = bonusReponsitory.FindOne(domain.BusinessBonusFindOneQuery{ | ||
42 | +// PartnerId: parntnerId, | ||
43 | +// }) | ||
44 | +// if bonusData.IsDisable == domain.BUSINESS_BONUS_ENABLE { | ||
45 | +// return nil | ||
46 | +// } | ||
47 | +// bonusData.IsDisable = domain.BUSINESS_BONUS_ENABLE | ||
48 | +// err = bonusReponsitory.Edit(bonusData) | ||
49 | +// return err | ||
50 | +// } | ||
51 | +// if partnerHasInBonus && !partnerHasBusinessCategory { | ||
52 | +// //已存在业务分红数据况 && 不是业务合伙人类型 | ||
53 | +// var bonusData *domain.BusinessBonus | ||
54 | +// bonusData, err = bonusReponsitory.FindOne(domain.BusinessBonusFindOneQuery{ | ||
55 | +// PartnerId: parntnerId, | ||
56 | +// }) | ||
57 | +// if bonusData.IsDisable == domain.BUSINESS_BONUS_DISABLE { | ||
58 | +// return nil | ||
59 | +// } | ||
60 | +// bonusData.IsDisable = domain.BUSINESS_BONUS_DISABLE | ||
61 | +// err = bonusReponsitory.Edit(bonusData) | ||
62 | +// return err | ||
63 | +// } | ||
25 | 64 | ||
26 | - err error | ||
27 | - partnerHasInBonus bool | ||
28 | - partnerData *domain.PartnerInfo | ||
29 | - partnerHasBusinessCategory bool | ||
30 | - ) | ||
31 | - partnerHasInBonus, err = bonusDao.ExistBusinessBonus(parntnerId) | ||
32 | - if err != nil { | ||
33 | - return err | ||
34 | - } | ||
35 | - partnerData, err = partnerReponsitory.FindOne(domain.PartnerFindOneQuery{UserId: parntnerId}) | ||
36 | - if err != nil { | ||
37 | - return err | ||
38 | - } | ||
39 | - for _, v := range partnerData.PartnerCategoryInfos { | ||
40 | - if v.Id == 2 { | ||
41 | - partnerHasBusinessCategory = true | ||
42 | - break | ||
43 | - } | ||
44 | - } | ||
45 | - if partnerHasInBonus && partnerHasBusinessCategory { | ||
46 | - //已存在业务分红数据况 && 是业务合伙人类型 | ||
47 | - var bonusData *domain.BusinessBonus | ||
48 | - bonusData, err = bonusReponsitory.FindOne(domain.BusinessBonusFindOneQuery{ | ||
49 | - PartnerId: parntnerId, | ||
50 | - }) | ||
51 | - if bonusData.IsDisable == domain.BUSINESS_BONUS_ENABLE { | ||
52 | - return nil | ||
53 | - } | ||
54 | - bonusData.IsDisable = domain.BUSINESS_BONUS_ENABLE | ||
55 | - err = bonusReponsitory.Edit(bonusData) | ||
56 | - return err | ||
57 | - } | ||
58 | - if partnerHasInBonus && !partnerHasBusinessCategory { | ||
59 | - //已存在业务分红数据况 && 不是业务合伙人类型 | ||
60 | - var bonusData *domain.BusinessBonus | ||
61 | - bonusData, err = bonusReponsitory.FindOne(domain.BusinessBonusFindOneQuery{ | ||
62 | - PartnerId: parntnerId, | ||
63 | - }) | ||
64 | - if bonusData.IsDisable == domain.BUSINESS_BONUS_DISABLE { | ||
65 | - return nil | ||
66 | - } | ||
67 | - bonusData.IsDisable = domain.BUSINESS_BONUS_DISABLE | ||
68 | - err = bonusReponsitory.Edit(bonusData) | ||
69 | - return err | ||
70 | - } | 65 | +// if !partnerHasInBonus && partnerHasBusinessCategory { |
66 | +// //不存在业务分红数据况 && 是业务合伙人类型 | ||
67 | +// newBonus := &domain.BusinessBonus{ | ||
68 | +// PartnerInfoId: partnerData.Partner.Id, | ||
69 | +// IsDisable: domain.BUSINESS_BONUS_ENABLE, | ||
70 | +// CompanyId: partnerData.CompanyId, | ||
71 | +// Bonus: 0, | ||
72 | +// } | ||
73 | +// err = bonusReponsitory.Add(newBonus) | ||
74 | +// return err | ||
75 | +// } | ||
71 | 76 | ||
72 | - if !partnerHasInBonus && partnerHasBusinessCategory { | ||
73 | - //不存在业务分红数据况 && 是业务合伙人类型 | ||
74 | - newBonus := &domain.BusinessBonus{ | ||
75 | - PartnerInfoId: partnerData.Partner.Id, | ||
76 | - IsDisable: domain.BUSINESS_BONUS_ENABLE, | ||
77 | - CompanyId: partnerData.CompanyId, | ||
78 | - Bonus: 0, | ||
79 | - } | ||
80 | - err = bonusReponsitory.Add(newBonus) | ||
81 | - return err | ||
82 | - } | ||
83 | - | ||
84 | - return nil | ||
85 | -} | 77 | +// return nil |
78 | +// } | ||
79 | +// } |
1 | package controllers | 1 | package controllers |
2 | 2 | ||
3 | -import ( | ||
4 | - "gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/domain" | ||
5 | -) | ||
6 | - | ||
7 | -type BusinessBonusController struct { | ||
8 | - BaseController | ||
9 | -} | 3 | +// type BusinessBonusController struct { |
4 | +// BaseController | ||
5 | +// } | ||
10 | 6 | ||
11 | -func (c *BusinessBonusController) Prepare() { | ||
12 | - c.BaseController.Prepare() | ||
13 | - if ok := c.ValidJWTToken(); !ok { | ||
14 | - return | ||
15 | - } | ||
16 | - if ok := c.ValidAdminPermission(domain.PERMISSION_DIVIDEND); !ok { | ||
17 | - return | ||
18 | - } | ||
19 | -} | 7 | +// func (c *BusinessBonusController) Prepare() { |
8 | +// c.BaseController.Prepare() | ||
9 | +// if ok := c.ValidJWTToken(); !ok { | ||
10 | +// return | ||
11 | +// } | ||
12 | +// if ok := c.ValidAdminPermission(domain.PERMISSION_DIVIDEND); !ok { | ||
13 | +// return | ||
14 | +// } | ||
15 | +// } | ||
20 | 16 | ||
21 | // func (c *BusinessBonusController) ListBusinessBonus() { | 17 | // func (c *BusinessBonusController) ListBusinessBonus() { |
22 | // type Parameter struct { | 18 | // type Parameter struct { |
@@ -110,3 +106,27 @@ func (c *BusinessBonusController) Prepare() { | @@ -110,3 +106,27 @@ func (c *BusinessBonusController) Prepare() { | ||
110 | // } | 106 | // } |
111 | // c.ResponseData(data) | 107 | // c.ResponseData(data) |
112 | // } | 108 | // } |
109 | +// type Parameter struct { | ||
110 | +// Id int64 `json:"id"` | ||
111 | +// } | ||
112 | +// var ( | ||
113 | +// param Parameter | ||
114 | +// err error | ||
115 | +// ) | ||
116 | +// if err = c.BindJsonData(¶m); err != nil { | ||
117 | +// logs.Error(err) | ||
118 | +// c.ResponseError(errors.New("json数据解析失败")) | ||
119 | +// return | ||
120 | +// } | ||
121 | +// companyId := c.GetUserCompany() | ||
122 | +// srv := businessService.NewBusinessBonusService(nil) | ||
123 | +// data, err := srv.GetBusinessBonus(businessQuery.GetBusinessBonusQuery{ | ||
124 | +// Id: param.Id, | ||
125 | +// CompanyId: companyId, | ||
126 | +// }) | ||
127 | +// if err != nil { | ||
128 | +// c.ResponseError(err) | ||
129 | +// return | ||
130 | +// } | ||
131 | +// c.ResponseData(data) | ||
132 | +// } |
@@ -594,8 +594,9 @@ func (c *OrderInfoController) UpdateOrderReal() { | @@ -594,8 +594,9 @@ func (c *OrderInfoController) UpdateOrderReal() { | ||
594 | c.ResponseError(err) | 594 | c.ResponseError(err) |
595 | return | 595 | return |
596 | } | 596 | } |
597 | + var orderDataReturn *domain.OrderBase | ||
597 | if param.Id == 0 { | 598 | if param.Id == 0 { |
598 | - err = c.addOrderReal(param) | 599 | + orderDataReturn, err = c.addOrderReal(param) |
599 | } else { | 600 | } else { |
600 | err = c.editOrderReal(param) | 601 | err = c.editOrderReal(param) |
601 | } | 602 | } |
@@ -603,11 +604,17 @@ func (c *OrderInfoController) UpdateOrderReal() { | @@ -603,11 +604,17 @@ func (c *OrderInfoController) UpdateOrderReal() { | ||
603 | c.ResponseError(err) | 604 | c.ResponseError(err) |
604 | return | 605 | return |
605 | } | 606 | } |
607 | + if orderDataReturn != nil { | ||
608 | + c.ResponseData(map[string]interface{}{ | ||
609 | + "id": orderDataReturn.Id, | ||
610 | + }) | ||
611 | + return | ||
612 | + } | ||
606 | c.ResponseData(nil) | 613 | c.ResponseData(nil) |
607 | return | 614 | return |
608 | } | 615 | } |
609 | 616 | ||
610 | -func (c *OrderInfoController) addOrderReal(param postRealOrderDetail) error { | 617 | +func (c *OrderInfoController) addOrderReal(param postRealOrderDetail) (*domain.OrderBase, error) { |
611 | orderSrv := orderService.NewOrderInfoService(nil) | 618 | orderSrv := orderService.NewOrderInfoService(nil) |
612 | newGoods := []orderCmd.OrderGoodData{} | 619 | newGoods := []orderCmd.OrderGoodData{} |
613 | for _, v := range param.Product { | 620 | for _, v := range param.Product { |
@@ -632,8 +639,8 @@ func (c *OrderInfoController) addOrderReal(param postRealOrderDetail) error { | @@ -632,8 +639,8 @@ func (c *OrderInfoController) addOrderReal(param postRealOrderDetail) error { | ||
632 | CompanyId: companyId, | 639 | CompanyId: companyId, |
633 | PartnerCategory: param.PartnerCategoryId, | 640 | PartnerCategory: param.PartnerCategoryId, |
634 | } | 641 | } |
635 | - _, err := orderSrv.CreateNewOrder(createcmd) | ||
636 | - return err | 642 | + orderData, err := orderSrv.CreateNewOrder(createcmd) |
643 | + return orderData, err | ||
637 | } | 644 | } |
638 | 645 | ||
639 | func (c *OrderInfoController) editOrderReal(param postRealOrderDetail) error { | 646 | func (c *OrderInfoController) editOrderReal(param postRealOrderDetail) error { |
@@ -84,11 +84,17 @@ func (c *PartnerInfoController) CreatePartnerInfo() { | @@ -84,11 +84,17 @@ func (c *PartnerInfoController) CreatePartnerInfo() { | ||
84 | } | 84 | } |
85 | } | 85 | } |
86 | serve := partnerInfoService.NewPartnerInfoService(nil) | 86 | serve := partnerInfoService.NewPartnerInfoService(nil) |
87 | - _, err = serve.CreatePartnerInfo(&cmd) | 87 | + newPartner, err := serve.CreatePartnerInfo(&cmd) |
88 | if err != nil { | 88 | if err != nil { |
89 | c.ResponseError(err) | 89 | c.ResponseError(err) |
90 | return | 90 | return |
91 | } | 91 | } |
92 | + if newPartner != nil { | ||
93 | + c.ResponseData(map[string]interface{}{ | ||
94 | + "id": newPartner.Partner.Id, | ||
95 | + }) | ||
96 | + return | ||
97 | + } | ||
92 | c.ResponseData(nil) | 98 | c.ResponseData(nil) |
93 | return | 99 | return |
94 | } | 100 | } |
-
请 注册 或 登录 后发表评论