mmm-go / partnermg · 提交

转到一个项目

作者 唐旭辉
提交 c91d907f602392d03466a6444e3a6b3b564660a2 1 个父辈 c1a9c096

更新

内嵌 并排对比
正在显示 5 个修改的文件 包含 5 行增加 和 10 行删除
@@ -936,7 +936,7 @@ func (service OrderInfoService) PayPartnerBonusWithOrderBestshop(orderId int64, @@ -936,7 +936,7 @@ func (service OrderInfoService) PayPartnerBonusWithOrderBestshop(orderId int64,
936 return nil 936 return nil
937 } 937 }
938 938
939 -//PayPartnerBonusWithOrderBestshop 支付分红，海鲜干货的订单 （orderType=domain.OrderTypeBestShop） 939 +//UpdateOrderRemarkBonus 订单分红详情，更新备注
940 func (service OrderInfoService) UpdateOrderRemarkBonus(orderId int64, adminId int64, remark string) error { 940 func (service OrderInfoService) UpdateOrderRemarkBonus(orderId int64, adminId int64, remark string) error {
941 var ( 941 var (
942 transactionContext, _ = factory.CreateTransactionContext(nil) 942 transactionContext, _ = factory.CreateTransactionContext(nil)
@@ -47,7 +47,7 @@ func (service OrderInfoService) GetOrderInfoWithBonus(orderBaseId int64, company @@ -47,7 +47,7 @@ func (service OrderInfoService) GetOrderInfoWithBonus(orderBaseId int64, company
47 returnData interface{} 47 returnData interface{}
48 ) 48 )
49 switch order.OrderType { 49 switch order.OrderType {
50 - case domain.OrderIntention: 50 + case domain.OrderReal:
51 returnData, err = service.GetOrderBaseDetailWithBonus(orderBaseId, companyId) 51 returnData, err = service.GetOrderBaseDetailWithBonus(orderBaseId, companyId)
52 case domain.OrderTypeBestShop: 52 case domain.OrderTypeBestShop:
53 returnData, err = service.GetOrderBestshopInfoWithBonus(orderBaseId, companyId) 53 returnData, err = service.GetOrderBestshopInfoWithBonus(orderBaseId, companyId)
@@ -318,7 +318,6 @@ func (serve *OrderBonusService) PayOrderGoodBonus(orderId int64, goodId int64, a @@ -318,7 +318,6 @@ func (serve *OrderBonusService) PayOrderGoodBonus(orderId int64, goodId int64, a
318 } 318 }
319 319
320 //UpdateOrderRemarkBonus 更新备注 320 //UpdateOrderRemarkBonus 更新备注
321 -//目前只处理 海鲜干货的订单 即 order_type = OrderTypeBestShop (3)  
322 func (serve *OrderBonusService) UpdateOrderRemarkBonus(orderId int64, adminId int64, remark string) error { 321 func (serve *OrderBonusService) UpdateOrderRemarkBonus(orderId int64, adminId int64, remark string) error {
323 var ( 322 var (
324 userRepository domain.UsersRepository 323 userRepository domain.UsersRepository
@@ -338,9 +337,6 @@ func (serve *OrderBonusService) UpdateOrderRemarkBonus(orderId int64, adminId in @@ -338,9 +337,6 @@ func (serve *OrderBonusService) UpdateOrderRemarkBonus(orderId int64, adminId in
338 e := fmt.Sprintf("获取订单(id=%d)数据失败,%s", orderId, err) 337 e := fmt.Sprintf("获取订单(id=%d)数据失败,%s", orderId, err)
339 return lib.ThrowError(lib.INTERNAL_SERVER_ERROR, e) 338 return lib.ThrowError(lib.INTERNAL_SERVER_ERROR, e)
340 } 339 }
341 - if oldOrder.OrderType != domain.OrderTypeBestShop {  
342 - return lib.ThrowError(lib.BUSINESS_ERROR, "订单类型错误")  
343 - }  
344 adminUser, err = userRepository.FindOne(domain.UsersFindOneQuery{Id: adminId}) 340 adminUser, err = userRepository.FindOne(domain.UsersFindOneQuery{Id: adminId})
345 if err != nil { 341 if err != nil {
346 e := fmt.Sprintf("获取管理员用户(id=%d)数据失败,%s", adminId, err) 342 e := fmt.Sprintf("获取管理员用户(id=%d)数据失败,%s", adminId, err)
@@ -368,6 +364,5 @@ func (serve *OrderBonusService) UpdateOrderRemarkBonus(orderId int64, adminId in @@ -368,6 +364,5 @@ func (serve *OrderBonusService) UpdateOrderRemarkBonus(orderId int64, adminId in
368 return err 364 return err
369 } 365 }
370 } 366 }
371 -  
372 return nil 367 return nil
373 } 368 }
@@ -431,8 +431,8 @@ func (c *OrderDividendController) PayOrderGoodBonusForBestshop() { @@ -431,8 +431,8 @@ func (c *OrderDividendController) PayOrderGoodBonusForBestshop() {
431 return 431 return
432 } 432 }
433 433
434 -//EditOrderRemarkBonusForBestshop 编辑海鲜干货订单中的备注  
435 -func (c *OrderDividendController) EditOrderRemarkBonusForBestshop() { 434 +//EditOrderRemarkBonus 编辑订单分红详情中的备注
  435 +func (c *OrderDividendController) EditOrderRemarkBonus() {
436 type Parameter struct { 436 type Parameter struct {
437 OrderId string `json:"orderId"` 437 OrderId string `json:"orderId"`
438 Remark string `json:"remark"` 438 Remark string `json:"remark"`
@@ -32,7 +32,7 @@ func init() { @@ -32,7 +32,7 @@ func init() {
32 // beego.NSRouter("/mini-program/detail", &controllers.OrderDividendController{}, "POST:OrderDividendDetailForBestshop"), 32 // beego.NSRouter("/mini-program/detail", &controllers.OrderDividendController{}, "POST:OrderDividendDetailForBestshop"),
33 //beego.NSRouter("/mini-program/modify", &controllers.OrderDividendController{}, "POST:EditOrderDividendForBestshop"), 33 //beego.NSRouter("/mini-program/modify", &controllers.OrderDividendController{}, "POST:EditOrderDividendForBestshop"),
34 beego.NSRouter("/mini-program/payDividends", &controllers.OrderDividendController{}, "POST:PayOrderGoodBonusForBestshop"), 34 beego.NSRouter("/mini-program/payDividends", &controllers.OrderDividendController{}, "POST:PayOrderGoodBonusForBestshop"),
35 - beego.NSRouter("/mini-program/remarks", &controllers.OrderDividendController{}, "POST:EditOrderRemarkBonusForBestshop"), 35 + beego.NSRouter("/remarks", &controllers.OrderDividendController{}, "POST:EditOrderRemarkBonus"),
36 beego.NSRouter("/list/excel", &controllers.OrderDividendController{}, "POST:ListOrderBonusForExcel"), 36 beego.NSRouter("/list/excel", &controllers.OrderDividendController{}, "POST:ListOrderBonusForExcel"),
37 // beego.NSRouter("/business/detail", &controllers.BusinessBonusController{}, "POST:GetBusinessBonus"), 37 // beego.NSRouter("/business/detail", &controllers.BusinessBonusController{}, "POST:GetBusinessBonus"),
38 // beego.NSRouter("/business/edit", &controllers.BusinessBonusController{}, "POST:UpdateBusinessBonus"), 38 // beego.NSRouter("/business/edit", &controllers.BusinessBonusController{}, "POST:UpdateBusinessBonus"),