|
@@ -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 创建订单审核列表
|