store and chore
CI / changes (push) Successful in 39s
CI / ad (push) Successful in 1s
CI / admin (push) Successful in 0s
CI / bff (push) Successful in 25s
CI / chore (push) Successful in 24s
CI / equipment (push) Successful in 0s
CI / express (push) Successful in 1s
CI / factory (push) Successful in 0s
CI / payment (push) Successful in 0s
CI / product (push) Successful in 1s
CI / record (push) Successful in 0s
CI / sale (push) Successful in 24s
CI / task (push) Successful in 0s
CI / user (push) Successful in 0s
CI / wecom (push) Successful in 0s
CI / changes (push) Successful in 39s
CI / ad (push) Successful in 1s
CI / admin (push) Successful in 0s
CI / bff (push) Successful in 25s
CI / chore (push) Successful in 24s
CI / equipment (push) Successful in 0s
CI / express (push) Successful in 1s
CI / factory (push) Successful in 0s
CI / payment (push) Successful in 0s
CI / product (push) Successful in 1s
CI / record (push) Successful in 0s
CI / sale (push) Successful in 24s
CI / task (push) Successful in 0s
CI / user (push) Successful in 0s
CI / wecom (push) Successful in 0s
This commit is contained in:
@@ -8,6 +8,7 @@ import (
|
||||
sale "lone-services/rpc/sale/pb"
|
||||
"lone-services/services/store/internal/dao"
|
||||
"lone-services/services/store/internal/model"
|
||||
"lone-services/services/store/validator"
|
||||
"strconv"
|
||||
|
||||
"lone-services/rpc/store/pb"
|
||||
@@ -32,6 +33,10 @@ func NewToSaleLogic(ctx context.Context, svcCtx *svc.ServiceContext) *ToSaleLogi
|
||||
}
|
||||
|
||||
func (l *ToSaleLogic) ToSale(in *store.ToSaleRequest) (*store.Response, error) {
|
||||
var v validator.StoreToSaleValidator
|
||||
if fail := l.checkParams(in, &v); fail != nil {
|
||||
return fail, nil
|
||||
}
|
||||
adminInfo := utils.GetUserFromCtx(l.ctx)
|
||||
if adminInfo.ID < utils.NumberOne {
|
||||
return l.fail(utils.ErrorNoLoginInfo)
|
||||
@@ -50,6 +55,9 @@ func (l *ToSaleLogic) ToSale(in *store.ToSaleRequest) (*store.Response, error) {
|
||||
return l.fail(utils.ErrorNotFund)
|
||||
}
|
||||
|
||||
if info.SaleId == in.SaleId {
|
||||
return l.ok(utils.NumberOne)
|
||||
}
|
||||
info.SaleId = in.SaleId
|
||||
info.AdminId = adminInfo.ID
|
||||
info.AdminName = adminInfo.Name
|
||||
@@ -64,17 +72,34 @@ func (l *ToSaleLogic) ToSale(in *store.ToSaleRequest) (*store.Response, error) {
|
||||
|
||||
info.GroupId = groupId
|
||||
|
||||
sErr = l.setAddressSaleInfo(info)
|
||||
if sErr != utils.Ok {
|
||||
return l.fail(sErr)
|
||||
}
|
||||
|
||||
modelObj.Begin()
|
||||
_, err = modelObj.Edit(w, &info)
|
||||
if err != nil {
|
||||
modelObj.Rollback()
|
||||
l.Logger.Error(err)
|
||||
return l.fail(utils.Fail)
|
||||
}
|
||||
|
||||
history := dao.SaleChangeHistoryCreate{
|
||||
StoreId: info.Id,
|
||||
SaleId: info.SaleId,
|
||||
AdminId: adminInfo.ID,
|
||||
}
|
||||
|
||||
err = model.SaleChangeHistoryModel{}.Init().Create(&history)
|
||||
if err != nil {
|
||||
modelObj.Rollback()
|
||||
l.Logger.Error(err)
|
||||
return l.fail(utils.Fail)
|
||||
}
|
||||
|
||||
sErr = l.setAddressSaleInfo(info)
|
||||
if sErr != utils.Ok {
|
||||
modelObj.Rollback()
|
||||
return l.fail(sErr)
|
||||
}
|
||||
|
||||
modelObj.Commit()
|
||||
return l.ok(utils.NumberOne)
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user