Merge remote-tracking branch 'origin/feature/v2.4.30' into feature/v2.4.30

src/order/orderManageController.go

@@ -1315,7 +1315,7 @@ func UpdateBigOrder(context *admin.Context) (interface{}, error) {
 	if param.Level == 0 || param.CreateType == 0 {
 		return nil, errors.New("缺少关键参数")
 	}
-	if param.PayCycle == 0 {
+	if param.PayCycle == 0 && param.CreateType != 2 {
 		return nil, errors.New("缺少周期")
 	}
 	if param.PayMoney > 0 {
@@ -3204,7 +3204,7 @@ func IsOpenBig(context *admin.Context) (interface{}, error) {
 	}
 	status, isSub, isYear := 0, 0, 0
 	endTime := int64(0)
-	bigStart, bigEnd, subStatus, memberStatus, mainId, areaCount := int64(0), int64(0), -1, 0, "", 0
+	bigStart, bigEnd, subStatus, memberStatus, mainId, areaCount, buyCount := int64(0), int64(0), -1, 0, "", 0, 0
 	existComingIntoEffective := false
 	var notStartFlag bool
 	if param.Phone != "" {
@@ -3222,6 +3222,7 @@ func IsOpenBig(context *admin.Context) (interface{}, error) {
 			if memberJyMap, ok1 := ((*userData)["o_member_jy"]).(map[string]interface{}); ok1 {
 				areaCount = qutil.IntAll(memberJyMap["i_areacount"])
 			}
+			buyCount = qutil.IntAll((*userData)["i_pay_sub_num"]) + qutil.IntAll((*userData)["i_free_sub_num"]) + 1
 		} else {
 			userDatas, oks := util.MQFW.FindOne("user", map[string]interface{}{"s_m_phone": param.Phone})
 			if oks && userDatas != nil && len(*userDatas) > 0 {
@@ -3234,6 +3235,7 @@ func IsOpenBig(context *admin.Context) (interface{}, error) {
 				if memberJyMap, ok1 := ((*userData)["(*userData)"]).(map[string]interface{}); ok1 {
 					areaCount = qutil.IntAll(memberJyMap["i_areacount"])
 				}
+				buyCount = qutil.IntAll((*userData)["i_pay_sub_num"]) + qutil.IntAll((*userData)["i_free_sub_num"]) + 1
 			} else {
 				isYear = 2
 			}
@@ -3292,6 +3294,7 @@ func IsOpenBig(context *admin.Context) (interface{}, error) {
 		"comingIntoEffective": existComingIntoEffective,
 		"i_member_status":     memberStatus,
 		"areaCount":           areaCount,
+		"buyCount":            buyCount,
 	}, nil
 }