Merge branch 'master' of e.coding.net:rosydev/jx-callback

2019-12-10 17:47:19 +08:00
parent 99a00476ef 933a18d362
commit 5363e34209
10 changed files with 350 additions and 162 deletions
--- a/business/partner/purchase/jx/localjx/order.go
+++ b/business/partner/purchase/jx/localjx/order.go
@@ -360,7 +360,7 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64
 		if err != nil {
 			return nil, nil, err
 		}
-		storeSkuMap := make(map[int]*cms.StoreSkuExt)
+		storeSkuMap := make(map[int]*dao.StoreSkuExt)
 		for _, v1 := range storeSkuInfo.SkuNames {
 			for _, v2 := range v1.Skus {
 				storeSkuMap[v2.SkuID] = v2