P348

src/order/helpUserOrderController.go

@@ -57,6 +57,7 @@ func CreateUserAccount(context *admin.Context) (interface{}, error) {
 		UserId     string `form:"userId"`
 		CycleUnit  int    `form:"cycleUnit"` //1:天、2:月
 		CycleCount int    `form:"cycleCount"`
+		SaleDep    string `form:"saleDep"`
 	})
 	err := context.Form(param)
 	if err != nil {
@@ -111,6 +112,7 @@ func CreateUserAccount(context *admin.Context) (interface{}, error) {
 	token = GetSellerToken(userId, context.User.Username, context.User.Id, map[string]interface{}{
 		"tt": param.CycleUnit,
 		"tn": param.CycleCount,
+		"ts": param.SaleDep,
 	})
 
 	return map[string]interface{}{

src/order/optimizeOrder.go

@@ -22,6 +22,8 @@ func AddUpdateRecord(context *admin.Context) (interface{}, error) {
 		Commission       int    `form:"commission"`
 		ProceduresMoney  int    `form:"proceduresMoney"`
 		CorrectionReason string `form:"correctionReason"`
+		RedType          string `form:"redType"`
+		SigningSubject   string `form:"signingSubject"`
 	})
 	err := context.Form(param)
 	if err != nil {
@@ -31,69 +33,83 @@ func AddUpdateRecord(context *admin.Context) (interface{}, error) {
 	if orderData == nil {
 		return nil, errors.New("未找到订单")
 	}
-	filterMap := map[string]interface{}{}
-	if err := json.Unmarshal([]byte(qutil.ObjToString((*orderData)["filter"])), &filterMap); err != nil {
-		return nil, errors.New("修正失败")
-	}
 	updateData := map[string]interface{}{}
 	insertData := map[string]interface{}{
 		"orderCode":        param.OrderCode,
 		"correctionReason": param.CorrectionReason,
 		"createTime":       qutil.NowFormat(qutil.Date_Full_Layout),
 		"createPerson":     context.User.Username,
+		"redType":          param.RedType,
 	}
-	if param.PayMoney != 0 {
-		if qutil.ObjToString((*orderData)["product_type"]) == "大会员" {
-			filterMap["bigPayMoneyUpdate"] = param.PayMoney
-			updateData["pay_money"] = param.PayMoney + param.BigSubMoney + param.SupplyMoney
-			insertData["payMoney"] = param.PayMoney - qutil.IntAll(filterMap["bigPayMoney"])
-			filterMap["bigPayMoney"] = param.PayMoney
+	if strings.Contains(param.RedType, "签约主体") {
+		if param.SigningSubject == "北京剑鱼信息技术有限公司" {
+			updateData["signing_subject"] = "h01"
+			insertData["signingSubject"] = "北京拓普丰联信息科技股份有限公司"
 		} else {
-			filterMap["payMoneyUpdate"] = param.PayMoney
-			updateData["pay_money"] = param.PayMoney
-			insertData["payMoney"] = param.PayMoney - qutil.IntAll((*orderData)["pay_money"])
+			updateData["signing_subject"] = "h02"
+			insertData["signingSubject"] = "北京剑鱼信息技术有限公司"
 		}
 	}
-	if param.BigSubMoney != 0 {
-		filterMap["subPayMoneyUpdate"] = param.BigSubMoney
-		insertData["bigSubMoney"] = param.BigSubMoney - qutil.IntAll(filterMap["subPayMoney"])
-		filterMap["subPayMoney"] = param.BigSubMoney
-	}
-	if param.SupplyMoney != 0 {
-		filterMap["supplyPayMoneyUpdate"] = param.SupplyMoney
-		insertData["supplyMoney"] = param.SupplyMoney - qutil.IntAll(filterMap["supplyPayMoney"])
-		filterMap["supplyPayMoney"] = param.SupplyMoney
-	}
-	if param.OrderMoney != 0 {
-		updateData["order_money"] = param.OrderMoney
-		insertData["orderMoney"] = param.OrderMoney - qutil.IntAll((*orderData)["order_money"])
-		filterMap["orderMoneyUpdate"] = param.OrderMoney
-	}
-	if param.Commission != 0 {
-		updateData["commission"] = param.Commission
-		insertData["commission"] = param.Commission - qutil.IntAll((*orderData)["commission"])
-		filterMap["commissionUpdate"] = param.Commission
-	}
-	if param.ProceduresMoney != 0 {
-		updateData["procedures_money"] = param.ProceduresMoney
-		insertData["proceduresMoney"] = param.ProceduresMoney - qutil.IntAll((*orderData)["procedures_money"])
-		filterMap["proceduresMoneyUpdate"] = param.ProceduresMoney - qutil.IntAll((*orderData)["procedures_money"])
-	}
-	filterByte, _ := json.Marshal(filterMap)
-	updateData["filter"] = string(filterByte)
-	returnData := util.JysqlDB.SelectBySql(`select IFNULL(sum(return_money),0) as return_money from return_money_record where order_code=? and state=1`, param.OrderCode)
-	refundData := util.JysqlDB.SelectBySql(`select IFNULL(sum(refund_money),0) as refund_money from refund_record where order_code=?`, param.OrderCode)
-	return_money := qutil.IntAll((*returnData)[0]["return_money"])
-	refund_money := qutil.IntAll((*refundData)[0]["refund_money"])
-	if param.PayMoney+param.BigSubMoney+param.SupplyMoney-param.Commission-param.ProceduresMoney == return_money-refund_money {
-		updateData["return_status"] = 1
-	} else if param.PayMoney+param.BigSubMoney+param.SupplyMoney-param.Commission-param.ProceduresMoney > return_money-refund_money && return_money-refund_money > 0 {
-		updateData["return_status"] = 2
-	}
-	if return_money == refund_money && return_money > 0 {
-		updateData["refund_status"] = 1
-	} else if return_money > refund_money && refund_money > 0 {
-		updateData["refund_status"] = 2
+	if strings.Contains(param.RedType, "金额") {
+		filterMap := map[string]interface{}{}
+		if err := json.Unmarshal([]byte(qutil.ObjToString((*orderData)["filter"])), &filterMap); err != nil {
+			return nil, errors.New("修正失败")
+		}
+		if param.PayMoney != 0 {
+			if qutil.ObjToString((*orderData)["product_type"]) == "大会员" {
+				filterMap["bigPayMoneyUpdate"] = param.PayMoney
+				updateData["pay_money"] = param.PayMoney + param.BigSubMoney + param.SupplyMoney
+				insertData["payMoney"] = param.PayMoney - qutil.IntAll(filterMap["bigPayMoney"])
+				filterMap["bigPayMoney"] = param.PayMoney
+				util.JysqlDB.Update("contract", map[string]interface{}{"order_code": param.OrderCode}, map[string]interface{}{"contract_money": param.PayMoney + param.BigSubMoney + param.SupplyMoney})
+			} else {
+				filterMap["payMoneyUpdate"] = param.PayMoney
+				updateData["pay_money"] = param.PayMoney
+				insertData["payMoney"] = param.PayMoney - qutil.IntAll((*orderData)["pay_money"])
+				util.JysqlDB.Update("contract", map[string]interface{}{"order_code": param.OrderCode}, map[string]interface{}{"contract_money": param.PayMoney})
+			}
+		}
+		if param.BigSubMoney != 0 {
+			filterMap["subPayMoneyUpdate"] = param.BigSubMoney
+			insertData["bigSubMoney"] = param.BigSubMoney - qutil.IntAll(filterMap["subPayMoney"])
+			filterMap["subPayMoney"] = param.BigSubMoney
+		}
+		if param.SupplyMoney != 0 {
+			filterMap["supplyPayMoneyUpdate"] = param.SupplyMoney
+			insertData["supplyMoney"] = param.SupplyMoney - qutil.IntAll(filterMap["supplyPayMoney"])
+			filterMap["supplyPayMoney"] = param.SupplyMoney
+		}
+		if param.OrderMoney != 0 {
+			updateData["order_money"] = param.OrderMoney
+			insertData["orderMoney"] = param.OrderMoney - qutil.IntAll((*orderData)["order_money"])
+			filterMap["orderMoneyUpdate"] = param.OrderMoney
+		}
+		if param.Commission != 0 {
+			updateData["commission"] = param.Commission
+			insertData["commission"] = param.Commission - qutil.IntAll((*orderData)["commission"])
+			filterMap["commissionUpdate"] = param.Commission
+		}
+		if param.ProceduresMoney != 0 {
+			updateData["procedures_money"] = param.ProceduresMoney
+			insertData["proceduresMoney"] = param.ProceduresMoney - qutil.IntAll((*orderData)["procedures_money"])
+			filterMap["proceduresMoneyUpdate"] = param.ProceduresMoney - qutil.IntAll((*orderData)["procedures_money"])
+		}
+		filterByte, _ := json.Marshal(filterMap)
+		updateData["filter"] = string(filterByte)
+		returnData := util.JysqlDB.SelectBySql(`select IFNULL(sum(return_money),0) as return_money from return_money_record where order_code=? and state=1`, param.OrderCode)
+		refundData := util.JysqlDB.SelectBySql(`select IFNULL(sum(refund_money),0) as refund_money from refund_record where order_code=?`, param.OrderCode)
+		return_money := qutil.IntAll((*returnData)[0]["return_money"])
+		refund_money := qutil.IntAll((*refundData)[0]["refund_money"])
+		if param.PayMoney+param.BigSubMoney+param.SupplyMoney-param.Commission-param.ProceduresMoney == return_money-refund_money {
+			updateData["return_status"] = 1
+		} else if param.PayMoney+param.BigSubMoney+param.SupplyMoney-param.Commission-param.ProceduresMoney > return_money-refund_money && return_money-refund_money > 0 {
+			updateData["return_status"] = 2
+		}
+		if return_money == refund_money && return_money > 0 {
+			updateData["refund_status"] = 1
+		} else if return_money > refund_money && refund_money > 0 {
+			updateData["refund_status"] = 2
+		}
 	}
 	util.JysqlDB.Update("dataexport_order", map[string]interface{}{"order_code": param.OrderCode}, updateData)
 	util.JysqlDB.Insert("moneyCorrection", insertData)

src/order/orderManageController.go

@@ -79,6 +79,8 @@ type Params struct {
 	BuySubject            string                   `form:"buySubject"` //购买主体  1 个人， 2公司
 	BuyCount              int                      `form:"buyCount"`   //大会员、超级订阅购买数量
 	AreaCount             int                      `form:"areaCount"`  // 省份数量
+	PayType               string                   `form:"payType"`
+	SaleDep               string                   `form:"saleDep"`
 }
 
 // 订单列表
@@ -494,6 +496,25 @@ func OrderDetails(context *admin.Context) (interface{}, error) {
 		}
 		(*res)["productType"] = (*res)["product_type"]
 		(*res)["orderStatus"] = (*res)["order_status"]
+		saleCode, payType := qutil.ObjToString((*res)["saleDep"]), qutil.ObjToString((*res)["pay_way"])
+		if saleCode != "" {
+			saleCodeD := util.JysqlDB.FindOne("dict_dep", map[string]interface{}{"code": saleCode}, "", "")
+			if saleCodeD != nil && len(*saleCodeD) > 0 {
+				showField := qutil.ObjToString((*saleCodeD)["showField"])
+				saleDepShow := qutil.ObjToString((*saleCodeD)["show"])
+				(*res)["saleDep"] = strings.Split(showField, "/")
+				(*res)["saleDepShow"] = saleDepShow
+			}
+		}
+		if payType != "" {
+			if strings.Contains(payType, "wx") {
+				(*res)["payType"] = "微信"
+			} else if strings.Contains(payType, "ali") {
+				(*res)["payType"] = "支付宝"
+			} else {
+				(*res)["payType"] = "对公转账"
+			}
+		}
 		moneyCorrectionData := util.JysqlDB.Find("moneyCorrection", map[string]interface{}{"orderCode": orderCode}, "", "createTime desc", -1, -1)
 		if moneyCorrectionData != nil {
 			(*res)["moneyCorrectionData"] = moneyCorrectionData
@@ -1832,6 +1853,8 @@ func CreateSubOrder(context *admin.Context) (interface{}, error) {
 		Save                  int    `form:"save"`       // 1-暂存 2-提交
 		BuySubject            string `form:"buySubject"` //购买主体  1 个人， 2公司
 		BuyCount              int    `form:"buyCount"`   //大会员、超级订阅购买数量
+		PayType               string `form:"payType"`
+		SaleDep               string `form:"saleDep"`
 	})
 	err := context.Form(param)
 	if err != nil {
@@ -1962,7 +1985,7 @@ func CreateSubOrder(context *admin.Context) (interface{}, error) {
 			"create_time":        param.CreateTime, // 当前时间
 			"prepay_time":        qutil.NowFormat(qutil.Date_Full_Layout),
 			"user_id":            userId,
-			"pay_way":            "transferAccounts",
+			"pay_way":            param.PayType,
 			"original_price":     param.OrderMoney,
 			"pay_money":          param.PayMoney,
 			"vip_starttime":      qutil.FormatDate(&startdate, qutil.Date_Full_Layout),
@@ -1983,6 +2006,7 @@ func CreateSubOrder(context *admin.Context) (interface{}, error) {
 			"paybackCompany":     param.PaybackCompany,
 			"create_person":      param.CreatePerson,
 			"audit_status":       param.AuditStatus,
+			"saleDep":            param.SaleDep,
 		}
 
 		order_id := util.JyOrder("/CreateOrder", paramOrder)
@@ -2094,6 +2118,8 @@ func UpdateSubOrder(context *admin.Context) (interface{}, error) {
 		CreatePerson          string // 创建人
 		BuySubject            string `form:"buySubject"` //购买主体  1 个人， 2公司
 		BuyCount              int    `form:"buyCount"`   //大会员、超级订阅购买数量
+		PayType               string `form:"payType"`
+		SaleDep               string `form:"saleDep"`
 	})
 	err := context.Form(param)
 	if err != nil {
@@ -2244,6 +2270,8 @@ func UpdateSubOrder(context *admin.Context) (interface{}, error) {
 			"signing_subject":      param.PaybackCompany,
 			"last_update_person":   param.CreatePerson,
 			"last_update_time":     qutil.NowFormat(qutil.Date_Full_Layout),
+			"pay_way":              param.PayType,
+			"saleDep":              param.SaleDep,
 		}
 
 		ok_1 := util.JysqlDB.Update("dataexport_order", map[string]interface{}{
@@ -2322,6 +2350,8 @@ func CreateSupplyOrder(context *admin.Context) (interface{}, error) {
 		Save                  int                      `form:"save"`       // 1-暂存 2-提交
 		BuySubject            string                   `form:"buySubject"` //购买主体  1 个人， 2公司
 		BuyCount              int                      `form:"buyCount"`   //大会员、超级订阅购买数量
+		PayType               string                   `form:"payType"`
+		SaleDep               string                   `form:"saleDep"`
 	})
 	err := context.Form(param)
 	if err != nil {
@@ -2433,7 +2463,7 @@ func CreateSupplyOrder(context *admin.Context) (interface{}, error) {
 			"create_time":        param.CreateTime, // 当前时间
 			"prepay_time":        qutil.NowFormat(qutil.Date_Full_Layout),
 			"user_id":            userId,
-			"pay_way":            "transferAccounts",
+			"pay_way":            param.PayType,
 			"original_price":     param.OrderMoney,
 			"pay_money":          param.PayMoney,
 			"vip_starttime":      qutil.FormatDate(&startdate, qutil.Date_Full_Layout),
@@ -2454,6 +2484,7 @@ func CreateSupplyOrder(context *admin.Context) (interface{}, error) {
 			"paybackCompany":     param.PaybackCompany,
 			"create_person":      param.CreatePerson,
 			"audit_status":       param.AuditStatus,
+			"saleDep":            param.SaleDep,
 		}
 
 		order_id := util.JyOrder("/CreateOrder", paramOrder)
@@ -2621,6 +2652,8 @@ func UpdateSupplyOrder(context *admin.Context) (interface{}, error) {
 		CreatePerson          string                   // 创建人
 		BuySubject            string                   `form:"buySubject"` //购买主体  1 个人， 2公司
 		BuyCount              int                      `form:"buyCount"`   //大会员、超级订阅购买数量
+		PayType               string                   `form:"payType"`
+		SaleDep               string                   `form:"saleDep"`
 	})
 	err := context.Form(param)
 	if err != nil {
@@ -2761,6 +2794,8 @@ func UpdateSupplyOrder(context *admin.Context) (interface{}, error) {
 			"signing_subject":      param.PaybackCompany,
 			"last_update_person":   param.CreatePerson,
 			"last_update_time":     qutil.NowFormat(qutil.Date_Full_Layout),
+			"pay_way":              param.PayType,
+			"saleDep":              param.SaleDep,
 		}
 
 		ok_1 := util.JysqlDB.Update("dataexport_order", map[string]interface{}{
@@ -3556,7 +3591,6 @@ func GetDictItem(context *admin.Context) (interface{}, error) {
 
 func GetSalesChannelItem(context *admin.Context) (interface{}, error) {
 	item := &[]map[string]interface{}{}
-
 	item = util.JysqlDB.Find("dict_item", map[string]interface{}{"parent_name": "销售渠道", "state": 1}, "item_code,item_name", "", -1, -1)
 	var res []map[string]interface{}
 	if item != nil && len(*item) > 0 {
@@ -3566,13 +3600,51 @@ func GetSalesChannelItem(context *admin.Context) (interface{}, error) {
 			val["children"] = item
 			res = append(res, val)
 		}
-		return map[string]interface{}{
-			"code": 1,
-			"msg":  "查询成功",
-			"data": res,
-		}, nil
 	}
-	return nil, errors.New("没有查询到数据")
+	dep := []map[string]interface{}{}
+	data := util.JysqlDB.SelectBySql(`select * from dict_dep`)
+	if data != nil && len(*data) > 0 {
+		for _, v := range *data {
+			code := qutil.ObjToString(v["code"])
+			name := qutil.ObjToString(v["name"])
+			level := qutil.ObjToString(v["level"])
+			if level == "1" {
+				depMap := map[string]interface{}{"value": code, "label": name}
+				datas := util.JysqlDB.SelectBySql(`select * from dict_dep where parentCode = "` + code + `"`)
+				if datas != nil && len(*datas) > 0 {
+					children := []map[string]interface{}{}
+					for _, vv := range *datas {
+						codes := qutil.ObjToString(vv["code"])
+						names := qutil.ObjToString(vv["name"])
+						childrenMap := map[string]interface{}{"value": codes, "label": names}
+						datass := util.JysqlDB.SelectBySql(`select * from dict_dep where parentCode = "` + codes + `"`)
+						if datass != nil && len(*datass) > 0 {
+							childrens := []map[string]interface{}{}
+							for _, vvv := range *datass {
+								codess := qutil.ObjToString(vvv["code"])
+								namess := qutil.ObjToString(vvv["name"])
+								childrens = append(childrens, map[string]interface{}{"value": codess, "label": namess})
+							}
+							if len(childrens) > 0 {
+								childrenMap["children"] = childrens
+							}
+						}
+						children = append(children, childrenMap)
+					}
+					if len(children) > 0 {
+						depMap["children"] = children
+					}
+				}
+				dep = append(dep, depMap)
+			}
+		}
+	}
+	return map[string]interface{}{
+		"code": 1,
+		"msg":  "查询成功",
+		"data": res,
+		"dep":  dep,
+	}, nil
 }
 
 // BackOrderAuditList 创建订单审核列表

src/order/orderManageService.go

@@ -3791,7 +3791,7 @@ func NewBigOrder(subStatus, dateType int, startdate, enddate time.Time, userId,
 		"create_person":  param.CreatePerson, // 创建人
 		"prepay_time":    qutil.NowFormat(qutil.Date_Full_Layout),
 		"user_id":        userId,
-		"pay_way":        "transferAccounts",
+		"pay_way":        param.PayType,
 		"original_price": param.BigMoney + param.SubMoney + param.SupplyMoney,
 		"pay_money":      param.BigPayMoney + param.SubPayMoney + param.SupplyPayMoney,
 		//"pay_time":           qutil.NowFormat(qutil.Date_Full_Layout),
@@ -3812,6 +3812,7 @@ func NewBigOrder(subStatus, dateType int, startdate, enddate time.Time, userId,
 		"orderChannel":       param.OrderChannel,
 		"paybackCompany":     param.PaybackCompany,
 		"audit_status":       param.AuditStatus,
+		"saleDep":            param.SaleDep,
 	}
 	if param.BuySubject == "2" {
 		paramOrder["buySubject"] = 2
@@ -4700,7 +4701,7 @@ func SupplyBigOrder(subStatus, pay_sub_num, free_sub_num, dateType int, now, sta
 			"create_time":        param.CreateTime, // 当前时间
 			"prepay_time":        qutil.NowFormat(qutil.Date_Full_Layout),
 			"user_id":            userId,
-			"pay_way":            "transferAccounts",
+			"pay_way":            param.PayType,
 			"original_price":     param.BigMoney + param.SubMoney + param.SupplyMoney,
 			"pay_money":          param.BigPayMoney + param.SubPayMoney + param.SupplyPayMoney,
 			"vip_starttime":      qutil.FormatDate(&startdate, qutil.Date_Full_Layout),
@@ -4721,6 +4722,7 @@ func SupplyBigOrder(subStatus, pay_sub_num, free_sub_num, dateType int, now, sta
 			"orderChannel":       param.OrderChannel,
 			"paybackCompany":     param.PaybackCompany,
 			"audit_status":       param.AuditStatus,
+			"saleDep":            param.SaleDep,
 		}
 		if param.BuySubject == "2" {
 			paramOrder["buySubject"] = 2
@@ -5010,7 +5012,7 @@ func ExtendBigOrder(subStatus, pay_sub_num, free_sub_num int, now, startdate, en
 			"create_time":    param.CreateTime, // 当前时间
 			"prepay_time":    qutil.NowFormat(qutil.Date_Full_Layout),
 			"user_id":        userId,
-			"pay_way":        "transferAccounts",
+			"pay_way":        param.PayType,
 			"original_price": param.BigMoney + param.SubMoney + param.SupplyMoney,
 			"pay_money":      param.BigPayMoney + param.SubPayMoney + param.SupplyPayMoney,
 			//"pay_time":           qutil.NowFormat(qutil.Date_Full_Layout),
@@ -5032,6 +5034,7 @@ func ExtendBigOrder(subStatus, pay_sub_num, free_sub_num int, now, startdate, en
 			"paybackCompany":     param.PaybackCompany,
 			"create_person":      param.CreatePerson,
 			"audit_status":       param.AuditStatus,
+			"saleDep":            param.SaleDep,
 		}
 		if param.BuySubject == "2" {
 			paramOrder["buySubject"] = 2

src/order/otherOrderController.go

@@ -91,6 +91,8 @@ type CreateOtherOrderParams struct {
 	Save                  int    `form:"save"`       // 1-暂存 2-提交
 	BuySubject            string `form:"buySubject"` //购买主体  1 个人， 2公司
 	BuyCount              int    `form:"buyCount"`   //大会员、超级订阅购买数量
+	PayType               string `form:"payType"`
+	SaleDep               string `form:"saleDep"`
 }
 type UpdateReturnParams struct {
 	Id                  int       `form:"id"`                  //订单id

src/order/otherOrderService.go

@@ -123,10 +123,11 @@ func createOtherOrder(param *CreateOtherOrderParams, code string) bool {
 			"procedures_money":     param.ProceduresMoney,                               // 手续费 2021-12-29 订单优化需求新增字段
 			"distribution_channel": param.SalesChannel,
 			"order_channel":        param.OrderChannel,
-			"pay_way":              param.Pay_way,
 			"out_trade_no":         param.OutTradeNo,
 			"signing_subject":      param.PaybackCompany,
 			"audit_status":         param.AuditStatus,
+			"pay_way":              param.PayType,
+			"saleDep":              param.SaleDep,
 		}
 		if param.BuySubject == "2" {
 			insertData["buy_subject"] = 2
@@ -281,6 +282,8 @@ func createEntnicheOrder(param *CreateOtherOrderParams, code string) bool {
 			"orderChannel":       param.OrderChannel,
 			"paybackCompany":     param.PaybackCompany,
 			"audit_status":       param.AuditStatus,
+			"pay_way":            param.PayType,
+			"saleDep":            param.SaleDep,
 		}
 		contractData := map[string]interface{}{
 			"order_code":              code,
@@ -773,20 +776,20 @@ func createVipOrder(param *CreateOtherOrderParams, code string) (bool, string) {
 			}
 		}
 	}
-	payWay := "wx_app"
-	// returnStatus := 1
-	if param.ChargeMode == 1 {
-		// returnStatus = 0
-		if param.Pay_way == "" {
-			payWay = "transferAccounts"
-		}
-	}
-	// if param.ReturnStatus == 1 {
-	// 	returnStatus = 1
+	// payWay := "wx_app"
+	// // returnStatus := 1
+	// if param.ChargeMode == 1 {
+	// 	// returnStatus = 0
+	// 	if param.Pay_way == "" {
+	// 		payWay = "transferAccounts"
+	// 	}
+	// }
+	// // if param.ReturnStatus == 1 {
+	// // 	returnStatus = 1
+	// // }
+	// if param.Badge != "" {
+	// 	payWay = ""
 	// }
-	if param.Badge != "" {
-		payWay = ""
-	}
 	var (
 		entId          int
 		err            error
@@ -827,14 +830,15 @@ func createVipOrder(param *CreateOtherOrderParams, code string) (bool, string) {
 			"company_name":         param.CompanyName,
 			"billingMode":          param.ChargeMode,                                    //计费模式 0 免费  1 收费
 			"sale_time":            qutil.If(param.SaleTime == "", nil, param.SaleTime), // 业务统计时间
-			"pay_way":              payWay,
-			"commission":           param.Commission,      // 佣金 2021-12-29 订单优化需求新增字段
-			"procedures_money":     param.ProceduresMoney, // 手续费 2021-12-29 订单优化需求新增字段
+			"commission":           param.Commission,                                    // 佣金 2021-12-29 订单优化需求新增字段
+			"procedures_money":     param.ProceduresMoney,                               // 手续费 2021-12-29 订单优化需求新增字段
 			"distribution_channel": param.SalesChannel,
 			"order_channel":        param.OrderChannel,
 			"signing_subject":      param.PaybackCompany,
 			"create_person":        param.CreatePerson,
 			"audit_status":         param.AuditStatus,
+			"pay_way":              param.PayType,
+			"saleDep":              param.SaleDep,
 		}
 		if param.Pay_time != "" {
 			insertData["pay_time"] = param.Pay_time