作者 yangfu

fix: 分红明细列表修改,分享预览图

@@ -218,7 +218,7 @@ func UserInfoV2(header *protocol.RequestHeader, request *protocol.UserInfoReques @@ -218,7 +218,7 @@ func UserInfoV2(header *protocol.RequestHeader, request *protocol.UserInfoReques
218 miniProgram["webpageUrl"] = "www.baidu.com" 218 miniProgram["webpageUrl"] = "www.baidu.com"
219 miniProgram["userName"] = company.Applets[0].Id 219 miniProgram["userName"] = company.Applets[0].Id
220 miniProgram["path"] = fmt.Sprintf("%v?inviter_id=%v&company_id=%v", company.Applets[0].URL, partnerInfo.Id, partnerInfo.CompanyId) 220 miniProgram["path"] = fmt.Sprintf("%v?inviter_id=%v&company_id=%v", company.Applets[0].URL, partnerInfo.Id, partnerInfo.CompanyId)
221 - miniProgram["hdImageUrl"] = "http://suplus-business-admin-test.fjmaimaimai.com/images/default/default_logo.png" 221 + miniProgram["hdImageUrl"] = "https://media.fjmaimaimai.com/image/default/E07BA76675DC4F17A1DE8A34BE02FC50-6-2.jpg"
222 miniProgram["title"] = company.Applets[0].Name 222 miniProgram["title"] = company.Applets[0].Name
223 } 223 }
224 } 224 }
@@ -105,9 +105,9 @@ func (dao *OrderBaseDao) DividendOrders(option *domain.DividendOrdersQueryOption @@ -105,9 +105,9 @@ func (dao *OrderBaseDao) DividendOrders(option *domain.DividendOrdersQueryOption
105 //} 105 //}
106 if option.DividendAction == 0 { //累计分红 106 if option.DividendAction == 0 { //累计分红
107 if option.DetailAction == 0 { //已收明细 107 if option.DetailAction == 0 { //已收明细
108 - q.Where(`"order_base".partner_bonus_has>0`)  
109 - } else if option.DetailAction == 1 { //未收明细 //实际金额>已支付金额  
110 - q.Where(`"order_base".partner_bonus_not>0`) 108 + q.Where(`(partner_bonus_has>0 or (partner_bonus_has=0 and coalesce(partner_bonus_not,0)=0 and bonus_status=2)) `)
  109 + } else if option.DetailAction == 1 { //未收明细 //实际金额>已支付金额 如果应收分红为0,根据支付状态判断是已收(2)还是未收(1)
  110 + q.Where(`(partner_bonus_not>0 or (partner_bonus_has=0 and coalesce(partner_bonus_not,0)=0 and bonus_status=1))`)
111 } 111 }
112 } else if option.DividendAction == 1 { //分红支出 112 } else if option.DividendAction == 1 { //分红支出
113 q.Where(`"order_base".partner_bonus_expense>0`) 113 q.Where(`"order_base".partner_bonus_expense>0`)