mmm-go / partnermg · 提交

转到一个项目

作者 唐旭辉
提交 eb4ae1204ea89f931a1d64e3286b7e3d9eb23328 1 个父辈 50066ad7

更新

内嵌 并排对比
正在显示 7 个修改的文件 包含 33 行增加 和 20 行删除
@@ -15,10 +15,13 @@ var _ domain.DomainEventSubscriber = (*OrderLogSubscriber)(nil) @@ -15,10 +15,13 @@ var _ domain.DomainEventSubscriber = (*OrderLogSubscriber)(nil)
15 15
16 func (subscriber *OrderLogSubscriber) HandleEvent(domainEvent domain.DomainEvent) error { 16 func (subscriber *OrderLogSubscriber) HandleEvent(domainEvent domain.DomainEvent) error {
17 switch domainEvent.EventType() { 17 switch domainEvent.EventType() {
  18 + //订单分红因为货品的数量变动而发送改变
18 case event.UPDATE_BONUS_BY_GOOD_NUMBER_EVENT: 19 case event.UPDATE_BONUS_BY_GOOD_NUMBER_EVENT:
19 - 20 + //订单分红因为合伙人分红比例变动而发送改变
20 case event.UPDATE_BONUS_BY_PARTENT_BONUS_PERCENT_EVENT: 21 case event.UPDATE_BONUS_BY_PARTENT_BONUS_PERCENT_EVENT:
  22 + //更新订单的备注
21 case event.UPDATE_ORDER_REMARK: 23 case event.UPDATE_ORDER_REMARK:
  24 + // 支付订单中货品的分红
22 case event.PAY_ORDER_GOOD_BONUS_EVENT: 25 case event.PAY_ORDER_GOOD_BONUS_EVENT:
23 } 26 }
24 return nil 27 return nil
@@ -906,15 +906,19 @@ func (service OrderInfoService) buildOrderBestshopInfoData(orderBase *domain.Ord @@ -906,15 +906,19 @@ func (service OrderInfoService) buildOrderBestshopInfoData(orderBase *domain.Ord
906 } 906 }
907 //订单描述 907 //订单描述
908 order := map[string]interface{}{ 908 order := map[string]interface{}{
909 - "orderId": orderBase.Id,  
910 - "orderState": orderBestshop.OrderState,  
911 - "customers": orderBestshop.BuyerName,  
912 - "address": orderBestshop.BuyerAddress,  
913 - "remarks": orderBestshop.BuyerRemark,  
914 - "partner": orderBase.PartnerInfo.PartnerName,  
915 - "phone": orderBestshop.BuyerPhone,  
916 - "orderTime": orderBestshop.OrderTime,  
917 - "shippingStatus": orderBestshop.DeliveryState, 909 + "orderId": orderBase.Id,
  910 + "orderState": orderBestshop.OrderState,
  911 + "customers": orderBestshop.BuyerName,
  912 + "address": orderBestshop.BuyerAddress,
  913 + "remarks": orderBestshop.BuyerRemark,
  914 + "partner": orderBase.PartnerInfo.PartnerName,
  915 + "phone": orderBestshop.BuyerPhone,
  916 + "orderTime": orderBestshop.OrderTime,
  917 + "shippingStatus": orderBestshop.DeliveryState,
  918 + "partnerDividends": orderBase.GetCurrentPartnerBonus(),
  919 + "receivedDividends": orderBase.OrderCompute.PartnerBonusHas,
  920 + "notReceivedDividend": orderBase.OrderCompute.PartnerBonusNot,
  921 + "dividendSpending": orderBase.OrderCompute.PartnerBonusExpense,
918 } 922 }
919 //订单中的商品 923 //订单中的商品
920 product := map[string]interface{}{ 924 product := map[string]interface{}{
1 package event 1 package event
2 2
3 const ( 3 const (
  4 + //支付订单中货品的分红
4 PAY_ORDER_GOOD_BONUS_EVENT string = "PayOrderGoodBonus" 5 PAY_ORDER_GOOD_BONUS_EVENT string = "PayOrderGoodBonus"
5 ) 6 )
6 7
@@ -72,7 +72,7 @@ type OrderCompute struct { @@ -72,7 +72,7 @@ type OrderCompute struct {
72 } 72 }
73 73
74 type OrderBaseRemark struct { 74 type OrderBaseRemark struct {
75 - Remark string 75 + RemarkBonus string `json:"remarkBonus"`
76 } 76 }
77 77
78 //OrderBase 订单基础 78 //OrderBase 订单基础
1 package service 1 package service
2 2
3 type OrderBonusService interface { 3 type OrderBonusService interface {
4 - UpdateBounsByGoodNumber(orderId int64, adminId int64, goodWithNumber map[int64]int) error  
5 - UpdateBounsByPartnerBonusPercent(orderId int64, adminId int64, goodWithPercent map[int]float64) error 4 + UpdateBounsByGoodNumber(orderId int64, adminId int64, goodWithNumber int) error
  5 + UpdateBounsByPartnerBonusPercent(orderId int64, adminId int64, partnerPercent float64) error
  6 + UpdateOrderRemark(orderId int64, adminId int64, remark string) error
6 PayOrderGoodBonus(orderId int64, goodId int64, adminId int64) error 7 PayOrderGoodBonus(orderId int64, goodId int64, adminId int64) error
7 } 8 }
@@ -6,6 +6,7 @@ import ( @@ -6,6 +6,7 @@ import (
6 coreDomain "github.com/linmadan/egglib-go/core/domain" 6 coreDomain "github.com/linmadan/egglib-go/core/domain"
7 "gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/domain" 7 "gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/domain"
8 "gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/domain/event" 8 "gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/domain/event"
  9 + "gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/domain/service"
9 "gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/infrastructure/pg/transaction" 10 "gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/infrastructure/pg/transaction"
10 "gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/infrastructure/repository" 11 "gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/infrastructure/repository"
11 "gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/lib" 12 "gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/lib"
@@ -17,8 +18,10 @@ type OrderBonusServices struct { @@ -17,8 +18,10 @@ type OrderBonusServices struct {
17 transactionContext *transaction.TransactionContext 18 transactionContext *transaction.TransactionContext
18 } 19 }
19 20
  21 +var _ service.OrderBonusService = (*OrderBonusServices)(nil)
  22 +
20 //UpdateBounsWithGoodNumber 分红时，因修改订单中商品的数量发生分红变动 23 //UpdateBounsWithGoodNumber 分红时，因修改订单中商品的数量发生分红变动
21 -func (serve OrderBonusServices) UpdateBounsByGoodNumber(orderId int64, adminId int64, goodWithNumber map[int64]int) error { 24 +func (serve *OrderBonusServices) UpdateBounsByGoodNumber(orderId int64, adminId int64, goodWithNumber int) error {
22 var ( 25 var (
23 userRepository domain.UsersRepository 26 userRepository domain.UsersRepository
24 orderBaseReponsitory domain.OrderBaseRepository 27 orderBaseReponsitory domain.OrderBaseRepository
@@ -66,7 +69,7 @@ func (serve OrderBonusServices) UpdateBounsByGoodNumber(orderId int64, adminId i @@ -66,7 +69,7 @@ func (serve OrderBonusServices) UpdateBounsByGoodNumber(orderId int64, adminId i
66 } 69 }
67 70
68 //UpdateBounsByPartnerBonusPercent 分红时，因修改订单中商品的合伙人分行比例发生分红变动 71 //UpdateBounsByPartnerBonusPercent 分红时，因修改订单中商品的合伙人分行比例发生分红变动
69 -func (serve OrderBonusServices) UpdateBounsByPartnerBonusPercent(orderId int64, adminId int64, goodWithPercent map[int]float64) error { 72 +func (serve *OrderBonusServices) UpdateBounsByPartnerBonusPercent(orderId int64, adminId int64, partnerPercent float64) error {
70 var ( 73 var (
71 userRepository domain.UsersRepository 74 userRepository domain.UsersRepository
72 orderBaseReponsitory domain.OrderBaseRepository 75 orderBaseReponsitory domain.OrderBaseRepository
@@ -114,7 +117,7 @@ func (serve OrderBonusServices) UpdateBounsByPartnerBonusPercent(orderId int64, @@ -114,7 +117,7 @@ func (serve OrderBonusServices) UpdateBounsByPartnerBonusPercent(orderId int64,
114 } 117 }
115 118
116 //PayOrderGoodBonus 支付订单中货品的分红 119 //PayOrderGoodBonus 支付订单中货品的分红
117 -func (serve OrderBonusServices) PayOrderGoodBonus(orderId int64, goodId int64, adminId int64) error { 120 +func (serve *OrderBonusServices) PayOrderGoodBonus(orderId int64, goodId int64, adminId int64) error {
118 var ( 121 var (
119 userRepository domain.UsersRepository 122 userRepository domain.UsersRepository
120 orderBaseReponsitory domain.OrderBaseRepository 123 orderBaseReponsitory domain.OrderBaseRepository
@@ -158,3 +161,7 @@ func (serve OrderBonusServices) PayOrderGoodBonus(orderId int64, goodId int64, a @@ -158,3 +161,7 @@ func (serve OrderBonusServices) PayOrderGoodBonus(orderId int64, goodId int64, a
158 } 161 }
159 return nil 162 return nil
160 } 163 }
  164 +
  165 +func (serve *OrderBonusServices) UpdateOrderRemark(orderId int64, adminId int64, remark string) error {
  166 + return nil
  167 +}
@@ -79,7 +79,7 @@ func (c *OrderDividendController) PageListOrderDividend() { @@ -79,7 +79,7 @@ func (c *OrderDividendController) PageListOrderDividend() {
79 "id": orderinfo.Id, 79 "id": orderinfo.Id,
80 "shipmentsId": orderinfo.DeliveryCode, 80 "shipmentsId": orderinfo.DeliveryCode,
81 "partner": orderinfo.PartnerInfo.PartnerName, 81 "partner": orderinfo.PartnerInfo.PartnerName,
82 - "dividendsReceivable": orderinfo.OrderCompute.PlanPartnerBonus, 82 + "dividendsReceivable": orderinfo.GetCurrentPartnerBonus(),
83 "dividendSpending": orderinfo.OrderCompute.PartnerBonusExpense, 83 "dividendSpending": orderinfo.OrderCompute.PartnerBonusExpense,
84 "receiveDividends": orderinfo.OrderCompute.PartnerBonusHas, 84 "receiveDividends": orderinfo.OrderCompute.PartnerBonusHas,
85 "uncollectedDividends": orderinfo.OrderCompute.PartnerBonusNot, 85 "uncollectedDividends": orderinfo.OrderCompute.PartnerBonusNot,
@@ -88,9 +88,6 @@ func (c *OrderDividendController) PageListOrderDividend() { @@ -88,9 +88,6 @@ func (c *OrderDividendController) PageListOrderDividend() {
88 "orderTypeName": domain.GetOrderBaseTypeName(orderinfo.OrderType), 88 "orderTypeName": domain.GetOrderBaseTypeName(orderinfo.OrderType),
89 "orderNumber": orderinfo.OrderCode, 89 "orderNumber": orderinfo.OrderCode,
90 } 90 }
91 - if orderinfo.OrderCompute.UsePartnerBonus >= 0 {  
92 - m["dividendsReceivable"] = orderinfo.OrderCompute.UsePartnerBonus  
93 - }  
94 rsp = append(rsp, m) 91 rsp = append(rsp, m)
95 } 92 }
96 c.ResponsePageList(rsp, cnt, param.PageNumber) 93 c.ResponsePageList(rsp, cnt, param.PageNumber)