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

- dao.IsVendorThingIDEmpty

Browse Source
This commit is contained in:
gazebo
2019-05-25 11:22:34 +08:00
parent 220ff09887
commit c00fc49f68
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
business/model/dao/dao_utils.go
View File

@@ -168,3 +168,7 @@ func value2Value(srcValue, dstValue reflect.Value, copyType int) {
// func ObjNull2Normal(src, dst interface{}) { // func ObjNull2Normal(src, dst interface{}) {
// copyBetweenNoramAndNullObj(src, dst, 2) // copyBetweenNoramAndNullObj(src, dst, 2)
// } // }
func IsVendorThingIDEmpty(vendorThingID string) bool {
return vendorThingID == "" || vendorThingID == "0"
}

8
business/partner/purchase/mtwm/store_sku.go
View File

@@ -257,13 +257,13 @@ func (p *PurchaseHandler) SyncStoreSkus(ctx *jxcontext.Context, parentTask tasks
storeSkuBind := &model.StoreSkuBind{} storeSkuBind := &model.StoreSkuBind{}
storeSkuBind.ID = skuItem.BindID storeSkuBind.ID = skuItem.BindID
if skuItem.NameID == 0 || skuItem.StoreSkuSyncStatus&model.SyncFlagDeletedMask != 0 { if skuItem.NameID == 0 || skuItem.StoreSkuSyncStatus&model.SyncFlagDeletedMask != 0 {
if skuItem.StoreSkuSyncStatus&model.SyncFlagNewMask == 0 && !isVendorSkuIDEmpty(skuItem.VendorSkuID) { if skuItem.StoreSkuSyncStatus&model.SyncFlagNewMask == 0 && !dao.IsVendorThingIDEmpty(skuItem.VendorSkuID) {
err = ignoreNoAppFoodErr(api.MtwmAPI.RetailDelete(vendorStoreID, skuItem.VendorSkuID)) err = ignoreNoAppFoodErr(api.MtwmAPI.RetailDelete(vendorStoreID, skuItem.VendorSkuID))
} }
if err == nil { if err == nil {
storeSkuBind.DeletedAt = time.Now() storeSkuBind.DeletedAt = time.Now()
updateFields = append(updateFields, model.FieldDeletedAt) updateFields = append(updateFields, model.FieldDeletedAt)
if !isVendorSkuIDEmpty(skuItem.VendorSkuID) { if !dao.IsVendorThingIDEmpty(skuItem.VendorSkuID) {
storeSkuBind.MtwmID = 0 storeSkuBind.MtwmID = 0
updateFields = append(updateFields, model.FieldMtwmID) updateFields = append(updateFields, model.FieldMtwmID)
} }
@@ -523,10 +523,6 @@ func (p *PurchaseHandler) GetStoresSku(ctx *jxcontext.Context, parentTask tasksc
return storeSkuList, err return storeSkuList, err
} }
func isVendorSkuIDEmpty(vendorSkuID string) bool {
return vendorSkuID == "" || vendorSkuID == "0"
}
func ignoreNoAppFoodErr(err error) error { func ignoreNoAppFoodErr(err error) error {
if err != nil { if err != nil {
if codeErr, ok := err.(*utils.ErrorWithCode); ok { if codeErr, ok := err.(*utils.ErrorWithCode); ok {