address add bystoreid api
This commit is contained in:
@@ -66,7 +66,7 @@ func (l *WebCreateLogic) WebCreate(in *order.CreateOrderRequest) (*order.Respons
|
||||
DistrictIds: address.DistrictIds,
|
||||
}
|
||||
|
||||
w = modelbase.Params{
|
||||
ww := modelbase.Params{
|
||||
Eq: map[string]string{
|
||||
"type": strconv.Itoa(int(in.Type)),
|
||||
},
|
||||
@@ -78,14 +78,14 @@ func (l *WebCreateLogic) WebCreate(in *order.CreateOrderRequest) (*order.Respons
|
||||
data.SaleName = adminInfo.Name
|
||||
data.CreateType = dao.OrderTypeSale
|
||||
data.Type = dao.OrderTypeSale
|
||||
w.Eq["sale_id"] = strconv.FormatInt(adminInfo.ID, utils.NumberTen)
|
||||
ww.Eq["sale_id"] = strconv.FormatInt(adminInfo.ID, utils.NumberTen)
|
||||
orderSn = svc.GetOrderSn(strconv.Itoa(dao.OrderTypeSale), adminInfo.ID)
|
||||
case dao.CartTypeUser:
|
||||
data.UserId = int(adminInfo.ID)
|
||||
data.UserName = adminInfo.Name
|
||||
data.CreateType = dao.OrderTypePersonal
|
||||
data.Type = dao.OrderTypePersonal
|
||||
w.Eq["user_id"] = strconv.FormatInt(adminInfo.ID, utils.NumberTen)
|
||||
ww.Eq["user_id"] = strconv.FormatInt(adminInfo.ID, utils.NumberTen)
|
||||
orderSn = svc.GetOrderSn(strconv.Itoa(dao.OrderTypePersonal), adminInfo.ID)
|
||||
case dao.CartTypeStore:
|
||||
data.StoreId = int(adminInfo.ID)
|
||||
@@ -96,13 +96,15 @@ func (l *WebCreateLogic) WebCreate(in *order.CreateOrderRequest) (*order.Respons
|
||||
data.SaleProvince = int(adminInfo.SaleProvince)
|
||||
data.CreateType = dao.OrderTypeStore
|
||||
data.Type = dao.OrderTypeStore
|
||||
w.Eq["store_id"] = strconv.FormatInt(adminInfo.ID, utils.NumberTen)
|
||||
ww.Eq["store_id"] = strconv.FormatInt(adminInfo.ID, utils.NumberTen)
|
||||
orderSn = svc.GetOrderSn(strconv.Itoa(dao.OrderTypeStore), adminInfo.ID)
|
||||
}
|
||||
data.OrderSn = orderSn
|
||||
|
||||
var cart dao.Cart
|
||||
err = model.CartModel{}.Init().GetOne(w, &address)
|
||||
|
||||
err = model.CartModel{}.Init().GetOne(ww, &cart)
|
||||
l.Logger.Error(cart)
|
||||
if err != nil {
|
||||
return l.fail(utils.Fail)
|
||||
}
|
||||
@@ -114,20 +116,40 @@ func (l *WebCreateLogic) WebCreate(in *order.CreateOrderRequest) (*order.Respons
|
||||
if pErr != utils.Ok {
|
||||
return l.fail(utils.Fail)
|
||||
}
|
||||
products, pErr := svc.GetCartData(ids)
|
||||
products, pErr := svc.GetCartData(l.svcCtx.ProductSvcName, ids)
|
||||
if pErr != utils.Ok {
|
||||
return l.fail(utils.Fail)
|
||||
}
|
||||
keys := make([]string, utils.NumberZero, len(products))
|
||||
keys := make([]string, utils.NumberZero, len(products.Items))
|
||||
var totalPrice float64
|
||||
for _, item := range products {
|
||||
keys = append(keys, strconv.Itoa(int(item.Id)))
|
||||
totalPrice += item.Price * float64(item.Number)
|
||||
errData := make(map[int64]int64)
|
||||
productItems := []dao.OrderProductCreate{}
|
||||
for _, item := range products.Items {
|
||||
if buyNum, ok := ids[item.Id]; ok {
|
||||
if buyNum > int64(item.Number) {
|
||||
errData[item.Id] = int64(item.Number)
|
||||
return l.out(utils.Fail,
|
||||
item.Name+"购买数量超出库存,目前可以够买:"+strconv.Itoa(int(item.Number)))
|
||||
} else {
|
||||
keys = append(keys, strconv.Itoa(int(item.Id)))
|
||||
totalPrice += item.Price * float64(buyNum)
|
||||
productItems = append(productItems, dao.OrderProductCreate{
|
||||
OrderSn: data.OrderSn,
|
||||
ProductId: int(item.Id),
|
||||
ProductName: item.Name,
|
||||
Price: item.Price,
|
||||
Number: int(buyNum),
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
if len(keys) < utils.NumberOne {
|
||||
return l.out(utils.Fail, "购买信息不存在")
|
||||
}
|
||||
data.ProductIds = strings.Join(keys, utils.DecollatorComma)
|
||||
data.TotalPrice = totalPrice
|
||||
|
||||
mobileObj := model.OrderModel{}.Init()
|
||||
|
||||
mobileObj.Begin()
|
||||
err = mobileObj.Create(&data)
|
||||
if err != nil {
|
||||
@@ -135,38 +157,35 @@ func (l *WebCreateLogic) WebCreate(in *order.CreateOrderRequest) (*order.Respons
|
||||
return l.fail(utils.Fail)
|
||||
}
|
||||
|
||||
for _, item := range products {
|
||||
orderProduct := dao.OrderProductCreate{
|
||||
Ordersn: data.OrderSn,
|
||||
ProductId: int(item.Id),
|
||||
ProductName: item.Name,
|
||||
Price: item.Price,
|
||||
Number: item.Number,
|
||||
}
|
||||
err = model.OrderProductModel{}.Init().Create(&orderProduct)
|
||||
for _, item := range productItems {
|
||||
err = model.OrderProductModel{}.Init().Create(&item)
|
||||
if err != nil {
|
||||
mobileObj.Rollback()
|
||||
return l.fail(utils.Fail)
|
||||
}
|
||||
|
||||
_, err = model.CartModel{}.Init().Del(w, &cart)
|
||||
if err != nil {
|
||||
mobileObj.Rollback()
|
||||
return l.fail(utils.Fail)
|
||||
}
|
||||
//TODO 扣除库存
|
||||
//$decrease = Product::decrease(
|
||||
//['id' => $item['id'], ['number', '>=', $item['number']]],
|
||||
//'number',
|
||||
//$item['number']
|
||||
//);
|
||||
//if ($decrease < 1) {
|
||||
//Order::rollBack();
|
||||
//$retData['code'] = Code::code('low_stocks');
|
||||
//$retData['data'] = [$item['id'] => Product::value(['id' => $item['id']], 'number')];
|
||||
//return $retData;
|
||||
}
|
||||
|
||||
_, err = model.CartModel{}.Init().Del(ww, &cart)
|
||||
if err != nil {
|
||||
mobileObj.Rollback()
|
||||
return l.fail(utils.Fail)
|
||||
}
|
||||
|
||||
//TODO 扣库存接口
|
||||
//cli, err := svc.GetRpcClient(l.svcCtx.ProductSvcName)
|
||||
//if err != nil {
|
||||
// mobileObj.Rollback()
|
||||
// return l.fail(utils.Fail)
|
||||
//}
|
||||
|
||||
//productClient := product.NewProductClient(cli.Conn())
|
||||
//_, err = productClient.Number(l.ctx, &product.NumberReq{Id: item.Id, Type: utils.NumberOne, Number: buyNum})
|
||||
//if err != nil {
|
||||
// mobileObj.Rollback()
|
||||
// logx.Errorf("get products err: %v", err)
|
||||
// return l.fail(utils.Fail, "产品库存不足")
|
||||
//}
|
||||
|
||||
mobileObj.Commit()
|
||||
|
||||
return l.ok(utils.NumberOne)
|
||||
|
||||
Reference in New Issue
Block a user