Merge remote-tracking branch 'origin/master'

app/admin/svc/order/svc_order_pay.go

@@ -66,14 +66,15 @@ func GoodsPayCreate(c *gin.Context) {
 
 	for _, v := range req.GoodsInfo {
 		tmp := model.OrderGoods{
-			Oid:        order.Oid,
-			GoodsId:    utils.StrToInt64(v.GoodsId),
-			GoodsTitle: goodsMap[utils.StrToInt64(v.GoodsId)].Title,
-			SkuId:      utils.StrToInt64(v.SkuId),
-			SkuCode:    skuMap[utils.StrToInt64(v.SkuId)].SkuCode,
-			Sku:        skuMap[utils.StrToInt64(v.SkuId)].Sku,
-			Num:        utils.StrToInt(v.Num),
-			Price:      skuPrice[v.SkuId],
+			Oid:          order.Oid,
+			GoodsId:      utils.StrToInt64(v.GoodsId),
+			GoodsTitle:   goodsMap[utils.StrToInt64(v.GoodsId)].Title,
+			SkuId:        utils.StrToInt64(v.SkuId),
+			SkuCode:      skuMap[utils.StrToInt64(v.SkuId)].SkuCode,
+			Sku:          skuMap[utils.StrToInt64(v.SkuId)].Sku,
+			Num:          utils.StrToInt(v.Num),
+			Price:        skuPrice[v.SkuId],
+			EnterpriseId: utils.StrToInt(req.EnterpriseId),
 		}
 		goodsTotal[tmp.GoodsId] += tmp.Num
 		orderGoods = append(orderGoods, tmp)