Merge branch 'master' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

models/activity_special_trip_bill.go

@@ -136,3 +136,12 @@ func AddCygxActivitySpecialTripBillMulti(items []*CygxActivitySpecialTripBill, i
 	}
 	return
 }
+
+// 删除
+func DelCygxActivitySpecialTripBillById(id int) (err error) {
+	o := orm.NewOrm()
+	sql := ` DELETE FROM cygx_activity_special_trip_bill  WHERE id   = ?  `
+	_, err = o.Raw(sql, id).Exec()
+
+	return
+}

models/ficc_report/report.go

@@ -152,11 +152,11 @@ func GetFiccRreportToCygxArticle(condition string, pars []interface{}) (items []
 	o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT	* FROM report WHERE state = 2 AND  is_public_publish = 1  	AND  report_layout != 3 
 			AND classify_name_first IN ('宏观报告','晨会纪要','调研纪要','数据点评','从宏观看商品')
-			AND classify_name_second IN ('晨会纪要','黑色调研','宏观G2观察','人民币汇率双周报','房地产市场跟踪','黄金月报','铜行业数据点评','原油船期数据跟踪','从宏观看商品','铜行业跟踪')
+			AND classify_name_second IN ('晨会纪要','黑色调研','宏观G2观察','人民币汇率双周报','房地产市场跟踪','黄金月报','铜行业数据点评','原油船期数据跟踪','从宏观看商品','铜行业跟踪','商品宏观逻辑跟踪')
 			AND IF ( classify_name_first = '宏观报告' , classify_name_second IN  ('宏观G2观察','人民币汇率双周报','房地产市场跟踪','黄金月报')  ,1=1 )
 			AND IF ( classify_name_first = '晨会纪要' , classify_name_second = '晨会纪要' ,1=1 )
 			AND IF ( classify_name_first = '调研纪要' , classify_name_second = '黑色调研' ,1=1 ) 
-			AND IF ( classify_name_first = '从宏观看商品' , classify_name_second = '从宏观看商品' ,1=1 ) 
+			AND IF ( classify_name_first = '从宏观看商品' , classify_name_second IN ('从宏观看商品','商品宏观逻辑跟踪')  ,1=1 ) 
 			AND IF ( classify_name_first = '数据点评' , classify_name_second  IN  ('铜行业数据点评','原油船期数据跟踪','铜行业跟踪') ,1=1 ) ` + condition + ` ORDER BY  modify_time	 DESC   `
 	_, err = o.Raw(sql, pars).QueryRows(&items)
 	return

services/activity_points.go

@@ -502,29 +502,27 @@ func YanXuanActivityPointsBillActivityEditReduce(log models.YanXuanActivityPoint
 	item := new(models.CygxActivitySpecialTripBill)
 	var itemCompanys []*models.CygxActivitySpecialPermissionPoints
 	itemCompany := new(models.CygxActivitySpecialPermissionPoints)
-
+	//item.UserId = user.UserId
+	item.ActivityId = activityId
+	item.CreateTime = time.Now()
+	//item.Mobile = user.Mobile
+	//item.Email = user.Email
+	item.CompanyId = comapny.CompanyId
+	item.CompanyName = comapny.CompanyName
+	//item.RealName = user.RealName
+	item.BillDetailed = -activityPointsSetDetail.CompanyPointsNum
+	item.RegisterPlatform = log.RegisterPlatform
+	item.AdminId = log.AdminId
+	item.Source = log.Source
+	item.ChartPermissionId = activityInfo.ChartPermissionId
+	item.DoType = 1
+	item.Content = activityInfo.ActivityName + "--办会"
+	//item.Points = companyPointsNum - activityPointsSetDetail.CompanyPointsNum
+	item.Total = fmt.Sprint(companyPointsNum-activityPointsSetDetail.CompanyPointsNum, "次")
+	item.TableSource = utils.CYGX_OBJ_ACTIVITY
 	if activityPointsBillDetail == nil { //如果是空的就添加
 		//获取需要添加的流水信息
-		//item.UserId = user.UserId
-		item.ActivityId = activityId
-		item.CreateTime = time.Now()
-		//item.Mobile = user.Mobile
-		//item.Email = user.Email
-		item.CompanyId = comapny.CompanyId
-		item.CompanyName = comapny.CompanyName
-		//item.RealName = user.RealName
-		item.BillDetailed = -activityPointsSetDetail.CompanyPointsNum
-		item.RegisterPlatform = log.RegisterPlatform
-		item.AdminId = log.AdminId
-		item.Source = log.Source
-		item.ChartPermissionId = activityInfo.ChartPermissionId
-		item.DoType = 1
-		item.Content = activityInfo.ActivityName + "--办会"
-		//item.Points = companyPointsNum - activityPointsSetDetail.CompanyPointsNum
-		item.Total = fmt.Sprint(companyPointsNum-activityPointsSetDetail.CompanyPointsNum, "次")
-		item.TableSource = utils.CYGX_OBJ_ACTIVITY
 		items = append(items, item)
-
 		//更新对应机构的剩余点数
 		itemCompany.CompanyId = comapny.CompanyId
 		itemCompany.Points = companyPointsNum - activityPointsSetDetail.CompanyPointsNum
@@ -538,7 +536,7 @@ func YanXuanActivityPointsBillActivityEditReduce(log models.YanXuanActivityPoint
 	} else {
 		//如果存在就进行对比修改
 		if activityPointsSetDetail.CompanyPointsNum != -activityPointsBillDetail.BillDetailed {
-			item.Id = activityPointsBillDetail.Id
+			//item.Id = activityPointsBillDetail.Id
 			item.BillDetailed = -activityPointsSetDetail.CompanyPointsNum
 			item.Total = fmt.Sprint(companyPointsNum-activityPointsBillDetail.BillDetailed-activityPointsSetDetail.CompanyPointsNum, "次")
 			items = append(items, item)
@@ -548,6 +546,12 @@ func YanXuanActivityPointsBillActivityEditReduce(log models.YanXuanActivityPoint
 			itemCompany.Points = companyPointsNum - activityPointsBillDetail.BillDetailed - activityPointsSetDetail.CompanyPointsNum
 			itemCompany.ModifyTime = time.Now()
 			itemCompanys = append(itemCompanys, itemCompany)
+
+			e = models.DelCygxActivitySpecialTripBillById(activityPointsBillDetail.Id)
+			if e != nil {
+				err = errors.New("DelCygxActivitySpecialTripBillById, Err: " + e.Error())
+				return
+			}
 			e = models.AddCygxActivitySpecialTripBillMulti(items, itemCompanys)
 			if e != nil && e.Error() != utils.ErrNoRow() {
 				err = errors.New("AddCygxActivitySpecialTripBillMulti, Err: " + e.Error())