minghui/mh_goadmin_server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

重构日志

Browse Source
This commit is contained in:
范俊成 2023-10-14 16:19:04 +08:00
parent 811dad0218
commit 8c5d8163c0
42 changed files with 786 additions and 793 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/admin/apis/basic/supplier.go
View File

@ -32,7 +32,6 @@ type SupplierCreateRequest struct {
func SupplierCreate(c *gin.Context) {
req := new(SupplierCreateRequest)
if err := c.ShouldBindJSON(&req); err != nil {
logger.Error(err)
app.Error(c, http.StatusBadRequest, errors.New("para err"), "参数错误")
return
}
@ -52,7 +51,7 @@ func SupplierCreate(c *gin.Context) {
err := orm.Eloquent.Create(supplier).Error
if err != nil {
logger.Error("create supplier err:", err)
logger.Error("[SupplierCreate]:create supplier err", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "操作失败")
return
}
@ -70,7 +69,6 @@ type SupplierUpdateRequest struct {
func SupplierUpdate(c *gin.Context) {
req := new(SupplierUpdateRequest)
if err := c.ShouldBindJSON(&req); err != nil {
logger.Error(err)
app.Error(c, http.StatusBadRequest, errors.New("para err"), "参数错误")
return
}
@ -89,7 +87,7 @@ func SupplierUpdate(c *gin.Context) {
}
err := orm.Eloquent.Where("id", req.Id).Updates(supplier).Error
if err != nil {
logger.Error("update supplier err :", err)
logger.Error("update supplier err :", logger.Field("err", err), logger.Field("s", supplier))
app.Error(c, http.StatusInternalServerError, err, "更新失败")
return
}
@ -106,7 +104,6 @@ type SupplierListRequest struct {
func SupplierList(c *gin.Context) {
req := new(SupplierListRequest)
if err := c.ShouldBindJSON(&req); err != nil {
logger.Error(err)
app.Error(c, http.StatusBadRequest, errors.New("para err"), "参数错误")
return
}
@ -131,7 +128,7 @@ func SupplierDetail(c *gin.Context) {
var supplier models.Supplier
err := orm.Eloquent.Table("erp_supplier").Where("id=?", id).Find(&supplier).Error
if err != nil {
logger.Error("get supplier err:", err)
logger.Error("get supplier detail failed", logger.Field("err", err), logger.Field("id", id))
app.Error(c, http.StatusInternalServerError, err, "供应商不存在")
return
}
@ -148,7 +145,7 @@ func SupplierDel(c *gin.Context) {
Eloquent.Table("erp_supplier").
Delete(&models.Supplier{}, id).Error
if err != nil {
logger.Error("delete supplier failed:", err)
logger.Error("get supplier detail failed", logger.Field("err", err), logger.Field("id", id))
app.Error(c, http.StatusInternalServerError, err, "删除失败")
return
}

44
app/admin/apis/goodsmanage/game_card.go
View File

@ -32,7 +32,7 @@ func GameCardList(c *gin.Context) {
cardList, _, count, err := models.GetGameCardList(req.GameType, req.Status, req.Page, req.PageSize, req.NameKey)
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "查询失败")
return
}
@ -56,7 +56,7 @@ func GameCardGoodsList(c *gin.Context) {
resp, err := req.GetGameCardGoodsList()
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "查询失败")
return
}
@ -109,13 +109,13 @@ func GameCardAdd(c *gin.Context) {
}
err := card.Add()
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
app.Error(c, http.StatusBadRequest, err, "参数错误")
return
}
err = models.GameCardAddType(req.GameTypeId, int(card.ID))
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
app.Error(c, http.StatusBadRequest, err, "参数错误")
return
}
@ -155,7 +155,7 @@ func GameCardModify(c *gin.Context) {
err := card.Modify()
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
app.Error(c, http.StatusBadRequest, err, "参数错误")
return
}
@ -175,7 +175,7 @@ func GameCardModifyType(c *gin.Context) {
err := models.GameType{GameCardId: uint64(req.GameCardId)}.GameCardTypeModify(req.GameTypeId)
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
app.Error(c, http.StatusBadRequest, err, "参数错误")
return
}
@ -194,7 +194,7 @@ func GameCardMDel(c *gin.Context) {
data := models.GameCard{}
err := data.MDel(req.Id)
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
app.Error(c, http.StatusBadRequest, err, "参数错误")
return
}
@ -204,7 +204,7 @@ func GameCardMDel(c *gin.Context) {
func GameCardTypeList(c *gin.Context) {
typeList, err := models.GetGameCardTypeList()
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
app.Error(c, http.StatusBadRequest, err, "参数错误")
return
}
@ -222,7 +222,7 @@ func GameCardTypeModify(c *gin.Context) {
err := cardType.Modify()
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
app.Error(c, http.StatusBadRequest, err, "参数错误")
return
}
@ -240,7 +240,7 @@ func GameCardTypeAdd(c *gin.Context) {
err := cardType.Add()
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
app.Error(c, http.StatusBadRequest, err, "参数错误")
return
}
@ -259,7 +259,7 @@ func GameCardTypeDel(c *gin.Context) {
data := &models.GameCardType{}
err := data.MDel(req.Id)
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
app.Error(c, http.StatusBadRequest, err, "参数错误")
return
}
@ -278,7 +278,7 @@ func GameTypeAdd(c *gin.Context) {
}
err := models.GameCardAddType(req.Id, req.GameCardId)
if err != nil {
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "")
return
}
@ -299,7 +299,7 @@ func GameCardTypes(c *gin.Context) {
card.ID = uint32(req.GameCardId)
cardTypes, err := card.GetGameType()
if err != nil {
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "")
return
}
@ -311,7 +311,7 @@ func GameCardTypes(c *gin.Context) {
func AliyunStsTokenGet(c *gin.Context) {
uploadInfo, err := aliyun.GenStsToken("21000505")
if err != nil {
logger.Error("err", err)
logger.Error("err", logger.Field("err", err))
return
}
@ -342,7 +342,7 @@ func BatchStandUpDown(c *gin.Context) {
}
err := models.GameCardBatchStand(req.StandType)
if err != nil {
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "")
return
}
@ -361,7 +361,7 @@ func BatchStandUp(c *gin.Context) {
}
err := models.GameCardBatchStandUp(req.GameCardId)
if err != nil {
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "")
return
}
@ -381,13 +381,13 @@ func OrderAndStockAnalysis(c *gin.Context) {
poolData, err := models.CardPoolData(req.StoreId)
if err != nil {
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "")
return
}
orderRank, err := models.GameCardOrderRank(req.StoreId)
if err != nil {
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "")
return
}
@ -415,7 +415,7 @@ func GameCardStockAnalysis(c *gin.Context) {
resp, err := models.GameCardStockList(req.Name, req.SortType, req.SortDirection, req.StoreId, req.PageNum, req.PageSize)
if err != nil {
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "")
return
}
@ -447,7 +447,7 @@ func GameCardLabelAdd(c *gin.Context) {
//Where("game_label in (?)", req.Labels).Find(&gameLabels).Error
Find(&gameLabels).Error
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "查询失败")
return
}
@ -489,7 +489,7 @@ func GameCardLabelAdd(c *gin.Context) {
err = orm.Eloquent.Table("game_card_label").Where("game_card_id=?", req.GameCardId).
Where("game_label in (?)", labs).Delete(&models.GameCardLabel{}).Error
if err != nil {
logger.Error("delete game card label err:", err)
logger.Error("delete game card label err:", logger.Field("err", err))
}
app.OK(c, nil, "操作成功")
@ -508,7 +508,7 @@ func GameCardLabelList(c *gin.Context) {
err := orm.Eloquent.Table("game_card_label").Where("game_card_id=?", req.GameCardId).
Find(&gameLabels).Error
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "查询失败")
return
}

28
app/admin/apis/mallmanage/mall_cat.go
View File

@ -39,7 +39,7 @@ func GoodsCatCreate(c *gin.Context) {
exist, err := models.QueryRecordExist(fmt.Sprintf("SELECT * FROM goods_cat WHERE `name` = '%s' AND pid=%d",
goodsCat.Name, goodsCat.Pid))
if err != nil {
logger.Error("exist spec err:", err)
logger.Error("exist spec err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, errors.New("exist cat err"), "添加分类失败")
return
}
@ -51,7 +51,7 @@ func GoodsCatCreate(c *gin.Context) {
err = orm.Eloquent.Create(goodsCat).Error
if err != nil {
logger.Errorf("err:%#v", err)
logger.Errorf("err:%#v", logger.Field("err", err))
msg := "添加分类失败"
app.Error(c, http.StatusInternalServerError, errors.New("goods create err"), msg)
return
@ -66,7 +66,7 @@ func GoodsCatList(c *gin.Context) {
err := orm.Eloquent.Table("goods_cat").Where("level=?", 1).Where("state=2").
Order("sort DESC").Find(&goodsCats).Error
if err != nil {
logger.Error("goods cat list err:", err)
logger.Error("goods cat list err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "获取分类列表失败")
return
}
@ -79,7 +79,7 @@ func GoodsCatList(c *gin.Context) {
err = orm.Eloquent.Table("goods_cat").Where("pid in (?)", pids).Where("state=2").
Order("sort DESC").Find(&subCat).Error
if err != nil {
logger.Errorf("pCat err:%#v", err)
logger.Errorf("pCat err:%#v", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, errors.New("goods create err"), "获取分类失败")
return
}
@ -107,7 +107,7 @@ func GoodsCatUpdate(c *gin.Context) {
}
err := orm.Eloquent.Save(goodsCat).Error
if err != nil {
logger.Errorf("goods cat update err:%#v", err)
logger.Errorf("goods cat update err:%#v", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, errors.New("goods cat update err"), "分类修改失败")
return
}
@ -127,7 +127,7 @@ func GoodsCatDelete(c *gin.Context) {
}
err := orm.Eloquent.Table("goods_cat").Where("id=?", req.Id).Delete(&models.GoodsCat{}).Error
if err != nil {
logger.Errorf("err:%#v", err)
logger.Errorf("err:%#v", logger.Field("err", err))
msg := "删除商品分类失败"
app.Error(c, http.StatusInternalServerError, errors.New("goods cat delete err"), msg)
return
@ -145,7 +145,7 @@ func GoodsSpecCreate(c *gin.Context) {
}
exist, err := models.QueryRecordExist(fmt.Sprintf("SELECT * FROM spec WHERE display_name = '%s'", spec.DisplayName))
if err != nil {
logger.Error("exist spec err:", err)
logger.Error("exist spec err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, errors.New("exist spec err"), "添加规格失败")
return
}
@ -157,7 +157,7 @@ func GoodsSpecCreate(c *gin.Context) {
spec.State = 2
err = orm.Eloquent.Create(spec).Error
if err != nil {
logger.Error("create spec err:", err)
logger.Error("create spec err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, errors.New("create spec err"), "添加规格失败")
return
}
@ -170,7 +170,7 @@ func GoodsSpecList(c *gin.Context) {
var specs []models.Spec
err := orm.Eloquent.Table("spec").Order("sort DESC").Find(&specs).Error
if err != nil {
logger.Error("create spec list err:", err)
logger.Error("create spec list err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, errors.New("create spec err"), "获取规格列表失败")
return
}
@ -188,7 +188,7 @@ func GoodsSpecUpdate(c *gin.Context) {
}
err := orm.Eloquent.Save(spec).Error
if err != nil {
logger.Errorf("goods cat update err:%#v", err)
logger.Errorf("goods cat update err:%#v", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, errors.New("goods cat update err"), "分类修改失败")
return
}
@ -208,7 +208,7 @@ func SpecValueCreate(c *gin.Context) {
fmt.Sprintf("SELECT * FROM spec_value WHERE display_value = '%s' AND spec_id=%d",
specValue.DisplayValue, specValue.SpecId))
if err != nil {
logger.Error("exist spec err:", err)
logger.Error("exist spec err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, errors.New("exist spec err"), "添加规格值失败")
return
}
@ -220,7 +220,7 @@ func SpecValueCreate(c *gin.Context) {
specValue.State = 2
err = orm.Eloquent.Create(specValue).Error
if err != nil {
logger.Error("create spec err:", err)
logger.Error("create spec err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, errors.New("create spec err"), "添加规格值失败")
return
}
@ -241,7 +241,7 @@ func SpecValueList(c *gin.Context) {
var specValues []models.SpecValue
err := orm.Eloquent.Table("spec_value").Where("spec_id=?", req.SpecId).Order("sort DESC").Find(&specValues).Error
if err != nil {
logger.Error("create spec list err:", err)
logger.Error("create spec list err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, errors.New("create spec err"), "获取规格值列表失败")
return
}
@ -259,7 +259,7 @@ func SpecValueUpdate(c *gin.Context) {
}
err := orm.Eloquent.Save(specValue).Error
if err != nil {
logger.Errorf("goods cat update err:%#v", err)
logger.Errorf("goods cat update err:%#v", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, errors.New("goods cat update err"), "分类修改失败")
return
}

16
app/admin/apis/ordermanage/order.go
View File

@ -37,7 +37,7 @@ func OrderList(c *gin.Context) {
list, count, err := req.List()
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "查询失败")
return
}
@ -64,7 +64,7 @@ func OrderInfo(c *gin.Context) {
order.ID = req.OrderId
ret, err := order.Info()
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "查询失败")
return
}
@ -93,7 +93,7 @@ func DeliverGoods(c *gin.Context) {
}
err, msg := m.Deliver()
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
if msg == "" {
msg = "更新失败"
}
@ -121,7 +121,7 @@ func RevertGoods(c *gin.Context) {
err := order.Revert()
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, err.Error())
return
}
@ -132,7 +132,7 @@ func ExpressCompanyList(c *gin.Context) {
company := &models.ExpressCompany{}
list, err := company.List()
if err != nil {
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "查询失败")
return
}
@ -153,7 +153,7 @@ func OrderDel(c *gin.Context) {
order.ID = req.OrderId
err := order.Del()
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "查询失败")
return
}
@ -173,7 +173,7 @@ func OrderRefund(c *gin.Context) {
order.ID = req.OrderId
err := order.Refund()
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "查询失败")
return
}
@ -251,7 +251,7 @@ func FundRecordList(c *gin.Context) {
list, count, err := req.List()
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "查询失败")
return
}

28
app/admin/apis/pay/wx_pay.go
View File

@ -90,7 +90,7 @@ type WxTransferResp struct {
PaymentNo string `xml:"payment_no,CDATA"`
}
//https://pay.weixin.qq.com/wiki/doc/api/tools/mch_pay.php?chapter=14_2
// https://pay.weixin.qq.com/wiki/doc/api/tools/mch_pay.php?chapter=14_2
type WxTransferReq struct {
XMLName xml.Name `xml:"xml"` //xml标签
MchAppid string `xml:"mch_appid" json:"mch_appid"` //微信分配的小程序ID，必须
@ -115,7 +115,7 @@ func GenTradeNo() string {
return tradeNO
}
//给用户打款
// 给用户打款
func Transfer(amount uint32, openId string, desc string) (*WxTransferResp, error) {
tradeNO := GenTradeNo()
nonce := GenRandStr(NonceStringLength)
@ -140,34 +140,34 @@ func Transfer(amount uint32, openId string, desc string) (*WxTransferResp, error
//生成签名
m, err := struct2Map(req)
if err != nil {
logger.Error(err)
logger.Error(err.Error())
return nil, err
}
sign, err := GenWechatPaySign(m, WxAppMchSecret)
if err != nil {
logger.Error(err)
logger.Error(err.Error())
return nil, err
}
req.Sign = strings.ToUpper(sign)
payload, err := xml.Marshal(&req)
if err != nil {
logger.Error(err)
logger.Error(err.Error())
return nil, err
}
request, err := newPostRequest(WxTransferUrl, string(payload))
if err != nil {
logger.Error(err)
logger.Error(err.Error())
return nil, err
}
defer request.Body.Close()
logger.Info("证书路径:", WxRootCaFile)
logger.Info("证书路径:", WxKeyFile)
logger.Info("证书路径:", logger.Field("WxRootCaFile", WxRootCaFile))
logger.Info("证书路径:", logger.Field("WxKeyFile", WxKeyFile))
client, err := newHttpClient(WxRootCaFile, WxKeyFile)
if err != nil {
logger.Error(err)
logger.Error(err.Error())
return nil, err
}
@ -176,14 +176,14 @@ func Transfer(amount uint32, openId string, desc string) (*WxTransferResp, error
body, err := ioutil.ReadAll(resp.Body)
if err != nil {
logger.Error(err)
logger.Error(err.Error())
return nil, err
}
//logger.Info("Transfer resp = ", string(body))
logger.Info("Transfer resp = ", string(body))
logger.Info("Transfer resp ", logger.Field("body", string(body)))
err = xml.Unmarshal(body, &wxResp)
if err != nil {
logger.Error(err)
logger.Error(err.Error())
return nil, err
}
@ -306,7 +306,7 @@ func GenWechatPaySign(m map[string]string, payKey string) (string, error) {
signStr := strings.Join(signData, "&")
signStr = signStr + "&key=" + payKey
logger.Info("签字符串1 :", signStr)
logger.Info("签字符串1 :", logger.Field("sign", signStr))
c := md5.New()
_, err := c.Write([]byte(signStr))
if err != nil {
@ -340,7 +340,7 @@ func WxSDKPay(uid uint32, wxName string) {
mchPrivateKey, err := wechatpayutils.LoadPrivateKeyWithPath("/Users/li/mh/mh_admin_server/app/admin/apis/pay/merchant/apiclient_key.pem")
if err != nil {
logger.Error("err:", err.Error())
logger.Error(err.Error())
return
}

81
app/admin/apis/sharemanage/share_card.go
View File

@ -28,7 +28,7 @@ func ShareBillList(c *gin.Context) {
list, count, err := req.List()
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "查询失败")
return
}
@ -64,7 +64,7 @@ func ShareBillCheck(c *gin.Context) {
var userShareCardBill models.UserShareCardBill
err := orm.Eloquent.Table("user_share_card_bill").Where("id=?", req.UserShareCardBillId).Find(&userShareCardBill).Error
if err != nil {
logger.Errorf("user share card bill game err:", err)
logger.Errorf("user share card bill game err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "操作失败")
return
}
@ -81,7 +81,7 @@ func ShareBillCheck(c *gin.Context) {
}).Error
if err != nil {
begin.Rollback()
logger.Errorf("update user share card bill err:", err)
logger.Errorf("update user share card bill err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "操作失败")
return
}
@ -90,14 +90,14 @@ func ShareBillCheck(c *gin.Context) {
}).Error
if err != nil {
begin.Rollback()
logger.Errorf("update share card bill game err:", err)
logger.Errorf("update share card bill game err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "操作失败")
return
}
err = begin.Commit().Error
if err != nil {
begin.Rollback()
logger.Errorf("commit err:", err)
logger.Errorf("commit err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "操作失败")
return
}
@ -122,7 +122,7 @@ func ShareBillCardStorage(c *gin.Context) {
var gameGoods []models.GameCardGoods
err := orm.Eloquent.Table("game_card_goods").Where("serial_number in (?)", serialNumbers).Find(&gameGoods).Error
if err != nil && err != models.RecordNotFound {
logger.Error("serial count err:", err)
logger.Error("serial count err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "")
return
}
@ -137,7 +137,7 @@ func ShareBillCardStorage(c *gin.Context) {
}
err = req.CardStorage()
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
if err.Error() == "state err" {
app.Error(c, http.StatusInternalServerError, err, "共享单状态异常")
return
@ -163,7 +163,7 @@ func ShareBillInfo(c *gin.Context) {
//fmt.Println("reqJson:", string(reqJson))
info, err := models.GetShareBillInfo(req.UserShareCardBillId)
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "查询失败")
return
}
@ -183,14 +183,14 @@ func UserShareCardList(c *gin.Context) {
list, count, err := req.List()
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "查询失败")
return
}
var vmRecord models.ShareCardVmRecord
err = orm.Eloquent.Table("share_card_vm_record").Where("provide_date=?", models.ZeroDateFormat(-1)).Find(&vmRecord).Error
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "查询失败")
return
}
@ -219,7 +219,7 @@ func UserShareCardVmList(c *gin.Context) {
list, count, err := req.List()
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "查询失败")
return
}
@ -246,7 +246,7 @@ func ShareCardGameVmList(c *gin.Context) {
list, count, err := req.List()
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "查询失败")
return
}
@ -279,7 +279,7 @@ func ShareCardUserVmList(c *gin.Context) {
//fmt.Println("sysUid:", sysUid)
list, count, err := req.List()
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "查询失败")
return
}
@ -311,7 +311,7 @@ func ShareCardRetrieveCardAudit(c *gin.Context) {
var shareCardRetrieve models.ShareCardRetrieve
err := orm.Eloquent.Table("share_card_retrieve").Where("id=?", req.ShareCardRetrieveId).Find(&shareCardRetrieve).Error
if err != nil {
logger.Errorf("user share card bill game err:", err)
logger.Errorf("user share card bill game err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "操作失败")
return
}
@ -328,13 +328,13 @@ func ShareCardRetrieveCardAudit(c *gin.Context) {
err = models.RetrieveCardAudit(req.ShareCardRetrieveId, req.AuditType, req.Remark)
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "查询失败")
return
}
//list, count, err := req.List()
//if err != nil {
// logger.Errorf("err:", err)
// logger.Errorf("err:",logger.Field("err",err))
// app.Error(c, http.StatusInternalServerError, err, "查询失败")
// return
//}
@ -360,7 +360,7 @@ func ShareCardRetrieveCardDeliver(c *gin.Context) {
//fmt.Println("reqJson:", string(reqJson))
err, msg := req.Deliver()
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
if msg == "" {
msg = "操作失败"
}
@ -369,7 +369,7 @@ func ShareCardRetrieveCardDeliver(c *gin.Context) {
}
//list, count, err := req.List()
//if err != nil {
// logger.Errorf("err:", err)
// logger.Errorf("err:",logger.Field("err",err))
// app.Error(c, http.StatusInternalServerError, err, "查询失败")
// return
//}
@ -384,7 +384,6 @@ func ShareCardRetrieveCardDeliver(c *gin.Context) {
return
}
//
func ShareCardRetrieveList(c *gin.Context) {
req := &models.ShareCardRetrieveListReq{}
if c.ShouldBindJSON(req) != nil {
@ -397,7 +396,7 @@ func ShareCardRetrieveList(c *gin.Context) {
list, count, err := req.List()
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "查询失败")
return
}
@ -426,7 +425,7 @@ func ShareCardRetrieveCardInfo(c *gin.Context) {
info, err := models.GetShareCardRetrieveInfo(req.ShareCardRetrieveId)
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "查询失败")
return
}
@ -444,7 +443,7 @@ func CardIssueList(c *gin.Context) {
}
list, count, err := req.List()
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "查询失败")
return
}
@ -470,7 +469,7 @@ func CardIssueFeedbackInfo(c *gin.Context) {
}
cardIssue, err := models.GetCardIssueFeedbackInfo(req.CardIssueFeedbackId)
if err != nil {
logger.Errorf("get card issue feedback info err:", err)
logger.Errorf("get card issue feedback info err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "查询失败")
return
}
@ -504,17 +503,17 @@ func CardIssueCheck(c *gin.Context) {
var cardIssue models.CardIssueFeedback
err := orm.Eloquent.Table("card_issue_feedback").Where("id=?", req.CardIssueFeedbackId).Find(&cardIssue).Error
if err != nil {
logger.Errorf("get card issue feedback info err:", err)
logger.Errorf("get card issue feedback info err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "操作失败")
return
}
if cardIssue.State != models.CardIssueStateFollowing {
logger.Errorf("card issue feedback state err:", err)
logger.Errorf("card issue feedback state err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "问题反馈单状态异常")
return
}
if cardIssue.SerialNumber != req.SerialNumber {
logger.Errorf("card issue serial number err:", err)
logger.Errorf("card issue serial number err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "检测的卡编号错误")
return
}
@ -545,7 +544,7 @@ func CardIssueCheck(c *gin.Context) {
}).Error
if err != nil {
begin.Rollback()
logger.Errorf("update card issue err:", err)
logger.Errorf("update card issue err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "检测的卡编号错误")
return
}
@ -564,7 +563,7 @@ func CardIssueCheck(c *gin.Context) {
err = begin.Exec(sql).Error
if err != nil {
begin.Rollback()
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "操作失败")
return
}
@ -572,7 +571,7 @@ func CardIssueCheck(c *gin.Context) {
status = models.GameCardGoodsStatusStock
} else {
begin.Rollback()
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "未检测卡功能是否正常")
return
}
@ -618,7 +617,7 @@ func CardIssueCheck(c *gin.Context) {
// 卡的功能 正常
//cardIssue, err := models.GetCardIssueFeedbackInfo(req.CardIssueFeedbackId)
//if err != nil {
// logger.Errorf("get card issue feedback info err:", err)
// logger.Errorf("get card issue feedback info err:",logger.Field("err",err))
// app.Error(c, http.StatusInternalServerError, err, "查询失败")
// return
//}
@ -644,12 +643,12 @@ func CardIssueDeliver(c *gin.Context) {
var cardIssue models.CardIssueFeedback
err := orm.Eloquent.Table("card_issue_feedback").Where("id=?", req.CardIssueFeedbackId).Find(&cardIssue).Error
if err != nil {
logger.Errorf("get card issue feedback info err:", err)
logger.Errorf("get card issue feedback info err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "操作失败")
return
}
if cardIssue.State != models.CardIssueStateInDeliver {
logger.Errorf("card issue feedback state err:", err)
logger.Errorf("card issue feedback state err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "问题反馈单状态异常")
return
}
@ -677,7 +676,7 @@ func CardIssueDeliver(c *gin.Context) {
}).Error
if err != nil {
begin.Rollback()
logger.Errorf("get card issue feedback info err:", err)
logger.Errorf("get card issue feedback info err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "操作失败")
return
}
@ -687,7 +686,7 @@ func CardIssueDeliver(c *gin.Context) {
err = begin.Exec(sql).Error
if err != nil {
begin.Rollback()
logger.Errorf("update game card goods stock err:", err)
logger.Errorf("update game card goods stock err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "操作失败")
return
}
@ -697,7 +696,7 @@ func CardIssueDeliver(c *gin.Context) {
}).Error
if err != nil {
begin.Rollback()
logger.Errorf("get card issue feedback info err:", err)
logger.Errorf("get card issue feedback info err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "操作失败")
return
}
@ -705,7 +704,7 @@ func CardIssueDeliver(c *gin.Context) {
err = begin.Commit().Error
if err != nil {
begin.Rollback()
logger.Errorf("commit err:", err)
logger.Errorf("commit err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "操作失败")
return
}
@ -713,7 +712,7 @@ func CardIssueDeliver(c *gin.Context) {
if req.DeliverExpressCompanyNo != "" && req.DeliverExpressNo != "" {
_, err = kuaidi.SubscribeExpressState(req.DeliverExpressCompanyNo, req.DeliverExpressNo)
if err != nil {
logger.Error("subscribe express state err:", err)
logger.Error("subscribe express state err:", logger.Field("err", err))
}
}
app.OK(c, cardIssue, "")
@ -723,7 +722,7 @@ func CardIssueDeliver(c *gin.Context) {
func ExpressStatePush(c *gin.Context) {
all, err := ioutil.ReadAll(c.Request.Body)
if err != nil {
logger.Error("read all err:", err)
logger.Error("read all err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "操作失败")
return
}
@ -731,7 +730,7 @@ func ExpressStatePush(c *gin.Context) {
//reqAll.Encode()
unescape, err := url.ParseQuery(string(all))
if err != nil {
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "操作失败")
return
}
@ -740,7 +739,7 @@ func ExpressStatePush(c *gin.Context) {
var expressStatePushReq models.ExpressStatePushReq
err = json.Unmarshal([]byte(unescape.Get("param")), &expressStatePushReq)
if err != nil {
logger.Error("unmarshal express state push req err:", err)
logger.Error("unmarshal express state push req err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "操作失败")
return
}
@ -758,7 +757,7 @@ func IssueCardFunctionUnusualList(c *gin.Context) {
}
list, count, err := req.List()
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "查询失败")
return
}

24
app/admin/apis/stockmanage/stock.go
View File

@ -21,7 +21,7 @@ func GameCardGoodsStockInfoList(c *gin.Context) {
}
resp, err := req.List()
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "查询失败")
return
}
@ -44,7 +44,7 @@ func GameCardGoodsStockCardList(c *gin.Context) {
}
list, count, err := req.List()
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "查询失败")
return
}
@ -74,7 +74,7 @@ func GameCardGoodsStockAdds(c *gin.Context) {
}
err := cardGoods.Adds(req.Cards)
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "入库失败")
return
}
@ -95,7 +95,7 @@ func GameCardGoodsStockDels(c *gin.Context) {
cardGoods := &models.GameCardGoods{}
err := cardGoods.Dels(req.SerialNumberList)
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "删除失败")
return
}
@ -116,7 +116,7 @@ func ExportDataGameCardGoodsStock(c *gin.Context) {
//cardGoods := &models.GameCardGoods{}
//err := cardGoods.Adds(req.Cards)
//if err != nil {
// logger.Errorf("err:", err)
// logger.Errorf("err:",logger.Field("err",err))
// app.Error(c, http.StatusInternalServerError, err, "入库失败")
// return
//}
@ -152,7 +152,7 @@ func CannibalizeTaskCreate(c *gin.Context) {
}
err := orm.Eloquent.Create(task).Error
if err != nil {
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "创建调拨任务错误")
return
}
@ -173,7 +173,7 @@ func CannibalizeTaskImportGameCardGoods(c *gin.Context) {
}
unImportGoods, err := models.CannibalizeTaskImportGoods(req.CannibalizeStockTaskId, req.SerialNumberList)
if err != nil {
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "导入调拨卡错误")
}
if unImportGoods > 0 {
@ -196,7 +196,7 @@ func CannibalizeTaskDeliverGoods(c *gin.Context) {
}
err := models.CannibalizeDeliverGoods(req.CannibalizeStockTaskId)
if err != nil {
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "发货错误")
}
@ -215,7 +215,7 @@ func CannibalizeTaskPutInStorage(c *gin.Context) {
}
err := models.CannibalizePutInStorage(req.CannibalizeStockTaskId)
if err != nil {
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "发货错误")
}
@ -232,7 +232,7 @@ func CannibalizeTaskList(c *gin.Context) {
}
resp, err := req.GetCannibalizeTaskList()
if err != nil {
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "任务列表错误")
return
}
@ -250,7 +250,7 @@ func CannibalizeTaskGameCardGoodsList(c *gin.Context) {
}
resp, err := req.GetCannibalizeTaskGameCardGoodsList()
if err != nil {
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "任务列表错误")
return
}
@ -269,7 +269,7 @@ func CannibalizeTaskDel(c *gin.Context) {
}
err := models.CannibalizeTaskDel(req.CannibalizeStockTaskId)
if err != nil {
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "改任务状态不能删除")
}

4
app/admin/apis/system/sysuser.go
View File

@ -4,9 +4,9 @@ import (
"github.com/gin-gonic/gin"
"github.com/gin-gonic/gin/binding"
"github.com/google/uuid"
"go-admin/logger"
"go-admin/app/admin/models"
"go-admin/common/global"
"go-admin/tools"
"go-admin/tools/app"
)
@ -211,7 +211,7 @@ func InsetSysUserAvatar(c *gin.Context) {
guid := uuid.New().String()
filPath := "static/uploadfile/" + guid + ".jpg"
for _, file := range files {
global.Logger.Debug(file.Filename)
logger.Debug(file.Filename)
// 上传文件至指定目录
_ = c.SaveUploadedFile(file, filPath)
}

100
app/admin/apis/usermanage/user.go
View File

@ -52,7 +52,7 @@ func UserList(c *gin.Context) {
sql := fmt.Sprintf("SELECT * FROM sys_user WHERE user_id=%.0f;", sysUid)
err := orm.Eloquent.Raw(sql).Scan(&sUser).Error
if err != nil {
logger.Error("sys user err:", err)
logger.Error("sys user err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "查询失败")
return
}
@ -64,7 +64,7 @@ func UserList(c *gin.Context) {
userList, _, count, err := models.GetUserList(req.Page, req.PageSize, req.Uid, req.MemberLevel, req.StoreId,
req.UserType, req.CooperativeBusinessId, req.Tel, req.StartTime, req.EndTime, req.NameKey, req.SortField, req.SortType, req.Filter)
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "查询失败")
return
}
@ -78,7 +78,7 @@ func UserList(c *gin.Context) {
//未归还卡带
cards, err := models.GetUserExpiredCards(uids)
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "查询失败")
return
}
@ -104,7 +104,7 @@ func CommonProblemList(c *gin.Context) {
commonProblem := &models.CommonProblem{}
list, err := commonProblem.List()
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "查询失败")
return
}
@ -121,7 +121,7 @@ func CommonProblemAdd(c *gin.Context) {
}
err := commonProblem.Add()
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "查询失败")
return
}
@ -138,7 +138,7 @@ func CommonProblemModify(c *gin.Context) {
}
err := commonProblem.Modify()
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "查询失败")
return
}
@ -159,7 +159,7 @@ func CommonProblemDel(c *gin.Context) {
commonProblem.ID = req.CommonProblemId
err := commonProblem.Del()
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "查询失败")
return
}
@ -189,30 +189,30 @@ func UserAddAssistant(c *gin.Context) {
// TODO 支付地址
userInfo, err := models.GetUserInfoByUid(req.Uid)
if err != nil {
logger.Error("get user info err:", err)
logger.Error("get user info err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "绑定店员失败")
return
}
if userInfo.Uid != req.Uid {
logger.Error("user info err:", err)
logger.Error("user info err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "绑定店员失败")
return
}
var cooperative models.CooperativeBusiness
err = orm.Eloquent.Table("cooperative_business").Where("id=?", req.CooperativeBusinessId).Find(&cooperative).Error
if err != nil {
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "绑定店员失败")
return
}
store, err := models.GetStore(req.StoreId)
if err != nil {
logger.Error("get store err:", err)
logger.Error("get store err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "绑定店员失败")
return
}
if store.CooperativeBusinessId != req.CooperativeBusinessId {
logger.Error("cooperative business store err:", err)
logger.Error("cooperative business store err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "绑定门店错误")
return
}
@ -222,7 +222,7 @@ func UserAddAssistant(c *gin.Context) {
req.StoreId, req.ShopAssistantName, req.CooperativeBusinessId, cooperative.Name, req.XcxRoleId, req.Uid)
err = orm.Eloquent.Exec(sql).Error
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "绑定店员失败")
return
}
@ -247,7 +247,7 @@ func UserAssistantDel(c *gin.Context) {
sql := fmt.Sprintf("UPDATE `user` SET user_type = 1, store_id = 0 WHERE uid = %d;", req.Uid)
err := orm.Eloquent.Exec(sql).Error
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "绑定失败")
return
}
@ -268,7 +268,7 @@ func UserInviteList(c *gin.Context) {
// TODO 支付地址
list, count, err := req.InviteList()
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "查询失败")
return
}
@ -293,14 +293,14 @@ func CancelMembers(c *gin.Context) {
//list, count, err := req.InviteList()
//if err != nil {
// logger.Errorf("err:", err)
// logger.Errorf("err:",logger.Field("err",err))
// app.Error(c, http.StatusInternalServerError, err, "查询失败")
// return
//}
var userInfo models.UserInfo
err := orm.Eloquent.Table("user").Where("uid", req.Uid).Find(&userInfo).Error
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "查询用户失败")
return
}
@ -311,7 +311,7 @@ func CancelMembers(c *gin.Context) {
sql := fmt.Sprintf("UPDATE `user` SET member_level = 1,member_expire=?,updated_at=?,deposit=0 WHERE uid = ?;")
err = orm.Eloquent.Debug().Exec(sql, nowTime, nowTime, req.Uid).Error
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "取消会员失败")
return
}
@ -321,7 +321,7 @@ func CancelMembers(c *gin.Context) {
sqlInvite := fmt.Sprintf("UPDATE user_invite SET member_status=3,action=1,spend_type=1 WHERE id= ? ;")
err = orm.Eloquent.Exec(sqlInvite, userInvite.ID).Error
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "取消会员失败")
return
}
@ -344,7 +344,7 @@ func ExportDataUser(c *gin.Context) {
//goodsStock := models.ExportUserMember(req.StoreId, req.StartTime, req.EndTime)
sysUser, err := models.GetSysUserByCtx(c)
if err != nil {
logger.Error("sys user err:", err)
logger.Error("sys user err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "查询失败")
return
}
@ -358,7 +358,7 @@ func ExportDataUser(c *gin.Context) {
//}
//sysUser, err := models.GetSysUser(sysUid)
//if err != nil {
// logger.Error("sys user err:", err)
// logger.Error("sys user err:",logger.Field("err",err))
// app.Error(c, http.StatusInternalServerError, err, "查询失败")
// return
//}
@ -369,7 +369,7 @@ func ExportDataUser(c *gin.Context) {
//cardGoods := &models.GameCardGoods{}
//err := cardGoods.Adds(req.Cards)
//if err != nil {
// logger.Errorf("err:", err)
// logger.Errorf("err:",logger.Field("err",err))
// app.Error(c, http.StatusInternalServerError, err, "入库失败")
// return
//}
@ -398,7 +398,7 @@ func ExportDataUserMember(c *gin.Context) {
//cardGoods := &models.GameCardGoods{}
//err := cardGoods.Adds(req.Cards)
//if err != nil {
// logger.Errorf("err:", err)
// logger.Errorf("err:",logger.Field("err",err))
// app.Error(c, http.StatusInternalServerError, err, "入库失败")
// return
//}
@ -417,7 +417,7 @@ func ArticleAdd(c *gin.Context) {
}
err := orm.Eloquent.Create(req).Error
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "添加文章错误")
return
}
@ -434,7 +434,7 @@ func ArticleUpdate(c *gin.Context) {
}
err := orm.Eloquent.Save(req).Error
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "添加文章错误")
return
}
@ -452,7 +452,7 @@ func ArticleList(c *gin.Context) {
list, total, err := req.GetArticleList()
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "获取列表错误")
return
}
@ -477,7 +477,7 @@ func ArticleDel(c *gin.Context) {
err := orm.Eloquent.Table("article").Where("id in (?)", req.Ids).Delete(&models.Article{}).Error
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "文章删除错误")
return
}
@ -495,7 +495,7 @@ func UserDepositRefundRecordList(c *gin.Context) {
resp, err := req.DepositRefundRecordList()
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "获取列表错误")
return
}
@ -517,7 +517,7 @@ func NotarizeUserDepositRefund(c *gin.Context) {
var depositRefund models.DepositRefundRecord
err := orm.Eloquent.Table("deposit_refund_record").Where("id = ?", req.DepositRefundRecordId).Find(&depositRefund).Error
if err != nil {
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "错误")
return
}
@ -529,7 +529,7 @@ func NotarizeUserDepositRefund(c *gin.Context) {
unreturnedOrders, err := models.IsUserHaveUnreturnedOrders(depositRefund.Uid)
if err != nil {
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
//RespJson(c, status.InternalServerError, nil)
app.Error(c, http.StatusInternalServerError, err, "用户有未完成订单")
return
@ -542,7 +542,7 @@ func NotarizeUserDepositRefund(c *gin.Context) {
userInfo, err := models.GetUserInfoByUid(depositRefund.Uid)
if err != nil {
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "错误")
return
}
@ -552,7 +552,7 @@ func NotarizeUserDepositRefund(c *gin.Context) {
for i := 0; i < 2; i++ {
transfer, err = pay.Transfer(userInfo.Deposit/2, userInfo.WxOpenID, fmt.Sprintf("押金退款(共2次到账)%d/2", i+1))
if err != nil {
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "错误")
return
}
@ -561,7 +561,7 @@ func NotarizeUserDepositRefund(c *gin.Context) {
for i := 0; i < 5; i++ {
transfer, err = pay.Transfer(userInfo.Deposit/5, userInfo.WxOpenID, fmt.Sprintf("押金退款(共5次到账)%d/5", i+1))
if err != nil {
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "错误")
return
}
@ -569,7 +569,7 @@ func NotarizeUserDepositRefund(c *gin.Context) {
} else {
transfer, err = pay.Transfer(userInfo.Deposit, userInfo.WxOpenID, "押金退款")
if err != nil {
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "错误")
return
}
@ -585,7 +585,7 @@ func NotarizeUserDepositRefund(c *gin.Context) {
}
err = orm.Eloquent.Table("user").Where("uid = ?", userInfo.Uid).Updates(updateUser).Error
if err != nil {
logger.Error("update deposit err:", err)
logger.Error("update deposit err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "错误")
return
}
@ -595,7 +595,7 @@ func NotarizeUserDepositRefund(c *gin.Context) {
"confirm_time": time.Now(),
}).Error
if err != nil {
logger.Error("update deposit refund record err:", err)
logger.Error("update deposit refund record err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "错误")
return
}
@ -612,7 +612,7 @@ func NotarizeUserDepositRefund(c *gin.Context) {
}
err = orm.Eloquent.Create(fundRecord).Error
if err != nil {
logger.Error("create fund record err:", err)
logger.Error("create fund record err:", logger.Field("err", err))
}
app.OK(c, nil, "操作成功")
}
@ -630,7 +630,7 @@ func NotarizeUserDepositRefused(c *gin.Context) {
var depositRefund models.DepositRefundRecord
err := orm.Eloquent.Table("deposit_refund_record").Where("id = ?", req.DepositRefundRecordId).Find(&depositRefund).Error
if err != nil {
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "错误")
return
}
@ -645,7 +645,7 @@ func NotarizeUserDepositRefused(c *gin.Context) {
"confirm_time": time.Now(),
}).Error
if err != nil {
logger.Error("update deposit refund record err:", err)
logger.Error("update deposit refund record err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "错误")
return
}
@ -688,7 +688,7 @@ func GroupSendMessageCreateTemplate(c *gin.Context) {
req.Status = 1
err := orm.Eloquent.Create(req).Error
if err != nil {
logger.Errorf("Create GroupSendMessageTemplate err:", err)
logger.Errorf("Create GroupSendMessageTemplate err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "模板创建错误")
return
}
@ -708,7 +708,7 @@ func GroupSendMessage(c *gin.Context) {
var groupMessageTemplate models.GroupSendMessageTemplate
err := orm.Eloquent.Table("group_send_message_template").Where("id = ?", req.GroupSendMessageTemplateId).Find(&groupMessageTemplate).Error
if err != nil && err != models.RecordNotFound {
logger.Errorf("GroupSendMessageTemplate err:", err)
logger.Errorf("GroupSendMessageTemplate err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "获取模板错误")
return
}
@ -729,7 +729,7 @@ func GroupSendMessage(c *gin.Context) {
var users []models.UserInfo
err := qs.Find(&users).Error
if err != nil {
logger.Errorf("users err:", err)
logger.Errorf("users err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "获取用户错误")
return
}
@ -751,7 +751,7 @@ func GroupSendMessage(c *gin.Context) {
//groupMessageTemplate.Message = "【go2switch】温馨提示:您的会员即将过期,请在过期之前将卡归还到门店,如有问题联系客服"
err = models.GtSendMessage(strings.Split(tels, ","), groupMessageTemplate.Message)
if err != nil {
logger.Errorf("SmsSend err:", err)
logger.Errorf("SmsSend err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "群发消息错误")
return
}
@ -761,7 +761,7 @@ func GroupSendMessage(c *gin.Context) {
"send_time": time.Now(),
}).Error
if err != nil {
logger.Error("message template send update err:", err)
logger.Error("message template send update err:", logger.Field("err", err))
}
app.OK(c, nil, "操作成功")
@ -778,7 +778,7 @@ func GroupSendMessageCreateTemplateDel(c *gin.Context) {
}
err := orm.Eloquent.Table("group_send_message_template").Where("id = ?", req.GroupSendMessageTemplateId).Delete(&models.GroupSendMessageTemplate{}).Error
if err != nil {
logger.Errorf("GroupMessageTemplate del err:", err)
logger.Errorf("GroupMessageTemplate del err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "删除错误")
return
}
@ -809,7 +809,7 @@ func UserMemberRecordList(c *gin.Context) {
list, count, err := req.List()
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "查询失败")
return
}
@ -832,7 +832,7 @@ func UserMemberRecordListExport(c *gin.Context) {
url, err := req.Export()
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "查询失败")
return
}
@ -850,7 +850,7 @@ func UserMemberStatisticList(c *gin.Context) {
rsp, err := req.List()
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "查询失败")
return
}
@ -873,7 +873,7 @@ func UserInviteRecordList(c *gin.Context) {
list, count, err := req.List()
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "查询失败")
return
}
@ -896,7 +896,7 @@ func ExpireMemberSmsSendRecordList(c *gin.Context) {
resp, err := req.List()
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "查询失败")
return
}

6
app/admin/middleware/db.go
View File

@ -3,6 +3,7 @@ package middleware
import (
"database/sql"
"errors"
"go-admin/logger"
"gorm.io/driver/mysql"
"gorm.io/driver/postgres"
@ -10,7 +11,6 @@ import (
"gorm.io/gorm/schema"
"go-admin/common/config"
"go-admin/common/global"
"go-admin/common/middleware"
"go-admin/tools"
)
@ -39,7 +39,7 @@ func GetGormFromConfig(cfg config.Conf) map[string]*gorm.DB {
},
})
if err != nil {
global.Logger.Fatal(tools.Red(k+" connect error :"), err)
logger.Fatal(tools.Red(k+" connect error :"), err)
}
}
return gormDB
@ -51,7 +51,7 @@ func GetGormFromConfig(cfg config.Conf) map[string]*gorm.DB {
},
})
if err != nil {
global.Logger.Fatal(tools.Red(c.Driver+" connect error :"), err)
logger.Fatal(tools.Red(c.Driver+" connect error :"), err)
}
gormDB["*"] = db
return gormDB

4
app/admin/middleware/handler/auth.go
View File

@ -2,6 +2,7 @@ package handler
import (
"errors"
"go-admin/logger"
"net/http"
"github.com/gin-gonic/gin"
@ -9,7 +10,6 @@ import (
"github.com/mssola/user_agent"
"go-admin/app/admin/models"
"go-admin/common/global"
jwt "go-admin/pkg/jwtauth"
"go-admin/tools"
"go-admin/tools/config"
@ -103,7 +103,7 @@ func Authenticator(c *gin.Context) (interface{}, error) {
msg = "登录失败"
status = "1"
LoginLogToDB(c, status, msg, username)
global.RequestLogger.Println(e.Error())
logger.Println(e.Error())
}
return nil, jwt.ErrFailedAuthentication
}

4
app/admin/middleware/init.go
View File

@ -15,4 +15,8 @@ func InitMiddleware(r *gin.Engine) {
r.Use(Options)
// Secure is a middleware function that appends security
r.Use(Secure)
//trace id
t := Trace{}
r.Use(t.Handle())
}

11
app/admin/middleware/logger.go
View File

@ -2,13 +2,13 @@ package middleware
import (
"fmt"
"go-admin/logger"
"strings"
"time"
"github.com/gin-gonic/gin"
"go-admin/app/admin/models"
"go-admin/common/global"
"go-admin/tools"
config2 "go-admin/tools/config"
)
@ -51,7 +51,14 @@ func LoggerToFile() gin.HandlerFunc {
clientIP,
)
global.RequestLogger.Info(statusCode, latencyTime, clientIP, reqMethod, reqUri)
logger.Info(
"log request",
logger.Field("status", statusCode),
logger.Field("spend_time", latencyTime),
logger.Field("client_id", clientIP),
logger.Field("method", reqMethod),
logger.Field("uri", reqUri),
)
if c.Request.Method != "GET" && c.Request.Method != "OPTIONS" && config2.LoggerConfig.EnabledDB {
SetDBOperLog(c, clientIP, statusCode, reqUri, reqMethod, latencyTime)

2
app/admin/middleware/permission.go
View File

@ -10,7 +10,7 @@ import (
"go-admin/tools"
)
//权限检查中间件
// 权限检查中间件
func AuthCheckRole() gin.HandlerFunc {
return func(c *gin.Context) {
data, _ := c.Get(jwtauth.JwtPayloadKey)

4
app/admin/models/article.go
View File

@ -63,13 +63,13 @@ func (m *ArticleListReq) GetArticleList() ([]Article, int64, error) {
var count int64
err := qs.Count(&count).Error
if err != nil {
logger.Error("err:", err)
logger.Error(err.Error())
return articles, 0, err
}
err = qs.Order("id desc").Offset(page * m.PageSize).Limit(m.PageSize).Find(&articles).Error
if err != nil {
logger.Error("err:", err)
logger.Error(err.Error())
return articles, count, err
}
return articles, count, nil

334
app/admin/models/game_card.go
View File

File diff suppressed because it is too large Load Diff

34
app/admin/models/greentown_sms.go
View File

@ -60,7 +60,7 @@ func GtSendMessage(phoneList []string, content string) error {
resp := &GtSendMessageResp{}
err := townClient.post(townClient.BaseURL+GtUrlRouteSendMessage, params, resp)
if err != nil {
logger.Error("townClient post err:", err)
logger.Error("townClient post err:", logger.Field("err", err))
return err
}
fmt.Println("resp:", resp)
@ -71,30 +71,30 @@ func (g *GreentownClient) post(amApi string, params map[string]interface{}, resp
params["userName"] = g.UserName
data, err := json.Marshal(params)
if err != nil {
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
return err
}
req, err := http.NewRequest("POST", amApi, bytes.NewReader(data))
if err != nil {
logger.Error("NewRequest err:", err)
logger.Error("NewRequest err:", logger.Field("err", err))
return err
}
req.Header.Set("Accept", "application/json")
req.Header.Set("Content-Type", "application/json;charset=utf-8")
res, err := http.DefaultClient.Do(req)
if err != nil {
logger.Error("DefaultClient err:", err)
logger.Error("DefaultClient err:", logger.Field("err", err))
return err
}
readAll, err := io.ReadAll(res.Body)
if err != nil {
logger.Error("ReadAll err:", err)
logger.Error("ReadAll err:", logger.Field("err", err))
return err
}
if err = json.Unmarshal(readAll, resp); err != nil {
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
return err
}
@ -119,7 +119,7 @@ func MD5Encode32(data string) string {
// //latestUSDResp := &LatestUSDResp{}
// //err := exchangeClient.get("/latest/USD", params, latestUSDResp)
// //if err != nil {
// // log.Error().Msgf("err:%#v", err)
// // log.Error().Msgf("err:%#v",logger.Field("err",err))
// // return 0, err
// //}
// //return latestUSDResp.ConversionRates.CNY, nil
@ -135,7 +135,7 @@ func SmsSend(tel, content string) error {
//latestUSDResp := &LatestUSDResp{}
err := exchangeClient.get("/sms/send?", params, nil)
if err != nil {
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
return err
}
@ -153,27 +153,27 @@ func (m *ExchangeClient) get(amApi string, params *url.Values, resp interface{})
fmt.Println("uri:", uri+params.Encode())
req, err := http.NewRequest("GET", uri+params.Encode(), nil)
if err != nil {
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
return err
}
req.Header.Set("Content-Type", "application/json")
res, err := (&http.Client{}).Do(req)
if err != nil {
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
return err
}
defer res.Body.Close()
data, err := ioutil.ReadAll(res.Body)
if err != nil {
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
return err
}
//fmt.Println("返回数据data:")
fmt.Println("Body:", string(data))
//if err = json.Unmarshal(data, &resp); err != nil {
// logger.Error("err:", err)
// logger.Error("err:",logger.Field("err",err))
// return err
//}
return nil
@ -183,20 +183,20 @@ func (m *ExchangeClient) post(amApi string, params, resp interface{}) error {
uri := m.BaseURL + amApi
data, err := json.Marshal(params)
if err != nil {
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
return err
}
req, err := http.NewRequest("POST", uri, bytes.NewReader(data))
if err != nil {
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
return err
}
req.Header.Set("Content-Type", "application/json")
res, err := (&http.Client{}).Do(req)
if err != nil {
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
return err
}
defer res.Body.Close()
@ -205,11 +205,11 @@ func (m *ExchangeClient) post(amApi string, params, resp interface{}) error {
//fmt.Println("Body:", string(data))
data, err = ioutil.ReadAll(res.Body)
if err != nil {
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
return err
}
if err = json.Unmarshal(data, resp); err != nil {
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
return err
}
return nil

158
app/admin/models/order.go
View File

@ -217,14 +217,14 @@ func (m *OrderListReq) List() ([]Order, int64, error) {
// Order("id DESC").Order("card_status ASC").Limit(30).Find(&orderCards).Error
// //Where("card_status in (?)", []uint32{2, 3}).Order("id DESC").Order("card_status DESC").Limit(30).Find(&orderCards).Error
//if err != nil {
// logger.Error("err:", err)
// logger.Error("err:",logger.Field("err",err))
// return orders, 0, err
//}
//order := Order{}
//if len(orderCards) > 0 {
// err := orm.Eloquent.Table("order").Where("id=?", orderCards[0].OrderId).Find(&order).Error
// if err != nil {
// logger.Error("err:", err)
// logger.Error("err:",logger.Field("err",err))
// return orders, 0, err
// }
//}
@ -236,7 +236,7 @@ func (m *OrderListReq) List() ([]Order, int64, error) {
Order("id DESC").Order("card_status ASC").Find(&orderCards).Error
//Where("card_status in (?)", []uint32{2, 3}).Order("id DESC").Order("card_status DESC").Limit(30).Find(&orderCards).Error
if err != nil {
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
return orders, 0, err
}
orderIds := make([]uint32, 0)
@ -286,7 +286,7 @@ func (m *OrderListReq) List() ([]Order, int64, error) {
var count int64
err := qs.Count(&count).Error
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return orders, 0, err
}
page := m.Page
@ -297,7 +297,7 @@ func (m *OrderListReq) List() ([]Order, int64, error) {
}
err = qs.Preload("User").Order("created_at DESC").Offset(page * pageSize).Limit(pageSize).Find(&orders).Error
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return orders, 0, err
}
@ -313,7 +313,7 @@ func (m *OrderListReq) List() ([]Order, int64, error) {
//var orderCards []OrderCard
err = orm.Eloquent.Table("order_card").Where("order_id in (?)", ids).Find(&orderCards).Error
if err != nil {
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
return orders, 0, err
}
orderCards = OrderCardListSetGameInfo(orderCards)
@ -335,7 +335,7 @@ func (m *OrderListReq) List() ([]Order, int64, error) {
//games := make([]GameCard, 0)
//err = orm.Eloquent.Table("game_card").Where("id IN (?)", gameIds).Find(&games).Error
//if err != nil {
// logger.Errorf("err:", err)
// logger.Errorf("err:",logger.Field("err",err))
// return orders, 0, err
//}
//fmt.Println("games:", games)
@ -357,7 +357,7 @@ func (m *Order) Info() (map[string]interface{}, error) {
ret := make(map[string]interface{}, 0)
err := orm.Eloquent.Table("order").Where("id", m.ID).Find(m).Error
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return ret, err
}
@ -371,7 +371,7 @@ func (m *Order) Info() (map[string]interface{}, error) {
Find(&orderCards).
Error
if err != nil {
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
return ret, err
}
@ -387,7 +387,7 @@ func (m *Order) Info() (map[string]interface{}, error) {
err := orm.Eloquent.Table("store").Where("id", m.StoreId).Find(&store).Error
if err != nil && err != RecordNotFound {
storeCh <- store
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return err
}
storeCh <- store
@ -398,7 +398,7 @@ func (m *Order) Info() (map[string]interface{}, error) {
// err := orm.Eloquent.Table("store").Where("id", m.RevertStoreId).Find(&revertStore).Error
// if err != nil && err != RecordNotFound {
// storeCh <- revertStore
// logger.Errorf("err:", err)
// logger.Errorf("err:",logger.Field("err",err))
// return err
// }
// revertStoreCh <- revertStore
@ -409,7 +409,7 @@ func (m *Order) Info() (map[string]interface{}, error) {
err := orm.Eloquent.Table("user_address").Where("id", m.UserAddressId).Find(&userAddress).Error
if err != nil && err != RecordNotFound {
userAddressCh <- userAddress
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return err
}
userAddressCh <- userAddress
@ -420,7 +420,7 @@ func (m *Order) Info() (map[string]interface{}, error) {
err := orm.Eloquent.Table("user").Where("id", m.Uid).Find(&userInfo).Error
if err != nil && err != RecordNotFound {
userInfoCh <- userInfo
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return err
}
userInfoCh <- userInfo
@ -428,7 +428,7 @@ func (m *Order) Info() (map[string]interface{}, error) {
})
err = eg.Wait()
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return ret, err
}
@ -453,13 +453,13 @@ func (m *Order) Deliver() (error, string) {
var order Order
err := orm.Eloquent.Table("order").Where("id", m.ID).Find(&order).Error
if err != nil && err != RecordNotFound {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return err, ""
}
fmt.Println("Order:", m)
cards, err := m.GetOrderCardGameCardIdList()
if err != nil {
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
return err, ""
}
if len(m.GameCardSerialNumbers) != len(cards) {
@ -469,7 +469,7 @@ func (m *Order) Deliver() (error, string) {
var user UserInfo
err = orm.Eloquent.Table("user").Where("uid", order.Uid).Find(&user).Error
if err != nil {
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
return err, ""
}
if user.MemberExpire.Before(time.Now()) {
@ -492,7 +492,7 @@ func (m *Order) Deliver() (error, string) {
for _, serialNumber := range m.GameCardSerialNumbers {
//cards, err = m.GetOrderCardGameCardIdList()
//if err != nil {
// logger.Error("err:", err)
// logger.Error("err:",logger.Field("err",err))
// return err, ""
//}
@ -506,7 +506,7 @@ func (m *Order) Deliver() (error, string) {
err := orm.Eloquent.Table("game_card_goods").Where("serial_number", serialNumber).Find(&gameCardGoods).Error
if err != nil && err != RecordNotFound {
begin.Rollback()
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return err, ""
}
if err == RecordNotFound {
@ -525,7 +525,7 @@ func (m *Order) Deliver() (error, string) {
//err = orm.Eloquent.Table("order").Where("id", m.ID).Find(&order).Error
//if err != nil && err != RecordNotFound {
// begin.Rollback()
// logger.Errorf("err:", err)
// logger.Errorf("err:",logger.Field("err",err))
// return err, ""
//}
if order.CardStatus != OrderCardStatusUnPick {
@ -592,7 +592,7 @@ func (m *Order) Deliver() (error, string) {
err := begin.Table("order").Where("id", m.ID).Updates(paraMap).Error
if err != nil {
begin.Rollback()
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return err, ""
}
isUpdateOrder = true
@ -608,7 +608,7 @@ func (m *Order) Deliver() (error, string) {
Update("status", goodsStatus).Error
if err != nil {
begin.Rollback()
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return err
}
return nil
@ -619,7 +619,7 @@ func (m *Order) Deliver() (error, string) {
err := begin.Exec(sql).Error
if err != nil {
begin.Rollback()
logger.Errorf("err:", err)
logger.Errorf("err:%s", err.Error())
return err
}
return nil
@ -630,7 +630,7 @@ func (m *Order) Deliver() (error, string) {
// sql := fmt.Sprintf("UPDATE game_card SET order_count = order_count+1 WHERE id = %d", order.GameCardId)
// err := orm.Eloquent.Exec(sql).Error
// if err != nil {
// logger.Errorf("err:", err)
// logger.Errorf("err:",logger.Field("err",err))
// return err
// }
// }
@ -642,7 +642,7 @@ func (m *Order) Deliver() (error, string) {
var userInfo UserInfo
err := orm.Eloquent.Table("user").Where("uid=?", order.Uid).Find(&userInfo).Error
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return err
}
if userInfo.StoreId == 0 {
@ -650,7 +650,7 @@ func (m *Order) Deliver() (error, string) {
err := begin.Exec(sql).Error
if err != nil {
begin.Rollback()
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return err
}
}
@ -669,7 +669,7 @@ func (m *Order) Deliver() (error, string) {
// }
// err := orm.Eloquent.Create(invite).Error
// if err != nil {
// logger.Errorf("err:", err)
// logger.Errorf("err:",logger.Field("err",err))
// return err
// }
//}
@ -680,7 +680,7 @@ func (m *Order) Deliver() (error, string) {
//err := orm.Eloquent.Table("order_card").Where("order_id=?", m.ID).Where("uid=?", order.Uid).
// Where("game_card_id=?", gameCardGoods.GameCardId).Where("serial_number=''").Limit(1).Find(&orderCard).Error
//if err != nil {
// logger.Errorf("err:", err)
// logger.Errorf("err:",logger.Field("err",err))
// return err
//}
//err = begin.Table("order_card").Where("id=?", orderCard.ID).Updates(&map[string]interface{}{
@ -700,7 +700,7 @@ func (m *Order) Deliver() (error, string) {
}).Error
if err != nil {
begin.Rollback()
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return err
}
delete(orderCardMaps, orderCard.ID)
@ -710,7 +710,7 @@ func (m *Order) Deliver() (error, string) {
err = eg.Wait()
if err != nil {
begin.Rollback()
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return err, ""
}
}
@ -722,14 +722,14 @@ func (m *Order) Deliver() (error, string) {
err = begin.Commit().Error
if err != nil {
begin.Rollback()
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
return err, ""
}
if m.ExpressCompanyNo != "" && m.ExpressNo != "" {
_, err = kuaidi.SubscribeExpressState(m.ExpressCompanyNo, m.ExpressNo)
if err != nil {
logger.Error("subscribe express state err:", err)
logger.Error("subscribe express state err:", logger.Field("err", err))
}
}
//DeliverTask{}
@ -743,7 +743,7 @@ func (m *Order) Deliver() (error, string) {
err = orm.Eloquent.Table("order").Where("uid=?", user.Uid).
Where("card_status!=?", OrderCardStatusCancel).Where("pay_status=?", 2).Find(&orders).Error
if err != nil {
logger.Error("order err:", err)
logger.Error("order err:", logger.Field("err", err))
return
}
@ -751,13 +751,13 @@ func (m *Order) Deliver() (error, string) {
err = orm.Eloquent.Table("user").Where("uid=?", user.Uid).
Update("store_id", orders[0].StoreId).Error
if err != nil {
logger.Error("update store err:", err)
logger.Error("update store err:", logger.Field("err", err))
}
}
//if !exist && user.OpenMemberTime.Format(DateTimeFormat) == time.Now().Format(DateTimeFormat) {
// //_, err = NewUserQuerySet(model.DB).UidEq(uc.Uid).GetUpdater().SetStoreId(uint64(req.StoreId)).UpdateNum()
// if err != nil {
// logger.Error("update user err:", err)
// logger.Error("update user err:",logger.Field("err",err))
// }
//}
}()
@ -772,7 +772,7 @@ func (m *Order) Revert() error {
var order Order
err := orm.Eloquent.Table("order").Preload("User").Where("id", m.ID).Find(&order).Error
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return err
}
if m.PhoneExt != "" && !order.User.CheckPhoneExt(m.PhoneExt, 4) {
@ -780,7 +780,7 @@ func (m *Order) Revert() error {
}
cardMap, err := order.GetOrderCardMap()
if err != nil {
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
return err
}
orderCardIds := make([]uint32, 0, len(cardMap))
@ -792,7 +792,7 @@ func (m *Order) Revert() error {
err = orm.Eloquent.Table("card_issue_feedback").Where("relevance_id in (?)", orderCardIds).
Where("state=?", CardIssueStateFollowing).Count(&issueCount).Error
if err != nil {
logger.Errorf("err:%#v", err)
logger.Errorf("err:%#v", logger.Field("err", err))
return err
}
if issueCount > 0 {
@ -820,7 +820,7 @@ func (m *Order) Revert() error {
//err := orm.Eloquent.Table("order").Where("game_card_serial_number", m.GameCardSerialNumber).Find(&gameCardGoods).Error
err = orm.Eloquent.Table("game_card_goods").Where("serial_number", serialNumber).Find(&gameCardGoods).Error
if err != nil {
logger.Errorf("err:%#v", err)
logger.Errorf("err:%#v", logger.Field("err", err))
return err
}
@ -841,7 +841,7 @@ func (m *Order) Revert() error {
// "revert_time": time.Now(),
// }).Error
// if err != nil {
// logger.Errorf("err:", err)
// logger.Errorf("err:",logger.Field("err",err))
// return err
// }
// return nil
@ -863,7 +863,7 @@ func (m *Order) Revert() error {
}).Error
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return err
}
@ -877,7 +877,7 @@ func (m *Order) Revert() error {
fmt.Println("sqlStore:", sqlStore)
err = orm.Eloquent.Exec(sqlStore).Error
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return err
}
@ -885,7 +885,7 @@ func (m *Order) Revert() error {
err := orm.Eloquent.Table("game_card_goods_stock").Where("store_id", m.RevertStoreId).
Where("game_card_id", gameCardGoods.GameCardId).Count(&count).Error
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return err
}
if count == 0 && (gameCardGoods.Status != 7 || gameCardGoods.FunctionState != 1) {
@ -900,7 +900,7 @@ func (m *Order) Revert() error {
}
err := orm.Eloquent.Create(goodsStock).Error
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return err
}
return nil
@ -912,7 +912,7 @@ func (m *Order) Revert() error {
fmt.Println("sql:", sql)
err = orm.Eloquent.Exec(sql).Error
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return err
}
}
@ -925,7 +925,7 @@ func (m *Order) Revert() error {
fmt.Println("sqlStore:", sqlStore)
err = orm.Eloquent.Exec(sqlStore).Error
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return err
}
if gameCardGoods.Status != 7 || gameCardGoods.FunctionState != 1 {
@ -936,7 +936,7 @@ func (m *Order) Revert() error {
fmt.Println("sql:", sql)
err = orm.Eloquent.Exec(sql).Error
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return err
}
}
@ -949,7 +949,7 @@ func (m *Order) Revert() error {
sql := fmt.Sprintf("UPDATE game_card SET order_count = order_count+1 WHERE id = %d", order.GameCardId)
err := orm.Eloquent.Exec(sql).Error
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return err
}
}
@ -965,7 +965,7 @@ func (m *Order) Revert() error {
"revert_shopper_code": m.RevertShopperCode,
}).Error
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return err
}
var count int64
@ -973,7 +973,7 @@ func (m *Order) Revert() error {
Where("card_status in (?)", []uint32{1, 2, 3}).Count(&count).Error
//NewOrderCardQuerySet(DB).OrderIdEq(order.ID).CardStatusIn(1, 2, 3).Count()
if err != nil {
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
return err
}
if count == 0 {
@ -981,7 +981,7 @@ func (m *Order) Revert() error {
"card_status": OrderCardStatusCompleted,
}).Error
if err != nil {
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
return err
}
}
@ -995,7 +995,7 @@ func (m *Order) Revert() error {
fmt.Println("sql:", sql)
err = begin.Exec(sql).Error
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return err
}
return nil
@ -1003,13 +1003,13 @@ func (m *Order) Revert() error {
//orderCard.StoreId
err = eg.Wait()
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return err
}
err = begin.Commit().Error
if err != nil {
begin.Rollback()
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
return err
}
@ -1020,7 +1020,7 @@ func (*ExpressCompany) List() ([]ExpressCompany, error) {
companys := make([]ExpressCompany, 0)
err := orm.Eloquent.Table("express_company").Order("id desc").Find(&companys).Error
if err != nil && err != RecordNotFound {
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
return companys, err
}
return companys, nil
@ -1029,7 +1029,7 @@ func (*ExpressCompany) List() ([]ExpressCompany, error) {
func (m *Order) Del() error {
err := orm.Eloquent.Table("order").Where("id", m.ID).Delete(m).Error
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return err
}
@ -1040,7 +1040,7 @@ func (m *Order) Refund() error {
var order Order
err := orm.Eloquent.Table("order").Where("id", m.ID).Find(&order).Error
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return err
}
if order.CardStatus != OrderCardStatusCancel || order.PayStatus != PayStatusPaid {
@ -1049,7 +1049,7 @@ func (m *Order) Refund() error {
}
err = orm.Eloquent.Table("order").Where("id", m.ID).Update("card_status", OrderCardStatusRefund).Error
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return err
}
@ -1074,7 +1074,7 @@ func WxPayTransactionOrderClose(outTradeNo string) error {
mchPrivateKey, err := wechatpayutils.LoadPrivateKeyWithPath(privatePath)
if err != nil {
//log.Fatal("load merchant private key error")
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
}
ctx := context.Background()
@ -1084,8 +1084,8 @@ func WxPayTransactionOrderClose(outTradeNo string) error {
}
client, err := core.NewClient(ctx, opts...)
if err != nil {
//log.Fatalf("new wechat pay client err:%s", err)
logger.Errorf("err:", err)
//log.Fatalf("new wechat pay client err:%s",logger.Field("err",err))
logger.Errorf("err:", logger.Field("err", err))
}
// 发送请求，以下载微信支付平台证书为例
@ -1093,11 +1093,11 @@ func WxPayTransactionOrderClose(outTradeNo string) error {
svc := certificates.CertificatesApiService{Client: client}
resp, result, err := svc.DownloadCertificates(context.Background())
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return err
}
//log.Printf("status=%d resp=%s", result.Response.StatusCode, resp)
logger.Infof("status=%d resp=%s", result.Response.StatusCode, resp)
logger.Info("WxPayTransactionOrderClose", logger.Field("status", result.Response.StatusCode), logger.Field("resp", resp))
svcClient := jsapi.JsapiApiService{Client: client}
apiResult, err := svcClient.CloseOrder(ctx, jsapi.CloseOrderRequest{
@ -1105,8 +1105,8 @@ func WxPayTransactionOrderClose(outTradeNo string) error {
Mchid: &mchID,
})
if err != nil {
fmt.Println("err:", err)
logger.Error(err)
fmt.Println("err:", logger.Field("err", err))
logger.Error(err.Error())
return err
}
@ -1123,7 +1123,7 @@ func IsUserHaveUnreturnedOrders(uid uint32) (bool, error) {
//sql := fmt.Sprintf("SELECT COUNT(*) AS count FROM order_card WHERE uid = %d AND pay_status IN (1,2) AND card_status IN (1,2,3) ;", uid)
//count, err := NewOrderQuerySet(DB).UidEq(uint64(uid)).PayStatusEq(PayStatusPaid).CardStatusIn(1, 2, 3).Count()
//if err != nil {
// logger.Error("err:", err)
// logger.Error("err:",logger.Field("err",err))
// return false, err
//}
unreturned := &struct {
@ -1142,7 +1142,7 @@ func (m *Order) GetOrderCardMap() (map[string]OrderCard, error) {
//Where("uid=?", m.Uid).
Find(&orderCards).Error
if err != nil {
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
return cardMap, err
}
for i, _ := range orderCards {
@ -1160,7 +1160,7 @@ func (m *Order) GetOrderCardGameCardIdList() ([]OrderCard, error) {
//Where("serial_number=''").
Find(&orderCards).Error
if err != nil {
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
return orderCards, err
}
return orderCards, nil
@ -1198,12 +1198,12 @@ func OrderCardListSetGameInfo(list []OrderCard) []OrderCard {
fmt.Println("ids:", ids)
cardMap, err := GameCardMap(ids)
if err != nil {
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
return list
}
storeMap, err := RevertStoreMap(revertStoreIds)
if err != nil {
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
return list
}
@ -1233,7 +1233,7 @@ func GameCardMap(ids []uint32) (map[uint32]GameCard, error) {
var cards []GameCard
err := orm.Eloquent.Table("game_card").Where("id in (?)", ids).Find(&cards).Error
if err != nil {
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
return cardMap, err
}
if len(cards) == 0 {
@ -1253,7 +1253,7 @@ func RevertStoreMap(ids []uint32) (map[uint32]Store, error) {
var stores []Store
err := orm.Eloquent.Table("store").Where("id in (?)", ids).Find(&stores).Error
if err != nil {
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
return storeMap, err
}
if len(stores) == 0 {
@ -1268,7 +1268,7 @@ func RevertStoreMap(ids []uint32) (map[uint32]Store, error) {
func (m *ExpressNoInfo) SetStore() {
err := orm.Eloquent.Table("store").Where("id=?", m.StoreId).Find(m.Store).Error
if err != nil {
logger.Error("err:%s", err)
logger.Error("err:%s", logger.Field("err", err))
return
}
}
@ -1321,7 +1321,7 @@ func (m *FundRecordListReq) List() ([]FundRecord, int64, error) {
var count int64
err := qs.Count(&count).Error
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return fundRecords, 0, err
}
if m.PageSize == 0 {
@ -1335,7 +1335,7 @@ func (m *FundRecordListReq) List() ([]FundRecord, int64, error) {
}
err = qs.Order("created_at DESC").Offset(page * pageSize).Limit(pageSize).Find(&fundRecords).Error
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return fundRecords, 0, err
}
@ -1376,7 +1376,7 @@ func (m *CooperativeOrderReq) List() ([]Order, int64, error) {
Order("id DESC").Order("card_status ASC").Find(&orderCards).Error
//Where("card_status in (?)", []uint32{2, 3}).Order("id DESC").Order("card_status DESC").Limit(30).Find(&orderCards).Error
if err != nil {
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
return orders, 0, err
}
orderIds := make([]uint32, 0)
@ -1426,7 +1426,7 @@ func (m *CooperativeOrderReq) List() ([]Order, int64, error) {
var count int64
err := qs.Count(&count).Error
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return orders, 0, err
}
page := m.Page
@ -1437,7 +1437,7 @@ func (m *CooperativeOrderReq) List() ([]Order, int64, error) {
}
err = qs.Order("created_at DESC").Offset(page * pageSize).Limit(pageSize).Find(&orders).Error
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return orders, 0, err
}
@ -1453,7 +1453,7 @@ func (m *CooperativeOrderReq) List() ([]Order, int64, error) {
//var orderCards []OrderCard
err = orm.Eloquent.Table("order_card").Where("order_id in (?)", ids).Find(&orderCards).Error
if err != nil {
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
return orders, 0, err
}
orderCards = OrderCardListSetGameInfo(orderCards)

25
app/admin/models/recycle_card.go
View File

@ -9,8 +9,9 @@ import (
"time"
)
//go:generate goqueryset -in recycle_card.go
// gen:qs
//
//go:generate goqueryset -in recycle_card.go
type RecycleCardOrder struct {
Model
@ -106,7 +107,7 @@ func (m *RecycleCardOrderListReq) List() (RecycleCardOrderListRsp, error) {
if m.StartTime != "" {
parse, err := time.Parse(DateTimeFormat, m.StartTime)
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return rsp, err
}
qs = qs.Where("created_at > ?", parse)
@ -114,7 +115,7 @@ func (m *RecycleCardOrderListReq) List() (RecycleCardOrderListRsp, error) {
if m.EndTime != "" {
parse, err := time.Parse(DateTimeFormat, m.EndTime)
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return rsp, err
}
parse = parse.AddDate(0, 0, 1)
@ -123,7 +124,7 @@ func (m *RecycleCardOrderListReq) List() (RecycleCardOrderListRsp, error) {
if m.AuditStartTime != "" {
parse, err := time.Parse(DateTimeFormat, m.AuditStartTime)
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return rsp, err
}
qs = qs.Where("check_time > ?", parse)
@ -131,7 +132,7 @@ func (m *RecycleCardOrderListReq) List() (RecycleCardOrderListRsp, error) {
if m.AuditEndTime != "" {
parse, err := time.Parse(DateTimeFormat, m.AuditEndTime)
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return rsp, err
}
parse = parse.AddDate(0, 0, 1)
@ -142,7 +143,7 @@ func (m *RecycleCardOrderListReq) List() (RecycleCardOrderListRsp, error) {
err := orm.Eloquent.Table("store").Where("cooperative_business_id=?", m.CooperativeBusinessId).
Find(&stores).Error
if err != nil {
logger.Error("stores err:", err)
logger.Error("stores err:", logger.Field("err", err))
return rsp, err
}
storeIds := make([]uint32, 0, len(stores))
@ -157,7 +158,7 @@ func (m *RecycleCardOrderListReq) List() (RecycleCardOrderListRsp, error) {
var count int64
err := qs.Count(&count).Error
if err != nil {
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
return rsp, err
}
rsp.Count = count
@ -165,20 +166,20 @@ func (m *RecycleCardOrderListReq) List() (RecycleCardOrderListRsp, error) {
if m.IsExport == 1 {
err = qs.Order("id DESC").Find(&list).Error
if err != nil && err != RecordNotFound {
logger.Error("dailys err:", err)
logger.Error("dailys err:", logger.Field("err", err))
return rsp, err
}
RecycleCardOrderListSetStore(list)
listExport, err := RecycleCardOrderListExport(list)
if err != nil {
logger.Error("list export err:", err)
logger.Error("list export err:", logger.Field("err", err))
}
rsp.Url = listExport
} else {
err = qs.Order("id DESC").Offset(page * m.PageSize).Limit(m.PageSize).Find(&list).Error
//err = qs.OrderDescByID().Offset(page * m.PageSize).Limit(m.PageSize).All(&list)
if err != nil {
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
return rsp, err
}
RecycleCardOrderListSetStore(list)
@ -208,7 +209,7 @@ func RecycleCardOrderListExport(list []RecycleCardOrder) (string, error) {
var attributes []RecycleAttribute
err = json.Unmarshal([]byte(list[rowId].Attribute), &attributes)
if err != nil {
logger.Error("attributes err:", err)
logger.Error("attributes err:", logger.Field("err", err))
return "", err
}
desc := ""
@ -248,7 +249,7 @@ func RecycleCardOrderStateUpdate() {
// Where("created_at<?", time.Now().Add(time.Minute*(-5))).
// Update("state", 4).Error
if err != nil {
logger.Error("update recycle card order state err:", err)
logger.Error("update recycle card order state err:", logger.Field("err", err))
}
fmt.Println("取消超时订单完成...")
}

33
app/admin/models/redeem_code.go
View File

@ -37,8 +37,9 @@ const (
)
//go:generate goqueryset -in redeem_code.go
// gen:qs
//
//go:generate goqueryset -in redeem_code.go
type RedeemCode struct {
Model
SerialCode string `json:"serial_code" gorm:"index;comment:'兑换编码'"` // 兑换编码
@ -120,7 +121,7 @@ func (m *RedeemCodeListReq) RedeemCodeStockList() (*RedeemCodeListResp, error) {
var count int64
err := qs.Count(&count).Error
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return resp, err
}
resp.Count = int(count) + 1
@ -132,7 +133,7 @@ func (m *RedeemCodeListReq) RedeemCodeStockList() (*RedeemCodeListResp, error) {
var redeems []RedeemCode
err = qs.Order("id DESC").Offset(page * m.PageSize).Limit(m.PageSize).Find(&redeems).Error
if err != nil && err != RecordNotFound {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return resp, err
}
for i, _ := range redeems {
@ -186,7 +187,7 @@ func (m *UserRedeemCodeListReq) UserSendRedeemCodeList() (*UserRedeemCodeListRes
if m.ConvertStart != "" {
parse, err := time.Parse(DateTimeFormat, m.ConvertStart)
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return resp, err
}
qs = qs.Where("created_at >= ?", parse)
@ -194,7 +195,7 @@ func (m *UserRedeemCodeListReq) UserSendRedeemCodeList() (*UserRedeemCodeListRes
if m.ConvertEnd != "" {
parse, err := time.Parse(DateTimeFormat, m.ConvertEnd)
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return resp, err
}
qs = qs.Where("created_at <= ?", parse)
@ -203,7 +204,7 @@ func (m *UserRedeemCodeListReq) UserSendRedeemCodeList() (*UserRedeemCodeListRes
var count int64
err := qs.Count(&count).Error
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return resp, err
}
resp.Count = int(count)
@ -214,7 +215,7 @@ func (m *UserRedeemCodeListReq) UserSendRedeemCodeList() (*UserRedeemCodeListRes
var userRedeemCodes []UserRedeemCode
err = qs.Order("id DESC").Offset(page * m.PageSize).Limit(m.PageSize).Find(&userRedeemCodes).Error
if err != nil && err != RecordNotFound {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return resp, err
}
fmt.Println("userRedeemCodes:", len(userRedeemCodes))
@ -229,7 +230,7 @@ func CodeSendToUser(uid, storeId uint32, codeType string) error {
err := orm.Eloquent.Table("redeem_code").Where("status=?", RedeemCodeStatusStock).
Where("code_type=?", codeType).Order("id ASC").Limit(1).Find(&redeemCode).Error
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return err
}
memberRedeemCode := int64(0)
@ -237,16 +238,16 @@ func CodeSendToUser(uid, storeId uint32, codeType string) error {
Where("code_type in (?)", []string{CodeTypeMemberGoldMember, CodeTypeMemberPlatinumMember,
CodeTypeMemberBlackGoldMember}).Count(&memberRedeemCode).Error
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return err
}
if memberRedeemCode > 0 && codeType != CodeTypeMemberCard30 {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return errors.New("member_redeem_code_only")
}
userInfo, err := GetUserInfoByUid(uid)
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return err
}
if userInfo.MemberLevel != 1 && userInfo.MemberLevel != 3 && codeType != CodeTypeMemberCard30 {
@ -256,7 +257,7 @@ func CodeSendToUser(uid, storeId uint32, codeType string) error {
fmt.Println("CodeSendToUser uid:", uid)
_, err = IsUserInfoByUid(uid)
if err != nil {
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
return err
}
@ -265,7 +266,7 @@ func CodeSendToUser(uid, storeId uint32, codeType string) error {
sql := fmt.Sprintf("UPDATE redeem_code SET `status` ='%s',store_id=%d WHERE id =%d", RedeemCodeStatusHold, storeId, redeemCode.ID)
err = begin.Exec(sql).Error
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
begin.Rollback()
return err
}
@ -279,13 +280,13 @@ func CodeSendToUser(uid, storeId uint32, codeType string) error {
}
err = begin.Create(userRedeemCode).Error
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
begin.Rollback()
return err
}
err = begin.Commit().Error
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
begin.Rollback()
return err
}
@ -302,7 +303,7 @@ func UserRedeemCodeToInfo(userRedeems []UserRedeemCode) []UserRedeemCodeInfo {
var users []UserInfo
err := orm.Eloquent.Table("user").Where("uid in (?)", uids).Find(&users).Error
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return list
}

258
app/admin/models/share_card.go
View File

File diff suppressed because it is too large Load Diff

2
app/admin/models/shopper_promotion_code.go
View File

@ -28,7 +28,7 @@ func CheckCode(code string) bool {
Count(&c).
Error
if err != nil {
logger.Error("check code err", err)
logger.Error("check code err", logger.Field("err", err))
return false
}
return c > 0

24
app/admin/models/store.go
View File

@ -48,7 +48,7 @@ func (m *GetCooperativeStoreReq) List() ([]Store, int64, error) {
var sysUser SysUser
err := orm.Eloquent.Table("sys_user").Where("user_id=?", m.SysUid).Find(&sysUser).Error
if err != nil {
logger.Error("sys user err:", err)
logger.Error("sys user err:", logger.Field("err", err))
return stores, 0, err
}
m.CooperativeBusinessId = sysUser.CooperativeBusinessId
@ -77,12 +77,12 @@ func (m *GetCooperativeStoreReq) List() ([]Store, int64, error) {
var count int64
err := qs.Count(&count).Error
if err != nil {
logger.Error("count err:", err)
logger.Error("count err:", logger.Field("err", err))
return stores, count, err
}
err = qs.Order("id DESC").Offset(page * m.PageSize).Limit(m.PageSize).Find(&stores).Error
if err != nil && err != RecordNotFound {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return stores, count, err
}
stores = StoreListSetCooperativeAssistantMemberDeduct(stores)
@ -107,7 +107,7 @@ func (m *GetStoreReq) List() ([]Store, int64, error) {
// var sysUser SysUser
// err := orm.Eloquent.Table("sys_user").Where("user_id=?", m.SysUid).Find(&sysUser).Error
// if err != nil {
// logger.Error("sys user err:", err)
// logger.Error("sys user err:",logger.Field("err",err))
// return stores, 0, err
// }
// m.CooperativeBusinessId = sysUser.CooperativeBusinessId
@ -136,12 +136,12 @@ func (m *GetStoreReq) List() ([]Store, int64, error) {
var count int64
err := qs.Count(&count).Error
if err != nil {
logger.Error("count err:", err)
logger.Error("count err:", logger.Field("err", err))
return stores, count, err
}
err = qs.Order("id DESC").Offset(page * m.PageSize).Limit(m.PageSize).Find(&stores).Error
if err != nil && err != RecordNotFound {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return stores, count, err
}
stores = StoreListSetCooperativeAssistantMemberDeduct(stores)
@ -156,7 +156,7 @@ func StoreListSetCooperativeAssistantMemberDeduct(list []Store) []Store {
memberDeductMap, err := GetCooperativeAssistantMemberDeductMap(ids)
if err != nil {
logger.Error("cooperative assistant member deduct map err:", err)
logger.Error("cooperative assistant member deduct map err:", logger.Field("err", err))
return list
}
for i, _ := range list {
@ -171,7 +171,7 @@ func StoreListSetCooperativeAssistantMemberDeduct(list []Store) []Store {
func (m *Store) Add() error {
err := orm.Eloquent.Create(m).Error
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return err
}
return nil
@ -182,7 +182,7 @@ func (m *Store) Modify() error {
if len(para) > 0 {
err := orm.Eloquent.Table(m.TableName()).Unscoped().Where("id", m.ID).Updates(para).Error
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return err
}
}
@ -225,7 +225,7 @@ func (m *Store) getModifyPara() map[string]interface{} {
func (m *Store) MDel(ids []uint32) error {
err := orm.Eloquent.Table(m.TableName()).Unscoped().Where("id in (?)", ids).Delete(m).Error
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return err
}
return nil
@ -235,7 +235,7 @@ func GetStore(id uint32) (*Store, error) {
var store Store
err := orm.Eloquent.Table("store").Where("id=?", id).Find(&store).Error
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return &store, err
}
return &store, nil
@ -246,7 +246,7 @@ func GetStoreIdsByCooperativeBusinessId(id uint32) ([]uint32, error) {
var stores []Store
err := orm.Eloquent.Table("store").Where("cooperative_business_id=?", id).Find(&stores).Error
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return ids, err
}

4
app/admin/models/supplier.go
View File

@ -37,7 +37,7 @@ func (s *Supplier) BeforeCreate(tx *gorm.DB) error {
var partnerCount int64
err := tx.Table(s.TableName()).Unscoped().Count(&partnerCount).Error
if err != nil {
logger.Error("get supplier count failed", err, s)
logger.Error("get supplier count failed", logger.Field("err", err), logger.Field("s", s))
return err
}
s.Number = fmt.Sprintf("%03d", partnerCount)
@ -66,7 +66,7 @@ func GetSupplier(req GetSupplierRequest) ([]*Supplier, error) {
Find(&list).
Error
if err != nil {
logger.Error("GetSupplierByPartner err:", err)
logger.Error("get supplier list err", logger.Field("err", err), logger.Field("req", req))
return nil, err
}

210
app/admin/models/user.go
View File

@ -256,7 +256,7 @@ func GetUserList(page, pageSize, uid, memberLevel, storeId, userType, cooperativ
if startTime != "" {
parse, err := time.Parse(DateTimeFormat, startTime)
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return users, 0, 0, err
}
qs = qs.Where("created_at > ?", parse)
@ -264,7 +264,7 @@ func GetUserList(page, pageSize, uid, memberLevel, storeId, userType, cooperativ
if endTime != "" {
parse, err := time.Parse(DateTimeFormat, endTime)
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return users, 0, 0, err
}
qs = qs.Where("created_at < ?", parse)
@ -276,7 +276,7 @@ func GetUserList(page, pageSize, uid, memberLevel, storeId, userType, cooperativ
var count int64
err := qs.Count(&count).Error
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return users, 0, 0, err
}
@ -305,7 +305,7 @@ func GetUserList(page, pageSize, uid, memberLevel, storeId, userType, cooperativ
err = qs.Order(fmt.Sprintf("%s %s", sortFiled, sortType)).Offset(page * pageSize).Limit(pageSize).Find(&users).Error
if err != nil && err != RecordNotFound {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return users, 0, 0, err
}
@ -358,7 +358,7 @@ func GetUserInfoMap(uids []uint32) (map[uint32]UserInfo, error) {
var userInfos []UserInfo
err := orm.Eloquent.Table("user").Where("uid in (?)", uids).Find(&userInfos).Error
if err != nil {
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
return userInfoMap, err
}
@ -372,7 +372,7 @@ func (m *CommonProblem) List() ([]CommonProblem, error) {
commons := make([]CommonProblem, 0)
err := orm.Eloquent.Table("common_problem").Order("sort desc").Find(&commons).Error
if err != nil {
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
return commons, err
}
@ -382,7 +382,7 @@ func (m *CommonProblem) List() ([]CommonProblem, error) {
func (m *CommonProblem) Add() error {
err := orm.Eloquent.Table("common_problem").Create(m).Error
if err != nil {
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
return err
}
@ -392,7 +392,7 @@ func (m *CommonProblem) Add() error {
func (m *CommonProblem) Modify() error {
err := orm.Eloquent.Table("common_problem").Save(m).Error
if err != nil {
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
return err
}
@ -402,7 +402,7 @@ func (m *CommonProblem) Modify() error {
func (m *CommonProblem) Del() error {
err := orm.Eloquent.Table("common_problem").Where("id", m.ID).Delete(m).Error
if err != nil {
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
return err
}
@ -492,7 +492,7 @@ func (m *UserInviteListReq) InviteList() ([]UserInfo, int, error) {
if m.StartTime != "" {
parse, err := time.Parse(DateTimeFormat, m.StartTime)
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return users, 0, err
}
if m.MemberType == 2 {
@ -504,7 +504,7 @@ func (m *UserInviteListReq) InviteList() ([]UserInfo, int, error) {
if m.EndTime != "" {
parse, err := time.Parse(DateTimeFormat, m.EndTime)
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return users, 0, err
}
parse = parse.AddDate(0, 0, 1)
@ -518,13 +518,13 @@ func (m *UserInviteListReq) InviteList() ([]UserInfo, int, error) {
var count int64
err := qs.Count(&count).Error
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return users, 0, err
}
err = qs.Order("id DESC").Offset(page * pageSize).Limit(pageSize).Find(&userInvites).Error
if err != nil && err != RecordNotFound {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return users, 0, err
}
@ -539,7 +539,7 @@ func (m *UserInviteListReq) InviteList() ([]UserInfo, int, error) {
err = orm.Eloquent.Table("user").Debug().Where("uid in (?)", uids).Find(&users).Error
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return users, 0, err
}
fmt.Println("totalPage", totalPage)
@ -596,7 +596,7 @@ func ExportUserMember(storeId uint32, startTime, endTime string) string {
if startTime != "" {
parse, err := time.Parse(DateTimeFormat, startTime)
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return ""
}
qs = qs.Where("member_open_time > ?", parse)
@ -604,7 +604,7 @@ func ExportUserMember(storeId uint32, startTime, endTime string) string {
if endTime != "" {
parse, err := time.Parse(DateTimeFormat, endTime)
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return ""
}
parse = parse.AddDate(0, 0, 1)
@ -613,7 +613,7 @@ func ExportUserMember(storeId uint32, startTime, endTime string) string {
err := qs.Order("id DESC,store_id DESC,from_uid DESC").Find(&userInvites).Error
if err != nil && err != RecordNotFound {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return ""
}
@ -629,7 +629,7 @@ func ExportUserMember(storeId uint32, startTime, endTime string) string {
var stores []Store
err = orm.Eloquent.Table("store").Where("id in (?)", storeIds).Find(&stores).Error
if err != nil {
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
return ""
}
storeMap := make(map[uint32]Store)
@ -641,7 +641,7 @@ func ExportUserMember(storeId uint32, startTime, endTime string) string {
var userInfos []UserInfo
err = orm.Eloquent.Table("user").Where("uid in (?)", fromUids).Find(&userInfos).Error
if err != nil {
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
return ""
}
userInfoMap := make(map[uint32]UserInfo, 0)
@ -694,7 +694,7 @@ func ExportUserMember(storeId uint32, startTime, endTime string) string {
//headline := []string{"门店名称", "店员id", "店员昵称","姓名", "会员id", "会员昵称", "注册会员时间", "会员状态"}
headline := []string{"门店名称", "店员id", "姓名", "会员id", "会员昵称", "会员等级", "会员手机号", "注册会员时间", "会员状态"}
if err := w.Write(headline); err != nil {
log.Fatalln("error writing record to csv:", err)
log.Fatalln("error writing record to csv:", logger.Field("err", err))
}
for _, invite := range inviteMembers {
@ -705,7 +705,7 @@ func ExportUserMember(storeId uint32, startTime, endTime string) string {
invite.ToUserInfo.Tel, invite.UserInvite.MemberOpenTime.Format("2006-01-02 15:04:05"),
GetUserInviteStatus(invite.MemberStatus)}
if err := w.Write(record); err != nil {
log.Fatalln("error writing record to csv:", err)
log.Fatalln("error writing record to csv:", logger.Field("err", err))
}
}
@ -748,7 +748,7 @@ func (m *UserInviteRecordReq) List() ([]UserInviteRecord, int64, error) {
var records []UserInviteRecord
err := UpdateUserInviteRecordRenewHide()
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return records, 0, err
}
@ -801,13 +801,13 @@ func (m *UserInviteRecordReq) List() ([]UserInviteRecord, int64, error) {
var count int64
err = qs.Count(&count).Error
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return records, 0, err
}
err = qs.Order("action_time DESC").Offset(page * pageSize).Limit(pageSize).Find(&records).Error
if err != nil && err != RecordNotFound {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return records, 0, err
}
return records, count, nil
@ -816,7 +816,7 @@ func (m *UserInviteRecordReq) List() ([]UserInviteRecord, int64, error) {
func UpdateUserInviteRecordRenewHide() error {
err := orm.Eloquent.Exec("UPDATE user_invite_record SET renew_hide=1 WHERE spend_type=3 AND scan=0 AND renew_hide!=1;").Error
if err != nil {
logger.Errorf("update renew_hide err:", err)
logger.Errorf("update renew_hide err:", logger.Field("err", err))
return err
}
@ -840,7 +840,7 @@ func UpdateUserInviteRecordRenewHide() error {
// if startTime != "" {
// parse, err := time.Parse(DateTimeFormat, startTime)
// if err != nil {
// logger.Errorf("err:", err)
// logger.Errorf("err:",logger.Field("err",err))
// return ""
// }
// qs = qs.Where("member_open_time > ?", parse)
@ -848,7 +848,7 @@ func UpdateUserInviteRecordRenewHide() error {
// if endTime != "" {
// parse, err := time.Parse(DateTimeFormat, endTime)
// if err != nil {
// logger.Errorf("err:", err)
// logger.Errorf("err:",logger.Field("err",err))
// return ""
// }
// parse = parse.AddDate(0, 0, 1)
@ -857,7 +857,7 @@ func UpdateUserInviteRecordRenewHide() error {
//
// err := qs.Order("id DESC,store_id DESC,from_uid DESC").Find(&userInvites).Error
// if err != nil && err != RecordNotFound {
// logger.Errorf("err:", err)
// logger.Errorf("err:",logger.Field("err",err))
// return ""
// }
//
@ -873,7 +873,7 @@ func UpdateUserInviteRecordRenewHide() error {
// var stores []Store
// err = orm.Eloquent.Table("store").Where("id in (?)", storeIds).Find(&stores).Error
// if err != nil {
// logger.Error("err:", err)
// logger.Error("err:",logger.Field("err",err))
// return ""
// }
// storeMap := make(map[uint32]Store)
@ -885,7 +885,7 @@ func UpdateUserInviteRecordRenewHide() error {
// var userInfos []UserInfo
// err = orm.Eloquent.Table("user").Where("uid in (?)", fromUids).Find(&userInfos).Error
// if err != nil {
// logger.Error("err:", err)
// logger.Error("err:",logger.Field("err",err))
// return ""
// }
// userInfoMap := make(map[uint32]UserInfo, 0)
@ -938,7 +938,7 @@ func UpdateUserInviteRecordRenewHide() error {
// //headline := []string{"门店名称", "店员id", "店员昵称","姓名", "会员id", "会员昵称", "注册会员时间", "会员状态"}
// headline := []string{"门店名称", "店员id", "姓名", "会员id", "会员昵称", "会员等级", "注册会员时间", "会员状态"}
// if err := w.Write(headline); err != nil {
// log.Fatalln("error writing record to csv:", err)
// log.Fatalln("error writing record to csv:",logger.Field("err",err))
// }
//
// for _, invite := range inviteMembers {
@ -948,7 +948,7 @@ func UpdateUserInviteRecordRenewHide() error {
// fmt.Sprintf("%d", invite.ToUserInfo.Uid), invite.ToUserInfo.WxName, MemberLevelToString(invite.UserInvite.MemberLevel), invite.UserInvite.MemberOpenTime.Format("2006-01-02 15:04:05"),
// GetUserInviteStatus(invite.MemberStatus)}
// if err := w.Write(record); err != nil {
// log.Fatalln("error writing record to csv:", err)
// log.Fatalln("error writing record to csv:",logger.Field("err",err))
// }
// }
//
@ -978,7 +978,7 @@ func ExportUserMemberList(storeId, memberType, cooperativeId uint32, startTime,
if startTime != "" {
parse, err := time.Parse(DateTimeFormat, startTime)
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return ""
}
//qs = qs.Where("created_at > ?", parse)
@ -987,7 +987,7 @@ func ExportUserMemberList(storeId, memberType, cooperativeId uint32, startTime,
if endTime != "" {
parse, err := time.Parse(DateTimeFormat, endTime)
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return ""
}
parse = parse.AddDate(0, 0, 1)
@ -1001,7 +1001,7 @@ func ExportUserMemberList(storeId, memberType, cooperativeId uint32, startTime,
err := qs.Order("id DESC,store_id DESC,uid DESC").Find(&userInfos).Error
//err := qs.Order("id DESC").Find(&userInfos).Error
if err != nil && err != RecordNotFound {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return ""
}
@ -1017,7 +1017,7 @@ func ExportUserMemberList(storeId, memberType, cooperativeId uint32, startTime,
//var stores []Store
//err = orm.Eloquent.Table("store").Where("id in (?)", storeIds).Find(&stores).Error
//if err != nil {
// logger.Error("err:", err)
// logger.Error("err:",logger.Field("err",err))
// return ""
//}
//storeMap := make(map[uint32]Store)
@ -1036,7 +1036,7 @@ func ExportUserMemberList(storeId, memberType, cooperativeId uint32, startTime,
}
err = inviteQs.Find(&userInvites).Error
if err != nil {
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
return ""
}
@ -1049,7 +1049,7 @@ func ExportUserMemberList(storeId, memberType, cooperativeId uint32, startTime,
var fromUserInfos []UserInfo
err = orm.Eloquent.Table("user").Where("uid in (?)", fromUids).Find(&fromUserInfos).Error
if err != nil {
logger.Error("from user infos err:", err)
logger.Error("from user infos err:", logger.Field("err", err))
return ""
}
fromUserMap := make(map[uint32]UserInfo, 0)
@ -1071,7 +1071,7 @@ func ExportUserMemberList(storeId, memberType, cooperativeId uint32, startTime,
isRenewal = true
parse, err := time.Parse(DateTimeFormat, renewalStartTime)
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return ""
}
//qs = qs.Where("created_at > ?", parse)
@ -1081,7 +1081,7 @@ func ExportUserMemberList(storeId, memberType, cooperativeId uint32, startTime,
isRenewal = true
parse, err := time.Parse(DateTimeFormat, renewalEndTime)
if err != nil {
logger.Errorf("err:", err)
logger.Errorf("err:", logger.Field("err", err))
return ""
}
parse = parse.AddDate(0, 0, 1)
@ -1090,7 +1090,7 @@ func ExportUserMemberList(storeId, memberType, cooperativeId uint32, startTime,
}
err = qsInviteRecords.Order("id ASC").Find(&inviteRecords).Error
if err != nil {
logger.Error("invite record err:", err)
logger.Error("invite record err:", logger.Field("err", err))
return ""
}
@ -1178,7 +1178,7 @@ func ExportUserMemberList(storeId, memberType, cooperativeId uint32, startTime,
} else {
store, err := GetStore(storeId)
if err != nil {
logger.Error("get store err:", err)
logger.Error("get store err:", logger.Field("err", err))
return ""
}
fileName = store.Name
@ -1264,15 +1264,15 @@ func ExportUserMemberList(storeId, memberType, cooperativeId uint32, startTime,
//}
styleBorderId, err := file.NewStyle(styleBorder)
if err != nil {
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
}
styleFillId1, err := file.NewStyle(styleFill1)
if err != nil {
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
}
styleFillId2, err := file.NewStyle(styleFill2)
if err != nil {
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
}
//headline := []string{"门店名称", "店员id", "店员姓名", "用户注册时间", "最近登录时间", "会员id", "会员昵称", "用户手机号", "会员等级", "注册会员时间", "会员状态"}
headline := []interface{}{"门店名称", "店员id", "店员姓名", "店员门店", "用户注册时间", "最近登录时间", "用户id", "用户昵称", "用户手机号", "会员等级", "注册会员时间",
@ -1286,41 +1286,41 @@ func ExportUserMemberList(storeId, memberType, cooperativeId uint32, startTime,
cell, _ := excelize.CoordinatesToCellName(1+i, 1)
err = file.SetCellValue(fSheet, cell, headline[i])
if err != nil {
logger.Error("file set value err:", err)
logger.Error("file set value err:", logger.Field("err", err))
}
idx := i
if cooperativeId == 0 {
if idx+1 > 11 && idx+1 <= 14 {
err = file.SetCellStyle(fSheet, cell, cell, styleFillId1)
if err != nil {
logger.Error("file set value err:", err)
logger.Error("file set value err:", logger.Field("err", err))
}
} else if idx+1 > 14 && idx+1 <= 17 {
err = file.SetCellStyle(fSheet, cell, cell, styleFillId2)
if err != nil {
logger.Error("file set value err:", err)
logger.Error("file set value err:", logger.Field("err", err))
}
} else {
err = file.SetCellStyle(fSheet, cell, cell, styleBorderId)
if err != nil {
logger.Error("file set value err:", err)
logger.Error("file set value err:", logger.Field("err", err))
}
}
} else {
if idx+1 > 9 && idx+1 <= 12 {
err = file.SetCellStyle(fSheet, cell, cell, styleFillId1)
if err != nil {
logger.Error("file set value err:", err)
logger.Error("file set value err:", logger.Field("err", err))
}
} else if idx+1 > 12 && idx+1 <= 15 {
err = file.SetCellStyle(fSheet, cell, cell, styleFillId2)
if err != nil {
logger.Error("file set value err:", err)
logger.Error("file set value err:", logger.Field("err", err))
}
} else {
err = file.SetCellStyle(fSheet, cell, cell, styleBorderId)
if err != nil {
logger.Error("file set value err:", err)
logger.Error("file set value err:", logger.Field("err", err))
}
}
}
@ -1377,12 +1377,12 @@ func ExportUserMemberList(storeId, memberType, cooperativeId uint32, startTime,
cell, _ := excelize.CoordinatesToCellName(1+i, rowId+2)
err = file.SetCellValue(fSheet, cell, record[i])
if err != nil {
logger.Error("file set value err:", err)
logger.Error("file set value err:", logger.Field("err", err))
}
err = file.SetCellStyle(fSheet, cell, cell, styleBorderId)
if err != nil {
logger.Error("file set value err:", err)
logger.Error("file set value err:", logger.Field("err", err))
}
}
//if err := streamWriter.SetRow(cell, record); err != nil {
@ -1435,7 +1435,7 @@ func IsUserInfoByUid(uid uint32) (bool, error) {
var count int64
err := orm.Eloquent.Debug().Table("user").Where("uid = ?", uid).Count(&count).Error
if err != nil {
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
return false, err
}
if count == 0 {
@ -1449,7 +1449,7 @@ func GetUserInfoByUid(uid uint32) (UserInfo, error) {
var userInfo UserInfo
err := orm.Eloquent.Debug().Table("user").Where("uid = ?", uid).Find(&userInfo).Error
if err != nil {
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
return userInfo, err
}
return userInfo, nil
@ -1487,7 +1487,7 @@ func (m *UserDepositRefundRecordListReq) DepositRefundRecordList() (*UserDeposit
var count int64
err := qs.Count(&count).Error
if err != nil {
logger.Error("count err:", err)
logger.Error("count err:", logger.Field("err", err))
return resp, err
}
resp.Count = uint32(count)
@ -1495,7 +1495,7 @@ func (m *UserDepositRefundRecordListReq) DepositRefundRecordList() (*UserDeposit
var depositRefunds []DepositRefundRecord
err = qs.Order("status ASC").Order("id DESC").Offset(page * m.PageSize).Limit(m.PageSize).Find(&depositRefunds).Error
if err != nil {
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
return resp, err
}
@ -1536,7 +1536,7 @@ func (m *GroupSendMessageCreateTemplateListReq) List() (*GroupSendMessageCreateT
var count int64
err := qs.Count(&count).Error
if err != nil {
logger.Error("count err:", err)
logger.Error("count err:", logger.Field("err", err))
return resp, err
}
resp.Count = uint32(count)
@ -1544,7 +1544,7 @@ func (m *GroupSendMessageCreateTemplateListReq) List() (*GroupSendMessageCreateT
var groupSends []GroupSendMessageTemplate
err = qs.Order("id DESC").Offset(page * m.PageSize).Limit(m.PageSize).Find(&groupSends).Error
if err != nil && err != RecordNotFound {
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
return resp, err
}
resp.List = groupSends
@ -1560,7 +1560,7 @@ func CreateInviteMemberReport() {
var cooperatives []CooperativeBusiness
err := orm.Eloquent.Table("cooperative_business").Find(&cooperatives).Error
if err != nil {
logger.Error("cooperative err:", err)
logger.Error("cooperative err:", logger.Field("err", err))
return
}
for i, _ := range cooperatives {
@ -1572,7 +1572,7 @@ func (m *CooperativeBusiness) InviteMemberReport() {
var users []UserInfo
err := orm.Eloquent.Table("user").Where("cooperative_business_id=?", m.ID).Where("user_type=2").Find(&users).Error
if err != nil {
logger.Error("cooperative err:", err)
logger.Error("cooperative err:", logger.Field("err", err))
return
}
for i, _ := range users {
@ -1591,7 +1591,7 @@ func (m *CooperativeBusiness) UserInviteReport(userInfo UserInfo) {
//qs = qs.Where("action=2").Where("spend_type=2")
//err := qs.Find(&userInvites).Error
//if err != nil && err != RecordNotFound {
// logger.Error("cooperative err:", err)
// logger.Error("cooperative err:",logger.Field("err",err))
// return
//}
//reportTime := start.Format("2006-01")
@ -1605,7 +1605,7 @@ func (m *CooperativeBusiness) UserInviteReport(userInfo UserInfo) {
"SELECT * FROM invite_member_report WHERE cooperative_business_id=%d AND date='%s' AND store_id=%d AND uid=%d",
userInfo.CooperativeBusinessId, reportTime, userInfo.StoreId, userInfo.Uid))
if err != nil {
logger.Error("cooperative member promotion record exist err:", err)
logger.Error("cooperative member promotion record exist err:", logger.Field("err", err))
return
}
report := &InviteMemberReport{
@ -1639,7 +1639,7 @@ func (m *CooperativeBusiness) UserInviteReport(userInfo UserInfo) {
if exist {
//err = orm.Eloquent.Save(report).Error
//if err != nil {
// logger.Error("invite member report err:", err)
// logger.Error("invite member report err:",logger.Field("err",err))
//}
logger.Error("member report exist ")
return
@ -1648,14 +1648,14 @@ func (m *CooperativeBusiness) UserInviteReport(userInfo UserInfo) {
//if len(userInvites) == 0 {
// err = orm.Eloquent.Create(report).Error
// if err != nil {
// logger.Error("Create report err:", err)
// logger.Error("Create report err:",logger.Field("err",err))
// }
// return
//}
err = orm.Eloquent.Create(report).Error
if err != nil {
logger.Error("Create report err:", err)
logger.Error("Create report err:", logger.Field("err", err))
}
}
@ -1664,7 +1664,7 @@ func GetSysUser(suid interface{}) (SysUser, error) {
var sUser SysUser
err := orm.Eloquent.Table("sys_user").Where(fmt.Sprintf("user_id=%.0f", suid.(float64))).Find(&sUser).Error
if err != nil {
logger.Error("invite member report err:", err)
logger.Error("invite member report err:", logger.Field("err", err))
return sUser, err
}
@ -1686,7 +1686,7 @@ func (m *AssistantInviteMemberReportReq) List() ([]InviteMemberReport, int64, er
var users []UserInfo
err := orm.Eloquent.Table("user").Where("user_type=2").Where("shop_assistant_name=''").Find(&users).Error
if err != nil {
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
return memberReport, 0, err
}
uids := make([]uint32, 0, len(users))
@ -1713,7 +1713,7 @@ func (m *AssistantInviteMemberReportReq) List() ([]InviteMemberReport, int64, er
var count int64
err = qs.Count(&count).Error
if err != nil {
logger.Error("count err:", err)
logger.Error("count err:", logger.Field("err", err))
return memberReport, 0, err
}
page := m.Page - 1
@ -1727,7 +1727,7 @@ func (m *AssistantInviteMemberReportReq) List() ([]InviteMemberReport, int64, er
err = qs.Order("store_id DESC,id DESC").Offset(page * m.PageSize).Limit(m.PageSize).Find(&memberReport).Error
if err != nil && err != RecordNotFound {
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
return memberReport, count, err
}
@ -1763,7 +1763,7 @@ func InviteMemberReportListSetUser(list []InviteMemberReport) []InviteMemberRepo
infoMap, err := GetUserInfoMap(ids)
if err != nil {
logger.Error("user info map err:", err)
logger.Error("user info map err:", logger.Field("err", err))
return list
}
@ -1789,7 +1789,7 @@ func InviteMemberReportListSetStore(list []InviteMemberReport) []InviteMemberRep
storeMap := GetStoreMapByIds(ids)
//infoMap, err := GetUserInfoMap(ids)
//if err != nil {
// logger.Error("user info map err:", err)
// logger.Error("user info map err:",logger.Field("err",err))
// return list
//}
@ -1814,7 +1814,7 @@ func GetCooperativeBusinessId(c *gin.Context) (uint32, error) {
}
sysUser, err := GetSysUser(sysUid)
if err != nil {
logger.Error("sys user err:", err)
logger.Error("sys user err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "查询失败")
return 0, err
}
@ -1832,7 +1832,7 @@ func GetSysUserByCtx(c *gin.Context) (*SysUser, error) {
//}
//sysUser, err := GetSysUser(sysUid)
//if err != nil {
// logger.Error("sys user err:", err)
// logger.Error("sys user err:",logger.Field("err",err))
// app.Error(c, http.StatusInternalServerError, err, "查询失败")
// return nil, err
//}
@ -1851,7 +1851,7 @@ func GetSysUserByCtx(c *gin.Context) (*SysUser, error) {
var sysUser SysUser
err := orm.Eloquent.Table("sys_user").Where("user_id=?", uint32(sysUid)).Find(&sysUser).Error
if err != nil {
logger.Error("sys user err:", err)
logger.Error("sys user err:", logger.Field("err", err))
app.Error(c, http.StatusInternalServerError, err, "操作失败")
return &sysUser, err
}
@ -1892,14 +1892,14 @@ func (o *UserOpenMemberRecord) TableName() string {
func (m *UserOpenMemberRecord) Refund(outTradeNo string, amount uint32) error {
configInfo, err := PayConfigInfo()
if err != nil {
logger.Error("config info err:", err)
logger.Error("config info err:", logger.Field("err", err))
return err
}
//configInfo.NotifyUrl = "https://dev.switch.deovo.com:8004/api/v1/wxpay_refund/notice"
err = orm.Eloquent.Create(m).Error
//err = m.Insert()
if err != nil {
logger.Error("insert user open member record err:", err)
logger.Error("insert user open member record err:", logger.Field("err", err))
return err
}
@ -1915,7 +1915,7 @@ func (m *UserOpenMemberRecord) Refund(outTradeNo string, amount uint32) error {
}
err = pay.TransactionOrderRefund(orderRefund)
if err != nil {
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
return err
}
@ -1934,7 +1934,7 @@ func (m *UserOpenMemberRecord) MallGoodsOrderRefund(outTradeNo string) error {
err := m.Refund(outTradeNo, m.GoodsOrder.Rm)
if err != nil {
logger.Error("refund err:", err)
logger.Error("refund err:", logger.Field("err", err))
return err
}
@ -1950,7 +1950,7 @@ func GetOrderSn() string {
err := orm.Eloquent.Table("user_open_member_record").Where("open_no=?", orderSn).Count(&count)
//count, err := NewUserOpenMemberRecordQuerySet(DB).OpenNoEq(orderSn).Count()
if err != nil {
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
}
if count == 0 {
break
@ -1962,7 +1962,7 @@ func GetOrderSn() string {
func (m *OperationLog) AddLog() {
defer func() {
if err := recover(); err != nil {
fmt.Println("recover err:", err)
fmt.Println("recover err:", logger.Field("err", err))
}
}()
go func() {
@ -1983,7 +1983,7 @@ func SendMessageMemberRenewal() {
//var users []UserInfo
//err := orm.Eloquent.Table("user").Where("member_level IN (2,4,5)").Where("member_expire < ?", end).Find(&users).Error
//if err != nil {
// logger.Error("cooperative err:", err)
// logger.Error("cooperative err:",logger.Field("err",err))
// return
//}
fmt.Println("发送续费短息开始:")
@ -1994,7 +1994,7 @@ func SendMessageMemberRenewal() {
err := orm.Eloquent.Table("user").Where("member_level IN (2,4,5)").
Where("member_expire>?", start).Where("member_expire<?", end).Find(&users).Error
if err != nil {
logger.Error("cooperative err:", err)
logger.Error("cooperative err:", logger.Field("err", err))
return
}
@ -2011,14 +2011,14 @@ func SendMessageMemberRenewal() {
message := "【迪为】提醒：您的租卡会员时长仅剩余一个月，现在续费最高立减200元！赶快进入小程序领取优惠吧~"
err = GtSendMessage(tels, message)
if err != nil {
logger.Errorf("SmsSend err:", err)
logger.Errorf("SmsSend err:", logger.Field("err", err))
return
}
//fmt.Println("tels:", tels)
//fmt.Printf("uids:", uids)
renewalLogs, err := GetActionUserRenewalLogMulti(uids, UserRenewalLogSendMessage)
if err != nil {
logger.Error("renewalLogs err:", err)
logger.Error("renewalLogs err:", logger.Field("err", err))
}
renewalLogMap := make(map[uint32]UserRenewalLog, 0)
for i, _ := range renewalLogs {
@ -2039,7 +2039,7 @@ func SendMessageMemberRenewal() {
err = orm.Eloquent.Create(renewalLog).Error
if err != nil {
logger.Error("create renewal log err:", err)
logger.Error("create renewal log err:", logger.Field("err", err))
}
}
}
@ -2051,13 +2051,13 @@ func SendMessageMemberRenewal() {
// var configAllocation Config
// err := NewConfigQuerySet(DB).NameEq(ConfigNamePay).One(&configAllocation)
// if err != nil {
// logger.Error("err:", err)
// logger.Error("err:",logger.Field("err",err))
// return payConfig, err
// }
//
// err = json.Unmarshal([]byte(configAllocation.Value), payConfig)
// if err != nil {
// logger.Error("err:", err)
// logger.Error("err:",logger.Field("err",err))
// return payConfig, err
// }
//
@ -2105,13 +2105,13 @@ func IndexMemberLevelStatistic(level uint32, date time.Time) {
Where("open_member_time>?", startDate).
Where("open_member_time<?", endDate).Count(&increase).Error
if err != nil {
logger.Error("increase err:", err)
logger.Error("increase err:", logger.Field("err", err))
}
err = orm.Eloquent.Table("user").Where("member_level=?", level).
Where("member_expire>?", startDate).
Where("member_expire<?", endDate).Count(&expire).Error
if err != nil {
logger.Error("increase err:%#v", err)
logger.Error("increase err:%#v", logger.Field("err", err))
}
//// TODO
//var statisticDaily MemberStatisticDaily
@ -2120,7 +2120,7 @@ func IndexMemberLevelStatistic(level uint32, date time.Time) {
// Where("date=?", startDate.AddDate(0, 0, -1).Format(DateFormat)).
// Find(&statisticDaily).Error
//if err != nil {
// logger.Error("increase err:", err)
// logger.Error("increase err:",logger.Field("err",err))
//}
//fmt.Println("increase:", increase)
//fmt.Println("expire:", expire)
@ -2136,7 +2136,7 @@ func IndexMemberLevelStatistic(level uint32, date time.Time) {
err = orm.Eloquent.Table("user_member_record").Where("type=?", memberRecordType).
Where("created_at>?", startDate).Where("created_at<?", endDate).Count(&origination).Error
if err != nil {
logger.Error("origination err:", err)
logger.Error("origination err:", logger.Field("err", err))
}
}
increase += origination
@ -2147,7 +2147,7 @@ func IndexMemberLevelStatistic(level uint32, date time.Time) {
err = orm.Eloquent.Table("user").Where("member_level=?", level).
Where("member_expire>?", time.Now()).Count(&accumulative).Error
if err != nil {
logger.Error("increase err:%#v", err)
logger.Error("increase err:%#v", logger.Field("err", err))
}
fmt.Println("net:", net)
@ -2163,7 +2163,7 @@ func IndexMemberLevelStatistic(level uint32, date time.Time) {
err = orm.Eloquent.Create(&daily).Error
if err != nil {
logger.Error("create member statistic daily err:", err)
logger.Error("create member statistic daily err:", logger.Field("err", err))
}
}
@ -2227,7 +2227,7 @@ func (m *MemberStatisticDailyListReq) List() (*MemberStatisticDailyListRsp, erro
var count int64
err := qs.Count(&count).Error
if err != nil {
logger.Error("count err:", err)
logger.Error("count err:", logger.Field("err", err))
return rsp, err
}
rsp.Count = count
@ -2235,18 +2235,18 @@ func (m *MemberStatisticDailyListReq) List() (*MemberStatisticDailyListRsp, erro
if m.IsExport == 1 {
err = qs.Order("date_time DESC").Find(&dailys).Error
if err != nil && err != RecordNotFound {
logger.Error("dailys err:", err)
logger.Error("dailys err:", logger.Field("err", err))
return rsp, err
}
listExport, err := MemberStatisticDailyListExport(dailys)
if err != nil {
logger.Error("list export err:", err)
logger.Error("list export err:", logger.Field("err", err))
}
rsp.Url = listExport
} else {
err = qs.Order("date_time DESC").Offset(m.PageNum * m.PageSize).Limit(m.PageSize).Find(&dailys).Error
if err != nil && err != RecordNotFound {
logger.Error("dailys err:", err)
logger.Error("dailys err:", logger.Field("err", err))
return rsp, err
}
rsp.List = dailys
@ -2298,7 +2298,7 @@ func UserInviteRecordListSetAssistantName(records []UserInviteRecord) {
infoMap, err := GetUserInfoMap(uids)
if err != nil {
logger.Error("info map err:", err)
logger.Error("info map err:", logger.Field("err", err))
}
for i, _ := range records {
@ -2337,7 +2337,7 @@ func (m *ExpireMemberSmsSendListReq) List() (*ExpireMemberSmsSendListResp, error
//if m.StartTime != "" {
// parse, err := time.Parse(DateTimeFormat, m.StartTime)
// if err != nil {
// logger.Errorf("err:", err)
// logger.Errorf("err:",logger.Field("err",err))
// return resp, err
// }
// qs = qs.Where("send_time > ?", parse)
@ -2345,7 +2345,7 @@ func (m *ExpireMemberSmsSendListReq) List() (*ExpireMemberSmsSendListResp, error
//if m.EndTime != "" {
// parse, err := time.Parse(DateTimeFormat, m.EndTime)
// if err != nil {
// logger.Errorf("err:", err)
// logger.Errorf("err:",logger.Field("err",err))
// return resp, err
// }
// parse = parse.AddDate(0, 0, 1)
@ -2369,7 +2369,7 @@ func (m *ExpireMemberSmsSendListReq) List() (*ExpireMemberSmsSendListResp, error
var count int64
err := qs.Count(&count).Error
if err != nil {
logger.Error("count err:", err)
logger.Error("count err:", logger.Field("err", err))
return resp, err
}
resp.Count = uint32(count)
@ -2377,7 +2377,7 @@ func (m *ExpireMemberSmsSendListReq) List() (*ExpireMemberSmsSendListResp, error
var smsSends []ExpireMemberSmsSend
err = qs.Order("id DESC").Offset(page * m.PageSize).Limit(m.PageSize).Find(&smsSends).Error
if err != nil && err != RecordNotFound {
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
return resp, err
}
resp.List = smsSends
@ -2403,7 +2403,7 @@ func (m *ExpireMemberSmsSendListReq) List() (*ExpireMemberSmsSendListResp, error
// var dailys []MemberStatisticDaily
// err := qs.Order("date_time DESC").Find(&dailys).Error
// if err != nil && err != RecordNotFound {
// logger.Error("dailys err:", err)
// logger.Error("dailys err:",logger.Field("err",err))
// return "", err
// }
//

13
app/admin/models/user_vm.go
View File

@ -17,8 +17,9 @@ const (
)
// 用户积分
//go:generate goqueryset -in user_vm.go
// gen:qs
//
//go:generate goqueryset -in user_vm.go
type UserVm struct {
Model
@ -46,7 +47,7 @@ func UserVmUpdate(uid uint32, amount int, event, describe string) error {
err := orm.Eloquent.Table("user_vm").
Where("uid=?", uid).Find(&userVm).Error
if err != nil {
logger.Error("share card retrieve cards err:", err)
logger.Error("share card retrieve cards err:", logger.Field("err", err))
return err
}
@ -64,7 +65,7 @@ func UserVmUpdate(uid uint32, amount int, event, describe string) error {
err = begin.Create(&userVm).Error
if err != nil {
begin.Rollback()
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
return err
}
} else {
@ -72,7 +73,7 @@ func UserVmUpdate(uid uint32, amount int, event, describe string) error {
err = begin.Exec(sql, amount, uid).Error
if err != nil {
begin.Rollback()
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
return err
}
}
@ -88,14 +89,14 @@ func UserVmUpdate(uid uint32, amount int, event, describe string) error {
err = begin.Create(vmRecord).Error
if err != nil {
begin.Rollback()
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
return err
}
err = begin.Commit().Error
if err != nil {
begin.Rollback()
logger.Error("err:", err)
logger.Error("err:", logger.Field("err", err))
return err
}
return nil

15
app/jobs/jobbase.go
View File

@ -2,6 +2,7 @@ package jobs
import (
"fmt"
"go-admin/logger"
"sync"
"time"
@ -38,25 +39,25 @@ type ExecJob struct {
}
func (e *ExecJob) Run() {
startTime := time.Now()
//startTime := time.Now()
var obj = jobList[e.InvokeTarget]
if obj == nil {
global.JobLogger.Warning(" ExecJob Run job nil", e)
logger.Warning(" ExecJob Run job nil", logger.Field("e", e))
return
}
CallExec(obj.(JobsExec), e.Args)
// 结束时间
endTime := time.Now()
//endTime := time.Now()
// 执行时间
latencyTime := endTime.Sub(startTime)
//latencyTime := endTime.Sub(startTime)
//TODO: 待完善部分
//str := time.Now().Format(timeFormat) + " [INFO] JobCore " + string(e.EntryId) + "exec success , spend :" + latencyTime.String()
//ws.SendAll(str)
global.JobLogger.Info(time.Now().Format(timeFormat), " [INFO] JobCore ", e, "exec success , spend :", latencyTime)
//global.JobLogger.Info(time.Now().Format(timeFormat), " [INFO] JobCore ", e, "exec success , spend :", latencyTime)
}
//http 任务接口
// http 任务接口
func (h *HttpJob) Run() {
startTime := time.Now()
@ -82,7 +83,7 @@ LOOP:
latencyTime := endTime.Sub(startTime)
//TODO: 待完善部分
global.JobLogger.Info(time.Now().Format(timeFormat), " [INFO] JobCore ", h, "exec success , spend :", latencyTime)
logger.Info("[INFO] exec success", logger.Field("time", latencyTime), logger.Field("h", h))
}
// 初始化

16
cmd/api/server.go
View File

@ -6,6 +6,7 @@ import (
"github.com/jasonlvhit/gocron"
"go-admin/app/admin/models"
"go-admin/app/admin/router"
"go-admin/logger"
"io/ioutil"
"net/http"
"os"
@ -20,7 +21,6 @@ import (
"go-admin/common/database"
"go-admin/common/global"
mycasbin "go-admin/pkg/casbin"
"go-admin/pkg/logger"
"go-admin/tools"
"go-admin/tools/config"
)
@ -59,14 +59,14 @@ func setup() {
//1. 读取配置
config.Setup(configYml)
//2. 设置日志
logger.Setup()
//logger.Setup()
//3. 初始化数据库链接
database.Setup(config.DatabaseConfig.Driver)
//4. 接口访问控制加载
mycasbin.Setup()
usageStr := `starting api server`
global.Logger.Info(usageStr)
//usageStr := `starting api server`
//global.Logger.Info(usageStr)
}
@ -178,11 +178,11 @@ func run() error {
// 服务连接
if config.SslConfig.Enable {
if err := srv.ListenAndServeTLS(config.SslConfig.Pem, config.SslConfig.KeyStr); err != nil && err != http.ErrServerClosed {
global.Logger.Fatal("listen: ", err)
logger.Fatal("listen: ", err)
}
} else {
if err := srv.ListenAndServe(); err != nil && err != http.ErrServerClosed {
global.Logger.Fatal("listen: ", err)
logger.Fatal("listen: ", err)
}
}
}()
@ -205,9 +205,9 @@ func run() error {
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
defer cancel()
if err := srv.Shutdown(ctx); err != nil {
global.Logger.Fatal("Server Shutdown:", err)
logger.Fatal("Server Shutdown:", err)
}
global.Logger.Println("Server exiting")
logger.Println("Server exiting")
return nil
}

3
cmd/migrate/server.go
View File

@ -8,7 +8,6 @@ import (
"go-admin/common/database"
"go-admin/common/global"
"go-admin/common/models"
"go-admin/pkg/logger"
"go-admin/tools/config"
)
@ -36,7 +35,7 @@ func run() {
//1. 读取配置
config.Setup(configYml)
//2. 设置日志
logger.Setup()
//logger.Setup()
//3. 初始化数据库链接
database.Setup(config.DatabaseConfig.Driver)
//4. 数据库迁移

2
common/actions/create.go
View File

@ -17,7 +17,7 @@ func CreateAction(control dto.Control) gin.HandlerFunc {
return func(c *gin.Context) {
db, err := tools.GetOrm(c)
if err != nil {
log.Error(err)
log.Error(err.Error())
return
}

2
common/actions/delete.go
View File

@ -17,7 +17,7 @@ func DeleteAction(control dto.Control) gin.HandlerFunc {
return func(c *gin.Context) {
db, err := tools.GetOrm(c)
if err != nil {
log.Error(err)
log.Error(err.Error())
return
}

2
common/actions/index.go
View File

@ -19,7 +19,7 @@ func IndexAction(m models.ActiveRecord, d dto.Index, f func() interface{}) gin.H
return func(c *gin.Context) {
db, err := tools.GetOrm(c)
if err != nil {
log.Error(err)
log.Error(err.Error())
return
}

4
common/actions/permission.go
View File

@ -24,7 +24,7 @@ func PermissionAction() gin.HandlerFunc {
return func(c *gin.Context) {
db, err := tools.GetOrm(c)
if err != nil {
log.Error(err)
log.Error(err.Error())
return
}
@ -94,4 +94,4 @@ func getPermissionFromContext(c *gin.Context) *DataPermission {
// PermissionForNoAction 提供非action写法数据范围约束
func GetPermissionFromContext(c *gin.Context) *DataPermission {
return getPermissionFromContext(c)
}
}

2
common/actions/update.go
View File

@ -17,7 +17,7 @@ func UpdateAction(control dto.Control) gin.HandlerFunc {
return func(c *gin.Context) {
db, err := tools.GetOrm(c)
if err != nil {
log.Error(err)
log.Error(err.Error())
return
}

2
common/actions/view.go
View File

@ -19,7 +19,7 @@ func ViewAction(control dto.Control, f func() interface{}) gin.HandlerFunc {
return func(c *gin.Context) {
db, err := tools.GetOrm(c)
if err != nil {
log.Error(err)
log.Error(err.Error())
return
}

20
common/config/config.go
View File

@ -3,8 +3,6 @@ package config
import (
"database/sql"
"net/http"
"go-admin/logger"
)
type Config struct {
@ -54,15 +52,15 @@ func (c *Config) GetEngine() http.Handler {
return c.engine
}
// SetLogger 设置日志组件
func (c *Config) SetLogger(l logger.Logger) {
logger.DefaultLogger = l
}
// GetLogger 获取日志组件
func (c *Config) GetLogger() logger.Logger {
return logger.DefaultLogger
}
//// SetLogger 设置日志组件
//func (c *Config) SetLogger(l logger.Logger) {
// logger.DefaultLogger = l
//}
//
//// GetLogger 获取日志组件
//func (c *Config) GetLogger() logger.Logger {
// return logger.DefaultLogger
//}
// SetSaas 设置是否是saas应用
func (c *Config) SetSaas(saas bool) {

8
common/config/type.go
View File

@ -2,8 +2,6 @@ package config
import (
"net/http"
"go-admin/logger"
)
type Conf interface {
@ -22,7 +20,7 @@ type Conf interface {
SetEngine(engine http.Handler)
GetEngine() http.Handler
//使用go-admin定义的logger，参考来源go-micro
SetLogger(logger logger.Logger)
GetLogger() logger.Logger
////使用go-admin定义的logger，参考来源go-micro
//SetLogger(logger logger.Logger)
//GetLogger() logger.Logger
}

11
common/database/mysql_drive.go
View File

@ -2,6 +2,7 @@ package database
import (
"database/sql"
logx "go-admin/logger"
"log"
"os"
"time"
@ -22,10 +23,10 @@ type Mysql struct {
func (e *Mysql) Setup() {
global.Source = e.GetConnect()
global.Logger.Info(tools.Green(global.Source))
logx.Info(tools.Green(global.Source))
db, err := sql.Open("mysql", global.Source)
if err != nil {
global.Logger.Fatal(tools.Red(e.GetDriver()+" connect error :"), err)
logx.Fatal(tools.Red(e.GetDriver()+" connect error :"), err)
}
global.Cfg.SetDb(&config.DBConfig{
Driver: "mysql",
@ -37,13 +38,13 @@ func (e *Mysql) Setup() {
},
})
if err != nil {
global.Logger.Fatal(tools.Red(e.GetDriver()+" connect error :"), err)
logx.Fatal(tools.Red(e.GetDriver()+" connect error :"), err)
} else {
global.Logger.Info(tools.Green(e.GetDriver() + " connect success !"))
logx.Info(tools.Green(e.GetDriver() + " connect success !"))
}
if global.Eloquent.Error != nil {
global.Logger.Fatal(tools.Red(" database error :"), global.Eloquent.Error)
logx.Fatal(tools.Red(" database error :"), global.Eloquent.Error)
}
if toolsConfig.LoggerConfig.EnabledDB {

3
common/database/pgsql_driver.go
View File

@ -2,6 +2,7 @@ package database
import (
"database/sql"
logx "go-admin/logger"
"log"
"os"
"time"
@ -27,7 +28,7 @@ func (e *PgSql) Setup() {
log.Println(global.Source)
db, err := sql.Open("postgresql", global.Source)
if err != nil {
global.Logger.Fatal(tools.Red(e.GetDriver()+" connect error :"), err)
logx.Fatal(tools.Red(e.GetDriver()+" connect error :"), err)
}
global.Cfg.SetDb(&config.DBConfig{
Driver: "mysql",

18
common/log/log.go
View File

@ -3,28 +3,10 @@ package log
import "go-admin/logger"
var (
// Trace trace级日志输出
Trace = logger.Trace
// Trace trace级日志输出
Tracef = logger.Tracef
// Debug debug级日志输出
Debug = logger.Debug
// Debugf debug级日志输出
Debugf = logger.Debugf
// Info info级日志输出
Info = logger.Info
// Infof info级日志输出
Infof = logger.Infof
// Warn warn级日志输出
Warn = logger.Warn
// Warnf warn级日志输出
Warnf = logger.Warnf
// Error error级日志输出
Error = logger.Error
// Errorf error级日志输出
Errorf = logger.Errorf
// Fatal fatal级日志输出
Fatal = logger.Fatal
// Fatalf fatal级日志输出
Fatalf = logger.Fatalf
)

3
examples/run.go
View File

@ -9,7 +9,6 @@ import (
"go-admin/common/global"
mycasbin "go-admin/pkg/casbin"
"go-admin/pkg/logger"
)
func main() {
@ -19,7 +18,7 @@ func main() {
panic(err)
}
mycasbin.Setup()
logger.Setup()
//logger.Setup()
global.GinEngine = gin.Default()
//router.InitRouter()
log.Fatal(global.GinEngine.Run(":8000"))

6
logger/logx.go
View File

@ -79,6 +79,10 @@ func Errorf(format string, args ...interface{}) {
l.Errorf(format, args)
}
func Fatal(args interface{}) {
func Fatal(args ...interface{}) {
l.Fatal(args)
}
func Println(args ...interface{}) {
l.Println(args)
}