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

src/order/orderManageController.go

@@ -3774,6 +3774,15 @@ func BackOrderAuditList(context *admin.Context) (interface{}, error) {
 		"is_backstage_order=1",
 	}
 	if param.SaleDep != "" {
+		wstr := ""
+		//saleDepArr :=
+		for k, v := range strings.Split(param.SaleDep, ",") {
+			if k == 0 {
+				wstr += fmt.Sprintf(" showField like '%s'", v)
+			} else {
+				wstr += fmt.Sprintf(" or showField like '%s'", v)
+			}
+		}
 		//condition = append(condition, fmt.Sprintf(`condition = '%s'`, param.SaleDep))
 		//先查询选择部门以及子部门code
 		deptStr := ""

src/order/orderManageService.go

@@ -4872,6 +4872,9 @@ func ExtendBigOrder(subStatus, pay_sub_num, free_sub_num int, now, startdate, en
 		isAll = 1
 	}
 	filterMap := ParamToFilter(param, enddate, isAll, contractStatus)
+	if param.AreaCount > 0 {
+		filterMap["areaCount"] = param.AreaCount
+	}
 	filter, _ := json.Marshal(filterMap)
 	serverMap := GetServerPid()
 	agreementTime := time.Unix(param.AgreementTime, 0)
@@ -4986,6 +4989,7 @@ func ExtendBigOrder(subStatus, pay_sub_num, free_sub_num int, now, startdate, en
 					}
 					l_endtime = enddate
 					sql := "update bigmember_service_user set i_frequency = i_frequency + ?,l_updatetime = ?,l_endtime = ? where s_serviceid = ? and s_userid = ?"
+					fmt.Println("-----------", sql)
 					status1 := util.JysqlDB.UpdateOrDeleteBySql(sql, frequency, qutil.NowFormat(qutil.Date_Full_Layout), qutil.FormatDate(&l_endtime, qutil.Date_Full_Layout), serverId, userId)
 					if status1 > 0 {
 						log.Println("用户服务表更新成功", userId)