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

business/jxstore/cms/sku.go

@@ -1194,7 +1194,7 @@ func UpdateSkuImg(ctx *jxcontext.Context, skuID int, payload map[string]interfac
 	if skuID == 0 {
 		return "skuID必传", nil
 	} else if payload["img"] == "" {
-		return "img必传", nil
+		return "所有 img 字段必传", nil
 	}
 	if _, err := dao.ExecuteSQL(db, `
     UPDATE sku_name s 

business/jxstore/cms/store.go

@@ -1623,6 +1623,10 @@ func DeleteStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendor
 			err = AddEventDetail(db, ctx, model.OperateDelete, vendorID, model.ThingTypeStore, storeID, "", `{"VendorID":`+utils.Int2Str(vendorID)+`}`)
 		}
 	}
+	//删除抖店映射
+	if _, err1 := dao.ExecuteSQL(db, "DELETE FROM freight_template WHERE freight_template.store_id = ? ", storeID); err != nil {
+		err = fmt.Errorf("%v,%v", err, err1)
+	}
 	return num, err
 }