liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

通联宝支付测试

Browse Source
This commit is contained in:
苏尹岚
2020-02-28 11:19:27 +08:00
parent 9821123c08
commit 0fd69d25e1
2 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
business/jxstore/cms/store_sku.go
View File

@@ -3627,14 +3627,14 @@ func RefreshJxPriceByVendor(ctx *jxcontext.Context, jdStoreSkus []*JdStoreSkus,
for kk, vv := range v { for kk, vv := range v {
result, err := dao.GetStoreSkuBindByNameID(db, k, kk, model.SkuStatusNormal) result, err := dao.GetStoreSkuBindByNameID(db, k, kk, model.SkuStatusNormal)
if len(result) > 0 && err == nil { if len(result) > 0 && err == nil {
// if result[0].UnitPrice > vv { if result[0].UnitPrice > vv {
storeSkuBindInfo := &StoreSkuBindInfo{ storeSkuBindInfo := &StoreSkuBindInfo{
StoreID: k, StoreID: k,
NameID: kk, NameID: kk,
UnitPrice: vv, UnitPrice: vv,
} }
param = append(param, storeSkuBindInfo) param = append(param, storeSkuBindInfo)
// } }
} }
} }
} }
@@ -3672,14 +3672,14 @@ func RefreshJxPriceByVendor(ctx *jxcontext.Context, jdStoreSkus []*JdStoreSkus,
for kk, vv := range v { for kk, vv := range v {
result, err := dao.GetStoreSkuBindByNameID(db, k, kk, model.SkuStatusNormal) result, err := dao.GetStoreSkuBindByNameID(db, k, kk, model.SkuStatusNormal)
if len(result) > 0 && err == nil { if len(result) > 0 && err == nil {
// if result[0].UnitPrice > vv { if result[0].UnitPrice > vv {
storeSkuBindInfo := &StoreSkuBindInfo{ storeSkuBindInfo := &StoreSkuBindInfo{
StoreID: k, StoreID: k,
NameID: kk, NameID: kk,
UnitPrice: vv, UnitPrice: vv,
} }
param = append(param, storeSkuBindInfo) param = append(param, storeSkuBindInfo)
// } }
} }
} }
} }

1
business/partner/purchase/jx/localjx/order.go
View File

@@ -587,7 +587,6 @@ func CancelOrder(ctx *jxcontext.Context, order *model.GoodsOrder, reason string)
db := dao.GetDB() db := dao.GetDB()
payList, err2 := dao.GetOrderPayList(db, order.VendorOrderID, jxutils.GetPossibleVendorIDFromVendorOrderID(order.VendorOrderID)) payList, err2 := dao.GetOrderPayList(db, order.VendorOrderID, jxutils.GetPossibleVendorIDFromVendorOrderID(order.VendorOrderID))
if err = err2; err == nil { if err = err2; err == nil {
globals.SugarLogger.Debugf("CancelOrderTL1, [%v]", payList)
for _, orderPay := range payList { for _, orderPay := range payList {
globals.SugarLogger.Debugf("CancelOrderTL2, [%v]", *orderPay) globals.SugarLogger.Debugf("CancelOrderTL2, [%v]", *orderPay)
if orderPay.Status == model.PayStatusYes { if orderPay.Status == model.PayStatusYes {