正在显示
6 个修改的文件
包含
18 行增加
和
12 行删除
| @@ -201,10 +201,10 @@ func (service OrderInfoService) CreateNewOrder(cmd command.CreateOrderCommand) ( | @@ -201,10 +201,10 @@ func (service OrderInfoService) CreateNewOrder(cmd command.CreateOrderCommand) ( | ||
| 201 | newOrder := &domain.OrderBase{ | 201 | newOrder := &domain.OrderBase{ |
| 202 | OrderType: cmd.OrderType, OrderCode: cmd.OrderCode, | 202 | OrderType: cmd.OrderType, OrderCode: cmd.OrderCode, |
| 203 | DeliveryCode: cmd.DeliveryCode, | 203 | DeliveryCode: cmd.DeliveryCode, |
| 204 | - Buyer: &domain.Buyer{ | 204 | + Buyer: domain.Buyer{ |
| 205 | BuyerName: cmd.BuyerName, | 205 | BuyerName: cmd.BuyerName, |
| 206 | }, | 206 | }, |
| 207 | - RegionInfo: &domain.RegionInfo{ | 207 | + RegionInfo: domain.RegionInfo{ |
| 208 | RegionName: cmd.OrderRegion, | 208 | RegionName: cmd.OrderRegion, |
| 209 | }, | 209 | }, |
| 210 | PartnerId: cmd.PartnerId, | 210 | PartnerId: cmd.PartnerId, |
| @@ -37,9 +37,9 @@ type OrderBase struct { | @@ -37,9 +37,9 @@ type OrderBase struct { | ||
| 37 | //交货编号 | 37 | //交货编号 |
| 38 | DeliveryCode string `json:"deliveryCode"` | 38 | DeliveryCode string `json:"deliveryCode"` |
| 39 | //买家 | 39 | //买家 |
| 40 | - Buyer *Buyer `json:"buyer"` | 40 | + Buyer Buyer `json:"buyer"` |
| 41 | //订单区域信息 | 41 | //订单区域信息 |
| 42 | - RegionInfo *RegionInfo `json:"regionInfo"` | 42 | + RegionInfo RegionInfo `json:"regionInfo"` |
| 43 | //订单对应的合伙人 | 43 | //订单对应的合伙人 |
| 44 | PartnerId int64 `json:"partnerId"` | 44 | PartnerId int64 `json:"partnerId"` |
| 45 | PartnerInfo Partner `json:"partnerInfo"` | 45 | PartnerInfo Partner `json:"partnerInfo"` |
| @@ -20,9 +20,9 @@ type OrderBase struct { | @@ -20,9 +20,9 @@ type OrderBase struct { | ||
| 20 | //交货编号 | 20 | //交货编号 |
| 21 | DeliveryCode string | 21 | DeliveryCode string |
| 22 | //买家 | 22 | //买家 |
| 23 | - Buyer *domain.Buyer | 23 | + Buyer domain.Buyer |
| 24 | //订单区域信息 | 24 | //订单区域信息 |
| 25 | - RegionInfo *domain.RegionInfo | 25 | + RegionInfo domain.RegionInfo |
| 26 | //订单对应的合伙人 | 26 | //订单对应的合伙人 |
| 27 | PartnerId int64 | 27 | PartnerId int64 |
| 28 | //业务员抽成比例 | 28 | //业务员抽成比例 |
| @@ -104,5 +104,8 @@ func (gateway MmmUserCenterServiceGateway) RequestUCenterLoginBySecret(secret st | @@ -104,5 +104,8 @@ func (gateway MmmUserCenterServiceGateway) RequestUCenterLoginBySecret(secret st | ||
| 104 | } | 104 | } |
| 105 | respData := &ResponseLogin{} | 105 | respData := &ResponseLogin{} |
| 106 | err = json.Unmarshal(byteData, respData) | 106 | err = json.Unmarshal(byteData, respData) |
| 107 | - return respData, err | 107 | + if err != nil { |
| 108 | + return nil, fmt.Errorf("body data %s; err:%s", string(byteData), err) | ||
| 109 | + } | ||
| 110 | + return respData, nil | ||
| 108 | } | 111 | } |
| @@ -63,8 +63,8 @@ func (c *BusinessBonusController) ListBusinessBonus() { | @@ -63,8 +63,8 @@ func (c *BusinessBonusController) ListBusinessBonus() { | ||
| 63 | func (c *BusinessBonusController) UpdateBusinessBonus() { | 63 | func (c *BusinessBonusController) UpdateBusinessBonus() { |
| 64 | type Parameter struct { | 64 | type Parameter struct { |
| 65 | Id int64 `json:"id"` | 65 | Id int64 `json:"id"` |
| 66 | - DividendsReceivable string `json:"dividendsReceivable"` | ||
| 67 | - StateOfPayment string `json:"stateOfPayment"` | 66 | + DividendsReceivable float64 `json:"dividendsReceivable"` |
| 67 | + StateOfPayment int8 `json:"stateOfPayment"` | ||
| 68 | } | 68 | } |
| 69 | var ( | 69 | var ( |
| 70 | param Parameter | 70 | param Parameter |
| @@ -79,6 +79,9 @@ func (c *BusinessBonusController) UpdateBusinessBonus() { | @@ -79,6 +79,9 @@ func (c *BusinessBonusController) UpdateBusinessBonus() { | ||
| 79 | srv := businessService.NewBusinessBonusService(nil) | 79 | srv := businessService.NewBusinessBonusService(nil) |
| 80 | err = srv.UpdateBusinessBonus(businessCommand.UpdateBusinessBonusCommand{ | 80 | err = srv.UpdateBusinessBonus(businessCommand.UpdateBusinessBonusCommand{ |
| 81 | CompanyId: companyId, | 81 | CompanyId: companyId, |
| 82 | + Id: param.Id, | ||
| 83 | + Bonus: param.DividendsReceivable, | ||
| 84 | + BonusStatus: param.StateOfPayment, | ||
| 82 | }) | 85 | }) |
| 83 | if err != nil { | 86 | if err != nil { |
| 84 | c.ResponseError(err) | 87 | c.ResponseError(err) |
| @@ -33,9 +33,9 @@ func init() { | @@ -33,9 +33,9 @@ func init() { | ||
| 33 | beego.NSRouter("/edit", &controllers.OrderDividendController{}, "POST:EditOrderDividend"), | 33 | beego.NSRouter("/edit", &controllers.OrderDividendController{}, "POST:EditOrderDividend"), |
| 34 | beego.NSRouter("/detail", &controllers.OrderDividendController{}, "POST:OrderDividendDetail"), | 34 | beego.NSRouter("/detail", &controllers.OrderDividendController{}, "POST:OrderDividendDetail"), |
| 35 | 35 | ||
| 36 | - beego.NSRouter("business/detail", &controllers.BusinessBonusController{}, "POST:GetBusinessBonus"), | ||
| 37 | - beego.NSRouter("business/edit", &controllers.BusinessBonusController{}, "POST:UpdateBusinessBonus"), | ||
| 38 | - beego.NSRouter("business/list", &controllers.BusinessBonusController{}, "POST:ListBusinessBonus"), | 36 | + beego.NSRouter("/business/detail", &controllers.BusinessBonusController{}, "POST:GetBusinessBonus"), |
| 37 | + beego.NSRouter("/business/edit", &controllers.BusinessBonusController{}, "POST:UpdateBusinessBonus"), | ||
| 38 | + beego.NSRouter("/business/list", &controllers.BusinessBonusController{}, "POST:ListBusinessBonus"), | ||
| 39 | ), | 39 | ), |
| 40 | beego.NSNamespace("/order", | 40 | beego.NSNamespace("/order", |
| 41 | beego.NSRouter("/purpose/list", &controllers.OrderInfoController{}, "POST:PageListOrderPurpose"), | 41 | beego.NSRouter("/purpose/list", &controllers.OrderInfoController{}, "POST:PageListOrderPurpose"), |
-
请 注册 或 登录 后发表评论