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

fix:

Browse Source
This commit is contained in:
li 2023-01-18 09:10:44 +08:00
parent d134f5742a
commit 582c388a84
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
controller/erp_retail.go
View File

@ -71,7 +71,7 @@ func ErpOrderCreate(c *gin.Context) {
return return
} }
//uc = &auth.UserClaims{Uid: 8588420} //uc := &auth.UserClaims{Uid: 8588420}
assistant := model.GetUserByUid(uc.Uid) assistant := model.GetUserByUid(uc.Uid)
if assistant.UserType != 2 { if assistant.UserType != 2 {
logger.Error("not assistant") logger.Error("not assistant")
@ -90,7 +90,7 @@ func ErpOrderCreate(c *gin.Context) {
Tel: req.Tel, Tel: req.Tel,
StoreId: uint32(assistant.StoreId), StoreId: uint32(assistant.StoreId),
StoreName: store.Name, StoreName: store.Name,
MakerId: uint32(assistant.Uid), MakerId: assistant.Uid,
MakerName: assistant.ShopAssistantName, MakerName: assistant.ShopAssistantName,
AuditTime: time.Now(), AuditTime: time.Now(),
AuditorId: assistant.Uid, AuditorId: assistant.Uid,
@ -155,6 +155,7 @@ func ErpOrderCreate(c *gin.Context) {
v.RejectedCount = req.ErpOrderCommodities[i].RejectedCount v.RejectedCount = req.ErpOrderCommodities[i].RejectedCount
v.RejectedAmount = v.RejectedCount * v.RejectedPrice v.RejectedAmount = v.RejectedCount * v.RejectedPrice
} else { } else {
begin.Rollback()
logger.Error("rejected order commodity id is null") logger.Error("rejected order commodity id is null")
return return
} }
@ -162,11 +163,13 @@ func ErpOrderCreate(c *gin.Context) {
req.ErpOrderCommodities[i] = v req.ErpOrderCommodities[i] = v
// 添加库存 TODO // 添加库存 TODO
if req.ErpOrderCommodities[i].RejectedPrice > req.ErpOrderCommodities[i].RetailPrice { if req.ErpOrderCommodities[i].RejectedPrice > req.ErpOrderCommodities[i].RetailPrice {
begin.Rollback()
logger.Error("rejected price gt retail price ") logger.Error("rejected price gt retail price ")
RespJson(c, status.InternalServerError, nil) RespJson(c, status.InternalServerError, nil)
return return
} }
if req.ErpOrderCommodities[i].RejectedCount > req.ErpOrderCommodities[i].Count { if req.ErpOrderCommodities[i].RejectedCount > req.ErpOrderCommodities[i].Count {
begin.Rollback()
logger.Error("rejected count gt retail count ") logger.Error("rejected count gt retail count ")
RespJson(c, status.InternalServerError, nil) RespJson(c, status.InternalServerError, nil)
return return
@ -198,13 +201,22 @@ func ErpOrderCreate(c *gin.Context) {
erpOrder.TotalCount += req.ErpOrderCommodities[i].Count erpOrder.TotalCount += req.ErpOrderCommodities[i].Count
} }
err = begin.Create(&req.ErpOrderCommodities).Error for _, commodity := range req.ErpOrderCommodities {
if err != nil { err = begin.Create(&commodity).Error
begin.Rollback() if err != nil {
logger.Error("Create") begin.Rollback()
RespJson(c, status.InternalServerError, nil) logger.Error("create err:", err)
return RespJson(c, status.InternalServerError, nil)
return
}
} }
//err = begin.Create(orderCommodities).Error
//if err != nil {
// begin.Rollback()
// logger.Error("Create")
// RespJson(c, status.InternalServerError, nil)
// return
//}
err = begin.Commit().Error err = begin.Commit().Error
if err != nil { if err != nil {
begin.Rollback() begin.Rollback()

2
router/router_app.go
View File

@ -285,7 +285,7 @@ func ConfigAppRouter(r gin.IRouter) {
{ {
retail.POST("order_commodity_list", controller.ErpOrderCommodityList) retail.POST("order_commodity_list", controller.ErpOrderCommodityList)
recycleConsole.Use(auth.UserAccessAuth) retail.Use(auth.UserAccessAuth)
retail.POST("order/list", controller.ErpOrderList) retail.POST("order/list", controller.ErpOrderList)
retail.POST("order/create", controller.ErpOrderCreate) retail.POST("order/create", controller.ErpOrderCreate)
retail.POST("order_detail", controller.ErpOrderDetail) retail.POST("order_detail", controller.ErpOrderDetail)