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

src/order/orderManageController.go

@@ -90,6 +90,7 @@ type Params struct {
 	Contract_userA_contacts_address string                   `form:"e_contract_userA_contacts_address"` // 协议甲方联系地址
 	Contract_userB_contacts_name    string                   `form:"e_contract_userB_contacts_name"`    // 协议乙方联系人
 	Contract_remark                 string                   `form:"e_contract_remark"`                 // 协议备注
+	Contract_nature                 int                      `form:"contract_nature"`                   //合同性质   1新增合同  2 续签合同
 }
 
 // 订单列表
@@ -551,14 +552,18 @@ func OrderDetails(context *admin.Context) (interface{}, error) {
 		} else {
 			(*res)["moneyCorrectionData"] = []map[string]interface{}{}
 		}
+		//合同信息
+		contractRes := GetContractInfo(qutil.ObjToString((*res)["order_code"]))
 		if param.Type == "VIP订阅" || param.Type == "超级订阅" { //VIP订阅
 			result = VipOrderDetails(res)
+			result["contractRes"] = contractRes
 		} else if param.Type == "数据报告" { //数据报告
 			result = DataReportOrderDetail(res)
 		} else if param.Type == "历史数据" || param.Type == "数据导出" { //数据导出
 			// 线下的历史数据
 			if qutil.IntAll((*res)["is_backstage_order"]) == 1 {
 				result = SupplementaryOrder(res)
+				result["contractRes"] = contractRes
 			} else {
 				result = DataExportOrderDetail(res)
 			}
@@ -568,18 +573,31 @@ func OrderDetails(context *admin.Context) (interface{}, error) {
 			// 线下的商机管理单子和结构化数据的一样
 			if qutil.IntAll((*res)["is_backstage_order"]) == 1 {
 				result = SupplementaryOrder(res)
+				result["contractRes"] = contractRes
 			} else {
 				// 线上的商机管理单子
 				result = EntnicheOrderDetail(res)
 			}
 		} else if param.Type == "大会员" || param.Type == "大会员-子账号" || param.Type == "大会员-补充包" || param.Type == "大会员-AI中标预测包" {
 			result = BigVipOrderDetails(res)
+			result["contractRes"] = contractRes
 		} else if param.Type == "招标文件解读" || param.Type == "大会员-招标文件解读" {
 			result = BidFileReadOrderDetail(res)
 		} else if param.Type == "剑鱼币" || param.Type == "数据流量包" || param.Type == "省份订阅包" || param.Type == "附件下载包" || param.Type == "采购单位画像包" || param.Type == "数据文件" {
 			result = JyPointsOrderDetail(res)
+			if param.Type == "数据文件" {
+				result["contractRes"] = contractRes
+			}
 		} else {
 			result = SupplementaryOrder(res)
+			result["contractRes"] = contractRes
+		}
+		//退款信息
+		refundRes := util.JysqlDB.Find("refund_record", map[string]interface{}{"order_code": (*res)["order_code"]}, "", "", 0, 0)
+		if refundRes != nil && len(*refundRes) > 0 {
+			result["refundRes"] = *refundRes
+		} else {
+			result["refundRes"] = []map[string]interface{}{}
 		}
 		// 审核轨迹详情
 		auditResult := AuditRecordsList(qutil.ObjToString(orderCode), -1, -1)
@@ -590,6 +608,21 @@ func OrderDetails(context *admin.Context) (interface{}, error) {
 	return result, nil
 }
 
+func GetContractInfo(orderCode string) (info map[string]interface{}) {
+	contractRes := util.JysqlDB.FindOne("contract", map[string]interface{}{"order_code": orderCode}, "", "")
+	if contractRes != nil && len(*contractRes) != 0 {
+		// 合同信息
+		if (*contractRes)["contract_file_url"] != nil && len((*contractRes)["contract_file_url"].(string)) > 0 {
+			index_ := strings.LastIndex((*contractRes)["contract_file_url"].(string), "/")
+			if index_ != -1 {
+				(*contractRes)["contract_file_name"] = (*contractRes)["contract_file_url"].(string)[index_+1:]
+			}
+		}
+		info = *contractRes
+	}
+	return info
+}
+
 // ConfirmRefund 退款接口
 func ConfirmRefund(context *admin.Context) (interface{}, error) {
 	param := new(struct {

src/order/orderManageService.go

@@ -516,19 +516,11 @@ func VipOrderDetails(res *map[string]interface{}) map[string]interface{} {
 			}
 		}
 	}
-	//退款信息
-	refundRes := util.JysqlDB.Find("refund_record", map[string]interface{}{"order_code": (*res)["order_code"]}, "", "", 0, 0)
-	if refundRes != nil && len(*refundRes) > 0 {
-		result["refundRes"] = *refundRes
-	} else {
-		result["refundRes"] = []map[string]interface{}{}
-	}
+
 	// 回款信息
 	returnInfo := util.JysqlDB.SelectBySql("SELECT COUNT(*)  count,SUM(return_money) money from return_money_record  WHERE order_code=? and  state=1", (*res)["order_code"])
 	// 回款交易详情列表
 	returnRes := util.JysqlDB.Find("return_money_record", map[string]interface{}{"order_code": (*res)["order_code"], "state": 1}, "", "", 0, 0)
-	// 合同
-	contractRes := util.JysqlDB.FindOne("contract", map[string]interface{}{"order_code": (*res)["order_code"]}, "", "")
 	if returnRes != nil && len(*returnRes) > 0 {
 		for _, d := range *returnRes {
 			if d["return_voucher_url"] != nil && len(d["return_voucher_url"].(string)) > 0 {
@@ -542,17 +534,6 @@ func VipOrderDetails(res *map[string]interface{}) map[string]interface{} {
 	} else {
 		result["returnRes"] = []map[string]interface{}{}
 	}
-	if contractRes != nil && len(*contractRes) > 0 {
-		if (*contractRes)["contract_file_url"] != nil && len((*contractRes)["contract_file_url"].(string)) > 0 {
-			index_ := strings.LastIndex((*contractRes)["contract_file_url"].(string), "/")
-			if index_ != -1 {
-				(*contractRes)["contract_file_name"] = (*contractRes)["contract_file_url"].(string)[index_+1:]
-			}
-		}
-		result["contractRes"] = *contractRes
-	} else {
-		result["contractRes"] = map[string]interface{}{}
-	}
 	delete(*res, "filter")
 	//delete(*res, "order_money")
 	result["res"] = *res
@@ -785,13 +766,6 @@ func DataExportOrderDetail(res *map[string]interface{}) map[string]interface{} {
 	} else {
 		(*res)["pay_way"] = ""
 	}
-	//退款信息
-	refundRes := util.JysqlDB.Find("refund_record", map[string]interface{}{"order_code": (*res)["order_code"]}, "", "", 0, 0)
-	if refundRes != nil && len(*refundRes) > 0 {
-		result["refundRes"] = *refundRes
-	} else {
-		result["refundRes"] = []map[string]interface{}{}
-	}
 
 	delete(*res, "filter")
 	result["isExit"] = isExit
@@ -964,13 +938,7 @@ func DataReportOrderDetail(res *map[string]interface{}) map[string]interface{} {
 			result["filterData"] = fiterMap
 		}
 	}
-	//退款信息
-	refundRes := util.JysqlDB.Find("refund_record", map[string]interface{}{"order_code": (*res)["order_code"]}, "", "", 0, 0)
-	if refundRes != nil && len(*refundRes) > 0 {
-		result["refundRes"] = *refundRes
-	} else {
-		result["refundRes"] = []map[string]interface{}{}
-	}
+
 	delete(*res, "filter")
 	result["res"] = *res
 	return result
@@ -1153,13 +1121,7 @@ func CourseOrderDetails(res *map[string]interface{}, name string) map[string]int
 	// }
 	order_money := qutil.Float64All((*res)["order_money"]) / 100
 	(*res)["order_money"] = order_money
-	//退款信息
-	refundRes := util.JysqlDB.Find("refund_record", map[string]interface{}{"order_code": (*res)["order_code"]}, "", "", 0, 0)
-	if refundRes != nil && len(*refundRes) > 0 {
-		result["refundRes"] = *refundRes
-	} else {
-		result["refundRes"] = []map[string]interface{}{}
-	}
+
 	delete(*resCourse, "s_content")
 	delete(*res, "filter")
 	result["res"] = res
@@ -1339,10 +1301,6 @@ func BigVipOrderDetails(res *map[string]interface{}) map[string]interface{} {
 	returnInfo := util.JysqlDB.SelectBySql("SELECT COUNT(*)  count,SUM(return_money) money from return_money_record  WHERE order_code=? and  state=1", (*res)["order_code"])
 	// 回款交易详情列表
 	returnRes := util.JysqlDB.Find("return_money_record", map[string]interface{}{"order_code": (*res)["order_code"], "state": 1}, "", "", 0, 0)
-	//退款信息
-	refundRes := util.JysqlDB.Find("refund_record", map[string]interface{}{"order_code": (*res)["order_code"]}, "", "", 0, 0)
-	// 合同
-	contractRes := util.JysqlDB.FindOne("contract", map[string]interface{}{"order_code": (*res)["order_code"]}, "", "")
 	if returnRes != nil && len(*returnRes) > 0 {
 		for _, d := range *returnRes {
 			if d["return_voucher_url"] != nil && len(d["return_voucher_url"].(string)) > 0 {
@@ -1356,24 +1314,6 @@ func BigVipOrderDetails(res *map[string]interface{}) map[string]interface{} {
 	} else {
 		result["returnRes"] = []map[string]interface{}{}
 	}
-	if contractRes != nil && len(*contractRes) > 0 {
-		if (*contractRes)["contract_file_url"] != nil && len((*contractRes)["contract_file_url"].(string)) > 0 {
-			index_ := strings.LastIndex((*contractRes)["contract_file_url"].(string), "/")
-			if index_ != -1 {
-				(*contractRes)["contract_file_name"] = (*contractRes)["contract_file_url"].(string)[index_+1:]
-			}
-		}
-		contractTime, _ := time.ParseInLocation(qutil.Date_Full_Layout, qutil.ObjToString((*contractRes)["contract_time"]), time.Local)
-		(*contractRes)["contractTime"] = contractTime.Unix()
-		result["contractRes"] = *contractRes
-	} else {
-		result["contractRes"] = map[string]interface{}{}
-	}
-	if refundRes != nil && len(*refundRes) > 0 {
-		result["refundRes"] = *refundRes
-	} else {
-		result["refundRes"] = []map[string]interface{}{}
-	}
 
 	delete(*res, "filter")
 	//delete(*res, "order_money")
@@ -1579,13 +1519,7 @@ func EntnicheOrderDetail(res *map[string]interface{}) map[string]interface{} {
 
 		}
 	}
-	//退款信息
-	refundRes := util.JysqlDB.Find("refund_record", map[string]interface{}{"order_code": (*res)["order_code"]}, "", "", 0, 0)
-	if refundRes != nil && len(*refundRes) > 0 {
-		result["refundRes"] = *refundRes
-	} else {
-		result["refundRes"] = []map[string]interface{}{}
-	}
+
 	delete(*res, "filter")
 	result["filterData"] = filterMap
 	result["res"] = *res
@@ -1743,13 +1677,6 @@ func BidFileReadOrderDetail(res *map[string]interface{}) map[string]interface{}
 	} else {
 		(*res)["pay_way"] = ""
 	}
-	//退款信息
-	refundRes := util.JysqlDB.Find("refund_record", map[string]interface{}{"order_code": (*res)["order_code"]}, "", "", 0, 0)
-	if refundRes != nil && len(*refundRes) > 0 {
-		result["refundRes"] = *refundRes
-	} else {
-		result["refundRes"] = []map[string]interface{}{}
-	}
 
 	delete(*res, "filter")
 	result["res"] = *res
@@ -1919,30 +1846,6 @@ func JyPointsOrderDetail(res *map[string]interface{}) map[string]interface{} {
 	} else {
 		(*res)["pay_way"] = ""
 	}
-
-	if qutil.IntAll((*res)["is_backstage_order"]) == 1 && product_type == "数据文件" {
-		contractRes := util.JysqlDB.FindOne("contract", map[string]interface{}{"order_code": (*res)["order_code"]}, "", "")
-		//合同金额
-		if contractRes != nil && len(*contractRes) != 0 {
-			if (*contractRes)["contract_file_url"] != nil && len((*contractRes)["contract_file_url"].(string)) > 0 {
-				index_ := strings.LastIndex((*contractRes)["contract_file_url"].(string), "/")
-				if index_ != -1 {
-					(*contractRes)["contract_file_name"] = (*contractRes)["contract_file_url"].(string)[index_+1:]
-				}
-			}
-			result["contractRes"] = *contractRes
-		} else {
-			result["contractRes"] = map[string]interface{}{}
-		}
-	}
-	//退款信息
-	refundRes := util.JysqlDB.Find("refund_record", map[string]interface{}{"order_code": (*res)["order_code"]}, "", "", 0, 0)
-	if refundRes != nil && len(*refundRes) > 0 {
-		result["refundRes"] = *refundRes
-	} else {
-		result["refundRes"] = []map[string]interface{}{}
-	}
-
 	delete(*res, "filter")
 	result["res"] = *res
 	result["filterData"] = fiterMap
@@ -3777,31 +3680,7 @@ func NewBigOrder(subStatus, dateType int, startdate, enddate time.Time, userId,
 		returnStatus = 1
 		isAll = 1
 	}
-	filterMap := map[string]interface{}{
-		"source":         "qmx",
-		"cycle":          param.PayCycle,
-		"cycleType":      param.CycleType,
-		"level":          param.Level,
-		"pay_sub_num":    param.PaySub,
-		"free_sub_num":   param.FreeSub,
-		"transferV":      param.PayV,
-		"transferVTime":  qutil.NowFormat(qutil.Date_Full_Layout),
-		"effective_date": enddate.Format("2006/01/02"),
-		"bigMoney":       param.BigMoney,
-		"subMoney":       param.SubMoney,
-		"supplyMoney":    param.SupplyMoney,
-		"bigPayMoney":    param.BigPayMoney,
-		"subPayMoney":    param.SubPayMoney,
-		"supplyPayMoney": param.SupplyPayMoney,
-		"createType":     param.CreateType,
-		"comboId":        param.ComboId,
-		"serversId":      param.ServersId,
-		"serversName":    param.ServersName,
-		"isAll":          isAll,
-		"supplys":        param.ServerArr,
-		"remark":         param.Remark,
-		"contractStatus": contractStatus,
-	}
+	filterMap := ParamToFilter(param, enddate, isAll, contractStatus)
 	// p238 大会员省份版处理省份数量
 	if param.AreaCount != 0 {
 		filterMap["areaCount"] = param.AreaCount
@@ -3878,6 +3757,7 @@ func NewBigOrder(subStatus, dateType int, startdate, enddate time.Time, userId,
 			"contract_archive_status": qutil.If(param.AgreementStatus == 0, nil, param.ContractArchiveStatus),
 			"contract_archive_time":   qutil.If(param.ContractArchiveTime == "", nil, param.ContractArchiveTime),
 			"contract_archive_num":    qutil.If(param.AgreementStatus == 0, nil, param.ContractArchiveNum),
+			"contract_nature":         qutil.IntAll(param.Contract_nature),
 		}
 		//是否符合生成电子合同
 		createType := qutil.IntAll(filterMap["createType"])
@@ -4241,31 +4121,7 @@ func UpdateNewBigOrder(oldFilter string, subStatus, dateType int, now, startdate
 		return_status = 1
 		isAll = 1
 	}
-	filter_map := map[string]interface{}{
-		"source":         "qmx",
-		"cycle":          param.PayCycle,
-		"cycleType":      param.CycleType,
-		"level":          param.Level,
-		"pay_sub_num":    param.PaySub,
-		"free_sub_num":   param.FreeSub,
-		"transferV":      param.PayV,
-		"transferVTime":  qutil.NowFormat(qutil.Date_Full_Layout),
-		"effective_date": enddate.Format("2006/01/02"),
-		"bigMoney":       param.BigMoney,
-		"subMoney":       param.SubMoney,
-		"supplyMoney":    param.SupplyMoney,
-		"bigPayMoney":    param.BigPayMoney,
-		"subPayMoney":    param.SubPayMoney,
-		"supplyPayMoney": param.SupplyPayMoney,
-		"createType":     param.CreateType,
-		"comboId":        param.ComboId,
-		"serversId":      param.ServersId,
-		"serversName":    param.ServersName,
-		"isAll":          isAll,
-		"supplys":        param.ServerArr,
-		"remark":         param.Remark,
-		"contractStatus": contractStatus,
-	}
+	filter_map := ParamToFilter(param, enddate, isAll, contractStatus)
 	// p238 大会员省份版处理省份数量
 	if param.AreaCount != 0 {
 		filter_map["areaCount"] = param.AreaCount
@@ -4729,32 +4585,8 @@ func SupplyBigOrder(subStatus, pay_sub_num, free_sub_num, dateType int, now, sta
 		return_status = 1
 		isAll = 1
 	}
-	filter_map := map[string]interface{}{
-		"source":         "qmx",
-		"cycle":          param.PayCycle,
-		"cycleType":      param.CycleType,
-		"level":          param.Level,
-		"pay_sub_num":    param.PaySub,
-		"free_sub_num":   param.FreeSub,
-		"transferV":      param.PayV,
-		"transferVTime":  qutil.NowFormat(qutil.Date_Full_Layout),
-		"effective_date": enddate.Format("2006/01/02"),
-		"bigMoney":       param.BigMoney,
-		"subMoney":       param.SubMoney,
-		"supplyMoney":    param.SupplyMoney,
-		"bigPayMoney":    param.BigPayMoney,
-		"subPayMoney":    param.SubPayMoney,
-		"supplyPayMoney": param.SupplyPayMoney,
-		"createType":     param.CreateType,
-		"comboId":        param.ComboId,
-		"serversId":      param.ServersId,
-		"serversName":    param.ServersName,
-		"isAll":          isAll,
-		"supplys":        param.ServerArr,
-		"remark":         param.Remark,
-		"contractStatus": contractStatus,
-	}
-	filter, _ := json.Marshal(filter_map)
+	filterMap := ParamToFilter(param, enddate, isAll, contractStatus)
+	filter, _ := json.Marshal(filterMap)
 	serverMap := GetServerPid()
 	agreementTime := time.Unix(param.AgreementTime, 0)
 	if param.BigPayMoney > -1 {
@@ -4825,6 +4657,7 @@ func SupplyBigOrder(subStatus, pay_sub_num, free_sub_num, dateType int, now, sta
 				"contract_archive_status": qutil.If(param.AgreementStatus == 0, nil, param.ContractArchiveStatus),
 				"contract_archive_time":   qutil.If(param.ContractArchiveTime == "", nil, param.ContractArchiveTime),
 				"contract_archive_num":    qutil.If(param.AgreementStatus == 0, nil, param.ContractArchiveNum),
+				"contract_nature":         qutil.IntAll(param.Contract_nature),
 			})
 			// 我的订单-创建订单不开通权限 不更新mysql表  全部订单-创建订单保持原有开通权限逻辑
 			if !param.Open {
@@ -5041,32 +4874,8 @@ func ExtendBigOrder(subStatus, pay_sub_num, free_sub_num int, now, startdate, en
 		returnStatus = 1
 		isAll = 1
 	}
-	filter_map := map[string]interface{}{
-		"source":         "qmx",
-		"cycle":          param.PayCycle,
-		"cycleType":      param.CycleType,
-		"level":          param.Level,
-		"pay_sub_num":    param.PaySub,
-		"free_sub_num":   param.FreeSub,
-		"transferV":      param.PayV,
-		"transferVTime":  qutil.NowFormat(qutil.Date_Full_Layout),
-		"effective_date": enddate.Format("2006/01/02"),
-		"bigMoney":       param.BigMoney,
-		"subMoney":       param.SubMoney,
-		"supplyMoney":    param.SupplyMoney,
-		"bigPayMoney":    param.BigPayMoney,
-		"subPayMoney":    param.SubPayMoney,
-		"supplyPayMoney": param.SupplyPayMoney,
-		"createType":     param.CreateType,
-		"comboId":        param.ComboId,
-		"serversId":      param.ServersId,
-		"serversName":    param.ServersName,
-		"isAll":          isAll,
-		"supplys":        param.ServerArr,
-		"remark":         param.Remark,
-		"contractStatus": contractStatus,
-	}
-	filter, _ := json.Marshal(filter_map)
+	filterMap := ParamToFilter(param, enddate, isAll, contractStatus)
+	filter, _ := json.Marshal(filterMap)
 	serverMap := GetServerPid()
 	agreementTime := time.Unix(param.AgreementTime, 0)
 	if param.BigPayMoney > -1 {
@@ -5138,6 +4947,7 @@ func ExtendBigOrder(subStatus, pay_sub_num, free_sub_num int, now, startdate, en
 				"contract_archive_status": qutil.If(param.AgreementStatus == 0, nil, param.ContractArchiveStatus),
 				"contract_archive_time":   qutil.If(param.ContractArchiveTime == "", nil, param.ContractArchiveTime),
 				"contract_archive_num":    qutil.If(param.AgreementStatus == 0, nil, param.ContractArchiveNum),
+				"contract_nature":         qutil.IntAll(param.Contract_nature),
 			})
 			// 我的订单不开通权限
 			if !param.Open {
@@ -5341,6 +5151,35 @@ func ExtendBigOrder(subStatus, pay_sub_num, free_sub_num int, now, startdate, en
 	return nil
 }
 
+func ParamToFilter(param *Params, enddate time.Time, isAll, contractStatus int) map[string]interface{} {
+	filterMap := map[string]interface{}{
+		"source":         "qmx",
+		"cycle":          param.PayCycle,
+		"cycleType":      param.CycleType,
+		"level":          param.Level,
+		"pay_sub_num":    param.PaySub,
+		"free_sub_num":   param.FreeSub,
+		"transferV":      param.PayV,
+		"transferVTime":  qutil.NowFormat(qutil.Date_Full_Layout),
+		"effective_date": enddate.Format("2006/01/02"),
+		"bigMoney":       param.BigMoney,
+		"subMoney":       param.SubMoney,
+		"supplyMoney":    param.SupplyMoney,
+		"bigPayMoney":    param.BigPayMoney,
+		"subPayMoney":    param.SubPayMoney,
+		"supplyPayMoney": param.SupplyPayMoney,
+		"createType":     param.CreateType,
+		"comboId":        param.ComboId,
+		"serversId":      param.ServersId,
+		"serversName":    param.ServersName,
+		"isAll":          isAll,
+		"supplys":        param.ServerArr,
+		"remark":         param.Remark,
+		"contractStatus": contractStatus,
+	}
+	return filterMap
+}
+
 func GetDATE(m, t int, endtime int64) (_endtime time.Time) {
 	endFormat := qutil.FormatDateByInt64(&endtime, qutil.Date_Short_Layout)
 	//t 1-天  0-月

src/order/orderService.go

@@ -298,31 +298,7 @@ func MyUpdateOrder(oldFilter string, subStatus, dateType int, now, startdate, en
 		return_status = 1
 		isAll = 1
 	}
-	filter_map := map[string]interface{}{
-		"source":         "qmx",
-		"cycle":          param.PayCycle,
-		"cycleType":      param.CycleType,
-		"level":          param.Level,
-		"pay_sub_num":    param.PaySub,
-		"free_sub_num":   param.FreeSub,
-		"transferV":      param.PayV,
-		"transferVTime":  qutil.NowFormat(qutil.Date_Full_Layout),
-		"effective_date": enddate.Format("2006/01/02"),
-		"bigMoney":       param.BigMoney,
-		"subMoney":       param.SubMoney,
-		"supplyMoney":    param.SupplyMoney,
-		"bigPayMoney":    param.BigPayMoney,
-		"subPayMoney":    param.SubPayMoney,
-		"supplyPayMoney": param.SupplyPayMoney,
-		"createType":     param.CreateType,
-		"comboId":        param.ComboId,
-		"serversId":      param.ServersId,
-		"serversName":    param.ServersName,
-		"isAll":          isAll,
-		"supplys":        param.ServerArr,
-		"remark":         param.Remark,
-		"contractStatus": contractStatus,
-	}
+	filter_map := ParamToFilter(param, enddate, isAll, contractStatus)
 	// 如果本来就包含人工审核字段就在filter里面赋值人工审核字段
 	if strings.Contains(oldFilter, "人工审核") {
 		filter_map["audit_type"] = "人工审核"

src/order/otherOrderController.go

@@ -102,6 +102,7 @@ type CreateOtherOrderParams struct {
 	Contract_userA_contacts_address string `form:"e_contract_userA_contacts_address"` // 协议甲方联系地址
 	Contract_userB_contacts_name    string `form:"e_contract_userB_contacts_name"`    // 协议乙方联系人
 	Contract_remark                 string `form:"e_contract_remark"`                 // 协议备注
+	Contract_nature                 int    `form:"contract_nature"`                   //合同性质   1新增合同  2 续签合同
 }
 
 type UpdateReturnParams struct {

src/order/otherOrderService.go

@@ -176,6 +176,7 @@ func createOtherOrder(param *CreateOtherOrderParams, code string) bool {
 			"contract_file_url":       param.ContractFileUrl,
 			"contract_archive_status": qutil.If(param.ContractStatus == 0, nil, param.ContractArchiveStatus),
 			"contract_archive_num":    qutil.If(param.ContractStatus == 0, nil, param.ContractArchiveNum),
+			"contract_nature":         param.Contract_nature,
 		}
 		if param.ContractArchiveTime != "" {
 			contractData["contract_archive_time"] = param.ContractArchiveTime
@@ -298,6 +299,7 @@ func createEntnicheOrder(param *CreateOtherOrderParams, code string) bool {
 			"contract_file_url":       param.ContractFileUrl,
 			"contract_archive_status": qutil.If(param.ContractStatus == 0, nil, param.ContractArchiveStatus),
 			"contract_archive_num":    qutil.If(param.ContractStatus == 0, nil, param.ContractArchiveNum),
+			"contract_nature":         param.Contract_nature,
 		}
 		if param.ContractArchiveTime != "" {
 			contractData["contract_archive_time"] = param.ContractArchiveTime
@@ -885,6 +887,7 @@ func createVipOrder(param *CreateOtherOrderParams, code string) (bool, string) {
 			"contract_file_url":       param.ContractFileUrl,
 			"contract_archive_status": qutil.If(param.ContractStatus == 0, nil, param.ContractArchiveStatus),
 			"contract_archive_num":    qutil.If(param.ContractStatus == 0, nil, param.ContractArchiveNum),
+			"contract_nature":         param.Contract_nature,
 		}
 		if param.ContractArchiveTime != "" {
 			contractData["contract_archive_time"] = param.ContractArchiveTime
@@ -1837,24 +1840,10 @@ func SupplementaryOrder(res *map[string]interface{}) map[string]interface{} {
 	} else if applybill_status == 0 {
 		(*res)["applybill_status"] = "未申请"
 	}
-	// 合同
-	contractRes := util.JysqlDB.FindOne("contract", map[string]interface{}{"order_code": (*res)["order_code"]}, "", "")
-
 	result := map[string]interface{}{}
 	delete(*res, "filter")
 	//delete(*res, "order_money")
 	//合同金额
-	if contractRes != nil && len(*contractRes) != 0 {
-		if (*contractRes)["contract_file_url"] != nil && len((*contractRes)["contract_file_url"].(string)) > 0 {
-			index_ := strings.LastIndex((*contractRes)["contract_file_url"].(string), "/")
-			if index_ != -1 {
-				(*contractRes)["contract_file_name"] = (*contractRes)["contract_file_url"].(string)[index_+1:]
-			}
-		}
-		result["contractRes"] = *contractRes
-	} else {
-		result["contractRes"] = map[string]interface{}{}
-	}
 	if returnRes != nil && len(*returnRes) != 0 {
 		for _, d := range *returnRes {
 			if d["return_voucher_url"] != nil && len(d["return_voucher_url"].(string)) > 0 {
@@ -1868,13 +1857,7 @@ func SupplementaryOrder(res *map[string]interface{}) map[string]interface{} {
 	} else {
 		result["returnRes"] = []map[string]interface{}{}
 	}
-	//退款信息
-	refundRes := util.JysqlDB.Find("refund_record", map[string]interface{}{"order_code": (*res)["order_code"]}, "", "", 0, 0)
-	if refundRes != nil && len(*refundRes) > 0 {
-		result["refundRes"] = *refundRes
-	} else {
-		result["refundRes"] = []map[string]interface{}{}
-	}
+
 	result["res"] = *res
 	result["filterData"] = filterMap
 	result["returnInfo"] = returnInfo