diff --git a/app/store/svc/svc_index.go b/app/store/svc/svc_index.go index 4aeb22d..dbeb3ea 100644 --- a/app/store/svc/svc_index.go +++ b/app/store/svc/svc_index.go @@ -23,9 +23,13 @@ func UserInfo(c *gin.Context) { role = append(role, "project") } res := map[string]interface{}{ - "role": role, - "phone": store.Phone, + "role": role, + "phone": store.Phone, + "amount": "0", } + storeId := svc.GetCampStoreId(c) + settleCount, _ := svc.MasterDb(c).Where("store_id=?", storeId).Sum(&models.CampTaskStoreUserAmount{}, "amount") + res["amount"] = utils.Float64ToStr(settleCount) e.OutSuc(c, res, nil) return } diff --git a/app/store/svc/svc_money.go b/app/store/svc/svc_money.go index 9e44ab9..26a12fd 100644 --- a/app/store/svc/svc_money.go +++ b/app/store/svc/svc_money.go @@ -61,6 +61,7 @@ func MoneyOrderCreate(c *gin.Context) { e.OutErr(c, 400, e.NewErr(400, "下单失败")) return } + c.Set("page_url", c.Request.Host+"/#/pay-state-page") var param = &md.AliPayPayParams{ Subject: "预存款充值", Amount: args["money"], diff --git a/app/store/svc/svc_pay.go b/app/store/svc/svc_pay.go index 59213f4..d74f733 100644 --- a/app/store/svc/svc_pay.go +++ b/app/store/svc/svc_pay.go @@ -9,7 +9,6 @@ import ( "applet/app/comm/utils/logx" "applet/app/store/md" "code.fnuoos.com/go_rely_warehouse/zyos_go_pay.git/pay" - "code.fnuoos.com/go_rely_warehouse/zyos_model.git/src/implement" "code.fnuoos.com/go_rely_warehouse/zyos_model.git/src/models" "encoding/json" "fmt" @@ -54,19 +53,19 @@ func CommMoneyCallback(c *gin.Context, oid string) error { return nil } data.State = 1 - _, err := svc.MasterDb(c).Where("oid=?", data.Oid).Update(&data) + _, err := sess.Where("oid=?", data.Oid).Update(&data) if err != nil { sess.Rollback() return e.NewErr(400, "修改失败") } - amountDb := implement.NewCampTaskStoreUserAmountDb(svc.MasterDb(c)) - amountData, _ := amountDb.GetCampTaskAmountByStoreId(utils.IntToStr(data.StoreId)) - if amountData == nil { - amountData = &models.CampTaskStoreUserAmount{ + var amountData models.CampTaskStoreUserAmount + sess.Where("store_id=?", data.StoreId).Get(&amountData) + if amountData.Id == 0 { + amountData = models.CampTaskStoreUserAmount{ StoreId: data.StoreId, Amount: "0", } - _, err := sess.Insert(amountData) + _, err := sess.Insert(&amountData) if err != nil { sess.Rollback() return err @@ -82,12 +81,12 @@ func CommMoneyCallback(c *gin.Context, oid string) error { Title: "预存款充值", OrdType: "buy", } - _, err = svc.MasterDb(c).InsertOne(&flow) + _, err = sess.Insert(&flow) if err != nil { sess.Rollback() return e.NewErr(400, "修改失败") } - _, err = svc.MasterDb(c).Where("id=?", amountData.Id).Update(amountData) + _, err = svc.MasterDb(c).Where("id=?", amountData.Id).Update(&amountData) if err != nil { sess.Rollback() return e.NewErr(400, "修改失败")