|
|
@@ -1890,11 +1890,12 @@ func SpecialActivityPointsBillRoadShowReduce(log models.YanXuanActivityPointsRed
|
|
|
err = errors.New("GetCygxActivitySpecialTripBill" + e.Error())
|
|
|
return
|
|
|
}
|
|
|
- mapActivityPointsBill := make(map[int]*models.CygxActivitySpecialTripBill)
|
|
|
+ mapActivityPointsBill := make(map[string]*models.CygxActivitySpecialTripBill)
|
|
|
var itemsOld []*models.CygxActivitySpecialTripBill // 之前扣过点的流水记录
|
|
|
for _, v := range activityPointsBillList { //获取这场路演，某个研究员最后一次的扣点记录
|
|
|
- if mapActivityPointsBill[v.ResearcherId] == nil {
|
|
|
- mapActivityPointsBill[v.ResearcherId] = v
|
|
|
+ keyBill := fmt.Sprint(v.ResearcherId, "_CID", companyId)
|
|
|
+ if mapActivityPointsBill[keyBill] == nil {
|
|
|
+ mapActivityPointsBill[keyBill] = v
|
|
|
if v.BillDetailed <= 0 && v.DoType == 1 {
|
|
|
itemsOld = append(itemsOld, v)
|
|
|
}
|
