diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go index f8031b91b..8003e1c59 100644 --- a/business/jxstore/cms/store_sku.go +++ b/business/jxstore/cms/store_sku.go @@ -4510,7 +4510,7 @@ func doStoreSkuAudit(ctx *jxcontext.Context, storeIDs []int, skuBindInfos []*Sto return isAudit, err } -func StoreSkuPriceAudit(ctx *jxcontext.Context, storeIDs, nameIDs []int, status int, isAsync, isContinueWhenError bool) (hint string, err error) { +func StoreSkuPriceAudit(ctx *jxcontext.Context, storeIDs, nameIDs []int, status int, remark string, isAsync, isContinueWhenError bool) (hint string, err error) { db := dao.GetDB() if status == model.StoreAuditStatusOnline { return "", fmt.Errorf("审核标志不正确!") @@ -4523,6 +4523,9 @@ func StoreSkuPriceAudit(ctx *jxcontext.Context, storeIDs, nameIDs []int, status if len(storeAudits) == 0 || err != nil { return retVal, fmt.Errorf("未查询到该门店该商品的待审核信息!storeID: %v, nameID: %v", storeID, v) } + if len(storeAudits) > 1 { + return retVal, fmt.Errorf("查询到该门店该商品的待审核信息大于1条!storeID: %v, nameID: %v", storeID, v) + } //审核通过 if status == model.StoreAuditStatusCreated { storeAudits[0].UserID = ctx.GetUserID() @@ -4538,6 +4541,7 @@ func StoreSkuPriceAudit(ctx *jxcontext.Context, storeIDs, nameIDs []int, status } else if status == model.StoreAuditStatusRejected { storeAudits[0].UserID = ctx.GetUserID() storeAudits[0].Status = model.StoreAuditStatusRejected + storeAudits[0].Remark = remark _, err = dao.UpdateEntity(db, storeAudits[0], "UserID", "Status") } else { return retVal, fmt.Errorf("审核标志不正确!") diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go index 0fc668e4e..3b9e3b8bb 100644 --- a/business/model/dao/store_sku.go +++ b/business/model/dao/store_sku.go @@ -1577,8 +1577,6 @@ func GetStoreSkuAudit(db *DaoDB, storeIDs, nameIDs, skuIDs []int, status int, na sqlParams = append(sqlParams, pageSize, offset) Begin(db) defer Commit(db) - fmt.Println(sql) - fmt.Println(sqlParams) if err = GetRows(db, &requestList, sql, sqlParams...); err == nil { return &model.PagedInfo{ TotalCount: GetLastTotalRowCount(db), diff --git a/controllers/cms_store_sku.go b/controllers/cms_store_sku.go index 79efd3f53..74d4716e6 100644 --- a/controllers/cms_store_sku.go +++ b/controllers/cms_store_sku.go @@ -848,6 +848,7 @@ func (c *StoreSkuController) GetStoreSkuAudit() { // @Param storeIDs formData string false "门店ID列表" // @Param nameIDs formData string false "id列表对象,当前指skuname id" // @Param status formData int false "审核标志,1通过,-1 不通过" +// @Param remark formData string false "审核不通过原因" // @Param isAsync formData bool false "是否异步,缺省是同步" // @Param isContinueWhenError formData bool false "单个同步失败是否继续,缺省false" // @Success 200 {object} controllers.CallResult @@ -859,7 +860,7 @@ func (c *StoreSkuController) StoreSkuPriceAudit() { if err = jxutils.Strings2Objs(params.StoreIDs, &storeIDs, params.NameIDs, &nameIDs); err != nil { return retVal, "", err } - retVal, err = cms.StoreSkuPriceAudit(params.Ctx, storeIDs, nameIDs, params.Status, params.IsAsync, params.IsContinueWhenError) + retVal, err = cms.StoreSkuPriceAudit(params.Ctx, storeIDs, nameIDs, params.Status, params.Remark, params.IsAsync, params.IsContinueWhenError) return retVal, "", err }) }