作者 唐旭辉

修复:bug-26

... ... @@ -815,10 +815,10 @@ func (service OrderInfoService) ListOrderBonusForExcel(listOrderQuery query.List
"bonus_status": "",
"update_time": result[i].UpdateTime,
"create_time": result[i].CreateTime,
"partner_bonus": fmt.Sprint(result[i].PartnerBonus),
"partner_bonus_has": fmt.Sprint(result[i].PartnerBonusHas),
"partner_bonus_not": fmt.Sprint(result[i].PartnerBonusNot),
"partner_bonus_expense": fmt.Sprint(result[i].PartnerBonusExpense),
"partner_bonus": fmt.Sprintf("%10.2f", result[i].PartnerBonus),
"partner_bonus_has": fmt.Sprintf("%10.2f", result[i].PartnerBonusHas),
"partner_bonus_not": fmt.Sprintf("%10.2f", result[i].PartnerBonusNot),
"partner_bonus_expense": fmt.Sprintf("%10.2f", result[i].PartnerBonusExpense),
}
if result[i].HasBonusPercent == 0 {
m["partner_bonus"] = "-"
... ... @@ -894,13 +894,19 @@ func (service OrderInfoService) ListOrderForExcel(listOrderQuery query.ListOrder
"update_time": ordersData[i].UpdateTime,
"create_time": ordersData[i].CreateTime,
"plan_order_count": fmt.Sprint(ordersData[i].PlanOrderCount),
"use_order_count": fmt.Sprint(ordersData[i].UseOrderCount),
"use_order_count": "",
"region_name": fmt.Sprint(ordersData[i].RegionName),
"plan_order_amount": fmt.Sprint(ordersData[i].PlanOrderAmount),
"user_order_amount": fmt.Sprint(ordersData[i].UseOrderAmount),
"plan_order_amount": fmt.Sprintf("%10.2f", ordersData[i].PlanOrderAmount),
"use_order_amount": "",
"partner_category": ordersData[i].PartnerCategory,
"buyer_name": ordersData[i].BuyerName,
}
if ordersData[i].UseOrderCount >= 0 {
m["use_order_count"] = fmt.Sprint(ordersData[i].UseOrderCount)
}
if ordersData[i].UseOrderAmount >= 0 {
m["use_order_amount"] = fmt.Sprintf("%10.2f", ordersData[i].UseOrderAmount)
}
resultMaps = append(resultMaps, m)
}
column := [][2]string{
... ...
... ... @@ -8,6 +8,8 @@ const (
BATCH_PAY_ORDER_GOOD_BONUS_EVENT string = "BatchPayOrderGoodBonus"
)
//BatchPayOrderGoodBonus
//事件:批量支付一个订单中货品的分红
type BatchPayOrderGoodBonus []PayOrderGoodBonus
func (p BatchPayOrderGoodBonus) EventType() string {
... ... @@ -15,7 +17,7 @@ func (p BatchPayOrderGoodBonus) EventType() string {
}
//PayOrderGoodBonus
//事件:批量支付一个订单中货品的分红
//事件:支付一个订单中货品的分红
type PayOrderGoodBonus struct {
OrderBase *domain.OrderBase
Goods []domain.OrderGood
... ...