Browse Source

更新

master
huangjiajun 4 months ago
parent
commit
aa8dd1f25a
2 changed files with 5 additions and 10 deletions
  1. +3
    -1
      app/db/db_life_order.go
  2. +2
    -9
      app/svc/platform/svc_life_order_list.go

+ 3
- 1
app/db/db_life_order.go View File

@@ -105,7 +105,9 @@ func GetLifeOrderListTotal(args map[string]string) ([]model.LifeOrder, int64) {
if args["status"] != "" { if args["status"] != "" {
sess = sess.And("status=?", args["status"]) sess = sess.And("status=?", args["status"])
} }

if args["source"] != "" {
sess = sess.And("pvd=?", args["source"])
}
sort := "create_time desc,id desc" sort := "create_time desc,id desc"
if args["sort"] != "" { if args["sort"] != "" {
sort = args["sort"] sort = args["sort"]


+ 2
- 9
app/svc/platform/svc_life_order_list.go View File

@@ -2,6 +2,7 @@ package platform


import ( import (
"applet/app/db" "applet/app/db"
"applet/app/md"
"applet/app/utils" "applet/app/utils"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"time" "time"
@@ -12,15 +13,7 @@ func LifeOrderList(c *gin.Context, args map[string]string) ([]map[string]string,
args["uid"] = utils.AnyToString(masterId) args["uid"] = utils.AnyToString(masterId)
list, total := db.GetLifeOrderListTotal(args) list, total := db.GetLifeOrderListTotal(args)
var data = make([]map[string]string, 0) var data = make([]map[string]string, 0)
platformMap := map[string]string{
"tikTok_life": "抖音本地生活",
"csjp": "穿山甲抖音",
"csjp_live": "穿山甲抖音直播商品",
"kuaishou": "快手",
"kuaishou_live": "快手直播商品",
"meituan": "美团",
"own_ele": "饿了么",
}
platformMap := md.SettlePvd
if len(list) > 0 { if len(list) > 0 {
for _, v := range list { for _, v := range list {
settleStatus := "未结算" settleStatus := "未结算"


Loading…
Cancel
Save