|
@@ -113,13 +113,13 @@ func (self *PayController) payExchange(oId, payWay, tradPwd, returnUrl, source,
|
|
|
SaleNumsMap[product.Id] = item.Count
|
|
SaleNumsMap[product.Id] = item.Count
|
|
|
storeMap[product.Id] = item.Count
|
|
storeMap[product.Id] = item.Count
|
|
|
}
|
|
}
|
|
|
- beego.BeeLogger.Error("SaleNumsMap1 %v", SaleNumsMap)
|
|
|
|
|
|
|
+ //beego.BeeLogger.Error("SaleNumsMap1 %v", SaleNumsMap)
|
|
|
|
|
|
|
|
resultStore, prdName := FindNotEnoughPrd(storeMap)
|
|
resultStore, prdName := FindNotEnoughPrd(storeMap)
|
|
|
if resultStore {
|
|
if resultStore {
|
|
|
self.ReturnError(403, []string{apps.ProductStockNotEnough[0], fmt.Sprintf("%s商品库存不足", prdName)}, "", nil)
|
|
self.ReturnError(403, []string{apps.ProductStockNotEnough[0], fmt.Sprintf("%s商品库存不足", prdName)}, "", nil)
|
|
|
}
|
|
}
|
|
|
- beego.BeeLogger.Error("SaleNumsMap2 %v", SaleNumsMap)
|
|
|
|
|
|
|
+ //beego.BeeLogger.Error("SaleNumsMap2 %v", SaleNumsMap)
|
|
|
|
|
|
|
|
//第一次支付已更新支付方式,第一次支付才计算支付金额
|
|
//第一次支付已更新支付方式,第一次支付才计算支付金额
|
|
|
if len(order.PayWay) <= 0 {
|
|
if len(order.PayWay) <= 0 {
|
|
@@ -349,7 +349,6 @@ func (self *PayController) payCentExchange(oId, returnUrl, source, remark string
|
|
|
if resultStore {
|
|
if resultStore {
|
|
|
self.ReturnError(403, []string{apps.ProductStockNotEnough[0], fmt.Sprintf("%s商品库存不足", prdName)}, "", nil)
|
|
self.ReturnError(403, []string{apps.ProductStockNotEnough[0], fmt.Sprintf("%s商品库存不足", prdName)}, "", nil)
|
|
|
}
|
|
}
|
|
|
- beego.BeeLogger.Error("SaleNumsMap %v", SaleNumsMap)
|
|
|
|
|
order.Remark = remark
|
|
order.Remark = remark
|
|
|
order.PayWay = order_model.PAY_WAY_CENT
|
|
order.PayWay = order_model.PAY_WAY_CENT
|
|
|
order.Contact = address.Contact
|
|
order.Contact = address.Contact
|
|
@@ -431,7 +430,7 @@ func FindNotEnoughPrd(storeMap map[int64]int64) (bool, string) {
|
|
|
for pId, nums := range storeMap {
|
|
for pId, nums := range storeMap {
|
|
|
product := product_model.GetProductById(pId, true)
|
|
product := product_model.GetProductById(pId, true)
|
|
|
if product.Package {
|
|
if product.Package {
|
|
|
- beego.BeeLogger.Error("product id %d", product.Id)
|
|
|
|
|
|
|
+ //beego.BeeLogger.Error("product id %d", product.Id)
|
|
|
packageList := product_model.GetPackageList(pId, true)
|
|
packageList := product_model.GetPackageList(pId, true)
|
|
|
for _, one := range packageList {
|
|
for _, one := range packageList {
|
|
|
if _, ok := storeMap[one.ItemId]; ok {
|
|
if _, ok := storeMap[one.ItemId]; ok {
|