Merge branch 'cygx_13.6' of http://8.136.199.33:3000/cxzhang/hongze_clpt into debug

controllers/activity_special.go

@@ -265,7 +265,7 @@ func (this *ActivitySpecialController) SpecialTripAdd() {
 			itemBill.ChartPermissionId = activityInfo.ChartPermissionId
 			itemBill.ChartPermissionName = activityInfo.ChartPermissionName
 
-			if activityInfo.ChartPermissionName == utils.CE_LUE_NAME || activityInfo.ChartPermissionName == utils.GU_SHOU_NAME {
+			if activityInfo.ChartPermissionName == utils.CE_LUE_NAME || activityInfo.ChartPermissionName == utils.GU_SHOU_NAME || activityInfo.ChartPermissionName == utils.ZHOU_QI_NAME {
 				//如果是策略、固收行业，把代扣行业信息放入流水表，取消报名的时候，返点使用
 				maxChartPermissionId, maxChartPermissionName, err := services.GetSpecialBillMaxChartPermissionId(user)
 				if err != nil {

utils/constants.go

@@ -71,6 +71,7 @@ const (
 )
 
 const (
+	ZHOU_QI_NAME                     string = "周期"
 	CE_LUE_NAME                      string = "策略"
 	CE_LUE_ID                        int    = 23
 	CHART_PERMISSION_NAME_YANXUAN    string = "研选"