Merge branch 'dev/v2.4.30_rjj' of jianyu/qmx_admin into feature/v2.4.30

src/order/orderManageController.go

@@ -3379,7 +3379,7 @@ func GetCombo(context *admin.Context) (interface{}, error) {
 
 	sqls := " ORDER BY i_sort DESC limit " + fmt.Sprint(param.Offset) + "," + fmt.Sprint(param.PageSize)
 	if param.Offset == 0 && param.PageSize == 0 {
-		sqls = ""
+		sqls = " ORDER BY i_sort DESC "
 	}
 	data := []map[string]interface{}{}
 	counts := int64(0)

src/order/orderSellingPrice.go

@@ -170,11 +170,13 @@ func orderPriceCount(context *admin.Context) (interface{}, error) {
 				fmt.Println(primaryAccountPrice)
 			}
 			//子账号价格
-			subAccount := config.BigServiceMap[2]
-			if param.BuySubject == "1" {
-				subAccountPrice = qutil.IntAll(subAccount["i_personal_price"])
-			} else {
-				subAccountPrice = qutil.IntAll(subAccount["i_price_year"])
+			if param.CreateType != 2 {
+				subAccount := config.BigServiceMap[2]
+				if param.BuySubject == "1" {
+					subAccountPrice = qutil.IntAll(subAccount["i_personal_price"])
+				} else {
+					subAccountPrice = qutil.IntAll(subAccount["i_price_year"])
+				}
 			}
 			if param.CreateType == 1 || param.CreateType == 3 { //1 新建  3 延长服务（需要计算主账号价钱）
 				price = float64(primaryAccountPrice+(param.BuyCount-1)*subAccountPrice) / float64(10) * float64(monthCount)